diff --git a/addons/account/account.py b/addons/account/account.py
index caf1d68c45d..571ea40698d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1862,8 +1862,10 @@ class account_tax(osv.osv):
         'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
             help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
         'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
-        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
-        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'),
+        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."),
+        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."),
+        'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
+        'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
         'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
         'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
         'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
@@ -2001,6 +2003,8 @@ class account_tax(osv.osv):
                     'name':tax.description and tax.description + " - " + tax.name or tax.name,
                     'account_collected_id':tax.account_collected_id.id,
                     'account_paid_id':tax.account_paid_id.id,
+                    'account_analytic_collected_id': tax.account_analytic_collected_id.id,
+                    'account_analytic_paid_id': tax.account_analytic_paid_id.id,
                     'base_code_id': tax.base_code_id.id,
                     'ref_base_code_id': tax.ref_base_code_id.id,
                     'sequence': tax.sequence,
@@ -2066,7 +2070,20 @@ class account_tax(osv.osv):
                 'taxes': []                  # List of taxes, see compute for the format
             }
         """
+
+        # By default, for each tax, tax amount will first be computed
+        # and rounded at the 'Account' decimal precision for each
+        # PO/SO/invoice line and then these rounded amounts will be
+        # summed, leading to the total amount for that tax. But, if the
+        # company has tax_calculation_rounding_method = round_globally,
+        # we still follow the same method, but we use a much larger
+        # precision when we round the tax amount for each line (we use
+        # the 'Account' decimal precision + 5), and that way it's like
+        # rounding after the sum of the tax amounts of each line
         precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        tax_compute_precision = precision
+        if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
+            tax_compute_precision += 5
         totalin = totalex = round(price_unit * quantity, precision)
         tin = []
         tex = []
@@ -2075,7 +2092,7 @@ class account_tax(osv.osv):
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tin:
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
@@ -2083,7 +2100,7 @@ class account_tax(osv.osv):
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tex:
             totalin += r.get('amount', 0.0)
         return {
@@ -2096,7 +2113,7 @@ class account_tax(osv.osv):
         _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -2105,14 +2122,15 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
         total = 0.0
-        precision_pool = self.pool.get('decimal.precision')
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
             else:
-                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
                 total += r['amount']
         return res
 
@@ -2160,6 +2178,8 @@ class account_tax(osv.osv):
                 'amount': amount,
                 'account_collected_id': tax.account_collected_id.id,
                 'account_paid_id': tax.account_paid_id.id,
+                'account_analytic_collected_id': tax.account_analytic_collected_id.id,
+                'account_analytic_paid_id': tax.account_analytic_paid_id.id,
                 'base_code_id': tax.base_code_id.id,
                 'ref_base_code_id': tax.ref_base_code_id.id,
                 'sequence': tax.sequence,
@@ -2188,7 +2208,7 @@ class account_tax(osv.osv):
             r['todo'] = 0
         return res
 
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
         Price Unit is a VAT included price
@@ -2198,15 +2218,15 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
         total = 0.0
-        obj_precision = self.pool.get('decimal.precision')
         for r in res:
-            prec = obj_precision.precision_get(cr, uid, 'Account')
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, prec) - total
+                r['amount'] = round(r['balance'] * quantity, precision) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, prec)
+                r['amount'] = round(r['amount'] * quantity, precision)
                 total += r['amount']
         return res
 
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 280b813380f..06de5a3e43e 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -34,8 +34,8 @@ class account_analytic_line(osv.osv):
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
-        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
-        'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+        'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount Currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
     }
 
     _defaults = {
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index cbc5a966f79..ef146128a67 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -43,6 +43,12 @@ class bank(osv.osv):
         "Return the name to use when creating a bank journal"
         return (bank.bank_name or '') + ' ' + bank.acc_number
 
+    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+        """Add ability to have %(currency_name)s in the format_layout of
+        res.partner.bank.type"""
+        bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
+        return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
+
     def post_write(self, cr, uid, ids, context={}):
         if isinstance(ids, (int, long)):
           ids = [ids]
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c6011979f8d..5e27a2e3663 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -756,7 +756,7 @@ class account_invoice(osv.osv):
             for tax in inv.tax_line:
                 if tax.manual:
                     continue
-                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
+                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
                 tax_key.append(key)
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !'))
@@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
             'quantity': x.get('quantity',1.00),
             'product_id': x.get('product_id', False),
             'product_uom_id': x.get('uos_id', False),
-            'analytic_account_id': x.get('account_analytic_id', False),
+            'analytic_account_id': x.get('analytic_account_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1578,6 +1578,7 @@ class account_invoice_tax(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'manual': fields.boolean('Manual'),
@@ -1648,14 +1649,16 @@ class account_invoice_tax(osv.osv):
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_collected_id'] or line.account_id.id
+                    val['account_analytic_id'] = tax['account_analytic_collected_id']
                 else:
                     val['base_code_id'] = tax['ref_base_code_id']
                     val['tax_code_id'] = tax['ref_tax_code_id']
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
+                    val['account_analytic_id'] = tax['account_analytic_paid_id']
 
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
                 if not key in tax_grouped:
                     tax_grouped[key] = val
                 else:
@@ -1687,7 +1690,8 @@ class account_invoice_tax(osv.osv):
                 'price': t['amount'] or 0.0,
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
-                'tax_amount': t['tax_amount']
+                'tax_amount': t['tax_amount'],
+                'analytic_account_id': t['account_analytic_id'],
             })
         return res
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e85a0002bf8..bc964b787c7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -98,6 +98,7 @@
                         <field name="name"/>
                         <field name="sequence"/>
                         <field name="account_id" groups="account.group_account_user"/>
+                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -215,6 +216,7 @@
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
                                             <field name="account_id" groups="account.group_account_invoice"/>
+                                            <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
                                             <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                             <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
 
@@ -270,7 +272,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -405,7 +407,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a89473af134..80202d97d6c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -909,9 +909,9 @@
                                   <field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
                                   <separator colspan="4" string="Accounting Information"/>
                                   <field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
+                                  <field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
                                   <field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
+                                  <field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
                                   <separator colspan="4" string="Tax Declaration: Invoices"/>
                                   <field name="base_code_id"/>
                                   <field name="base_sign"/>
diff --git a/addons/account/company.py b/addons/account/company.py
index 932f7750faa..3bb241a42a6 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -25,6 +25,11 @@ class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
+        'tax_calculation_rounding_method': fields.selection([
+            ('round_per_line', 'Round per Line'),
+            ('round_globally', 'Round Globally'),
+            ], 'Tax Calculation Rounding Method',
+            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
         'property_reserve_and_surplus_account': fields.property(
@@ -39,6 +44,7 @@ class res_company(osv.osv):
 
     _defaults = {
         'expects_chart_of_accounts': True,
+        'tax_calculation_rounding_method': 'round_per_line',
         'overdue_msg': '''Dear Sir, dear Madam,
 
 Our records indicate that some payments on your account are still due. Please find details below.
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index b8c595f3ca0..5aa1c76cc5e 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -24,6 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
+                      <field name="tax_calculation_rounding_method"/>
                       <field name="paypal_account"  placeholder="sales@openerp.com"/>
                 </field>
             </field>
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 21c7bea93f3..dba1cdf30fa 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 02:41+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-06-22 04:38+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4942,7 +4942,7 @@ msgstr "会計表"
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr "カラム名"
+msgstr "列名"
 
 #. module: account
 #: view:account.general.journal:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 09b4a8b9ac4..96edc80159f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:17+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-11 03:05+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4963,7 +4963,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
@@ -5702,7 +5702,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
@@ -10184,7 +10184,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
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7658ab111d9..492ab249a39 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -241,19 +241,33 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project line" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="account_id"/>
-                        <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                        <field name="journal_id"/>
-                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
-                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                        <field invisible="True" name="general_account_id"/>
-                        <field name="amount"/>
-                        <field name="currency_id" />
-                        <field name="amount_currency" />
-                        <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                    <group>
+                       <group>
+                          <field name="name"/>
+                          <field name="account_id"/>
+                          <field name="journal_id"/>
+                       </group>
+                       <group>
+                          <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                          <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                        </group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                            <label for="amount_currency"/>
+                            <div>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                            <field invisible="1" name="general_account_id"/>
+                        </group>
+                        <group string="Product Information">
+                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                            </div>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8ca35426427..16f37f05301 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -49,6 +49,12 @@ class account_config_settings(osv.osv_memory):
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
         'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+        'tax_calculation_rounding_method': fields.related('company_id',
+            'tax_calculation_rounding_method', type='selection', selection=[
+            ('round_per_line', 'Round per Line'),
+            ('round_globally', 'Round Globally'),
+            ], string='Tax Calculation Rounding Method',
+            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
         'sale_tax_rate': fields.float('Sales Tax (%)'),
@@ -152,6 +158,7 @@ class account_config_settings(osv.osv_memory):
             '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'):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index c6bd026882a..70381a68c82 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,7 +21,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+
                     <field name="has_default_company" invisible="1" />
                     <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
@@ -76,6 +76,7 @@
                         <group>
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="tax_calculation_rounding_method"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
                         </group>
@@ -134,7 +135,6 @@
 
                         <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index d0ff56924e9..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,11 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
@@ -26,6 +21,11 @@
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
+                    <footer>
+                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 322c33aec76..7e33e61eec8 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
-                    <header>
-                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
                     </group>
+                    <footer>
+                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 83c49fe665a..d7820caa647 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -20,6 +15,11 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8827edba591..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <header>
-                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="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."/>
                     <newline/>
@@ -22,6 +17,11 @@
                         <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
                         <field name="report_name"/>
                     </group>
+                    <footer>
+                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 9d38b2034bd..08db574e9ac 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <header>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
                          <field name="description"/>
@@ -24,6 +19,11 @@
                     <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
                     <label string="Credit Note: Creates the credit note, ready for editing."/>
                     <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
+                    <footer>
+                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 5658143f4e1..0ea2eefebc5 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,14 +6,14 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Confirm Draft Invoices" version="7.0">
-	                <header>
-	                    <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Confirm Draft Invoices"/>
-	            </form>
+                <form string="Confirm Draft Invoices" version="7.0">
+                    <separator string="Confirm Draft Invoices"/>
+                    <footer>
+                        <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -28,14 +28,14 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Cancel Selected Invoices" version="7.0">
-	                <header>
-	                    <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Cancel Selected Invoices"/>
-	            </form>
+                <form string="Cancel Selected Invoices" version="7.0">
+                    <separator string="Cancel Selected Invoices"/>
+                    <footer>
+                        <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index e2dcc05c266..af0b50168de 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Journal Select" version="7.0">
-	                <header>
-	                    <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Journal Select" version="7.0">
                     <label string="Are you sure you want to open Journal Entries?"/>
-	            </form>
+                    <footer>
+                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 02509137af5..58707c0d605 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="journal_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 862ffa0956e..1e36cc8bafe 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                          <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 1d405ae02aa..ade86e29c50 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to open Account move line entries?"/>
+                    <footer>
                         <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string="Are you sure you want to open Account move line entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ff4811f781c..63ba44ba8a7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index bedc1028b4a..7f950e4cf53 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
-                    <header>
-                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
+                    <footer>
+                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index c285db512cf..c6aa828e3ce 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
-                    <header>
-                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Are you sure?">
                         <field name="sure"/>
                     </group>
+                    <footer>
+                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 552907da0c8..ffa298bf22d 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
-                    <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
-                    </header>
                     <group col="4">
                         <field name="next_partner_id"/>
                         <field name="progress" widget="progressbar" colspan="4"/>
                         <field name="today_reconciled"/>
                         <field name="to_reconcile"/>
                     </group>
+                    <footer>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 4fb418e4fad..d6344f2cbc1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -8,13 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
                         <newline/>
@@ -23,6 +16,13 @@
                     </group><group string="Write-Off">
                         <field name="writeoff"/>
                     </group>
+                    <footer>
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 575af9370db..0e82603ced1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -9,11 +9,6 @@
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
                     <group col="4">
@@ -26,6 +21,11 @@
                         <field name="direction_selection"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..2711154a35e 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
-                <header>
-                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                    or 
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
@@ -38,6 +33,11 @@
                         <field name="journal_ids"/>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                    or 
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 56b72f120d2..5e53fb66d0f 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
-                    <header>
-                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <newline/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <footer>
+                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 2132851a3fe..64ca3beeb11 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <header>
-                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>
+                    <footer>
+                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 0db91912c5e..ea0c68f739f 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="period_id"/>
                         <label colspan="4" string="(If you do not select period it will take all open periods)"/>
                         <field name="target_move"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index bec668c29ec..dc3cf7b748a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                <footer>
                     <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                     or                    
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliate Transactions"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 899befeaa0a..777ab38fddf 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <header>
-	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
+	                <footer>
+	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
+	                </footer>
 	            </form>
             </field>
         </record>
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
-                    <header>
+                    <label string = "Are you sure you want to create entries?"/>
+                    <footer>
                         <button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index d5b1cff4533..abadb57c4e7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,19 +8,19 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Post Journal Entries of a Journal"/>
-	                <label string="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."/>
-	                <group>
-	                    <field name="journal_id"/>
-	                    <field name="period_id"/>
-	                </group>
-	            </form>
+                <form string="Post Journal Entries" version="7.0">
+                    <separator string="Post Journal Entries of a Journal"/>
+                    <label string="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."/>
+                    <group>
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                    </group>
+                    <footer>
+                        <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -47,15 +47,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Post Journal Entries" version="7.0">
                     <separator string="Post Journal Entries"/>
-	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
-	            </form>
+                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
+                    <footer>
+                        <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 91ea78d7bd6..988c4786bb8 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
@@ -25,6 +20,11 @@
                     <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                     <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
+                <footer>
+                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index c3ac5f5b71c..8f86e9eeedc 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -77,7 +77,7 @@
         <menuitem id="base.menu_sales" name="Sales"
             parent="base.menu_base_partner"
             sequence="1"/>
-        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
 
 
     </data>
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 74425cea3dd..4af43dbcb2f 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -3,3 +3,5 @@ access_account_analytic_analysis_summary_user_sale,account_analytic_analysis.sum
 access_account_analytic_analysis_summary_month_sale,account_analytic_analysis.summary.month sale,model_account_analytic_analysis_summary_month,base.group_sale_salesman,1,0,0,0
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+access_account_analytic_analysis_summary_user_project_user,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_user,1,0,0,0
+access_account_analytic_analysis_summary_month_project_user,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_user,1,0,0,0
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index ae95f0f7584..c25705572d1 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group col="4">
                     <field name="date1"/>
                     <field name="date2"/>
@@ -21,6 +16,11 @@
                 </group><group string="Analytic Journal">
                     <field name="journal_ids" colspan="2" nolabel="1"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index b67e61bafc6..5b8a11f2587 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -7,12 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
+                <label string="Save This Distribution as a Model"/>
+                <footer>
                     <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <label string="Save This Distribution as a Model"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
new file mode 100644
index 00000000000..060fd9f598d
--- /dev/null
+++ b/addons/account_asset/i18n/mn.po
@@ -0,0 +1,793 @@
+# 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 01:37+0100\n"
+"PO-Revision-Date: 2012-07-10 03:13+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-07-11 05:15+0000\n"
+"X-Generator: Launchpad (build 15593)\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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 1e8f0f969b7..15b11f4dcff 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
-                    <header>
-                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
                         <group colspan="2" col="2">
@@ -23,6 +18,11 @@
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
+                    <footer>
+                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index fee7f77d758..45d3aa22625 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <header>
-                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
+                    <footer>
+                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index 55f39080e09..d13c31ac375 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.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-04-25 10:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-03 09:17+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-04-26 04:41+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
+"X-Launchpad-Export-Date: 2012-07-04 04:39+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -42,7 +42,7 @@ msgstr "CODA"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
 msgid "Parent Code"
-msgstr "Förälderns kod"
+msgstr "Överliggande kod"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -54,7 +54,7 @@ msgstr "Debet"
 #: 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 ""
+msgstr "Avbryt valda utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -118,6 +118,8 @@ msgid ""
 "Delete operation not allowed !             Please go to the associated bank "
 "statement in order to delete and/or modify this bank statement line"
 msgstr ""
+"Radering inte tillåten ! Vänligen använd associerat bankuttdrag för att "
+"radera och/eller ändra utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,type:0
@@ -134,27 +136,27 @@ msgstr "Journal"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "Bekräfta utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "Kredittransaktioner"
 
 #. 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 ""
+msgstr "avbryt valda utdragsrader."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "Motpartens nummer"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaktioner"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -200,6 +202,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Vänligen ange BIC/Swift-kod på bank för banktyp IBAN-konto för korrekta "
+"utbetalningar"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -214,7 +219,7 @@ msgstr "Bekräfta valda rader från kontoutdraget."
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -234,42 +239,42 @@ msgstr "Anteckningar"
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuell"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Belopp"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.konto"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "Motpartsvaluta"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "Motpartens BIC"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Barnkoder"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Är du säker på att du vill bekräfta valda bankutdragsrader?"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
@@ -277,6 +282,7 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"Beloppet på bokföringsordern måste överenstämma med beloppet på kontoutdraget"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
@@ -284,91 +290,92 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"Kod för att identifiera transaktioner som tillhör samma batchbetalning"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "Preleminära utdragsrader."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+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 ""
+msgstr "Kontoutdragsrad"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "Motpartsnamn"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikation"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankkonton"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Journalen och perioden måste tillhöra samma bolag."
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Bankkontoutdrag"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "Utdragsrad"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "Koden måste vara 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 ""
+msgstr "Bankutdragsrad"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "Barnbatchbetalningar"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "Utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totalsumma"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "Globalt ID"
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index 1298884a856..131f4424568 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 44e0e9aa3a4..c08f15a7410 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
                          <field name="date_to"/>
                      </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index ee83d272edf..5f2ec7ee46c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ddfd3d00068..3e02604b746 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index afdeb62e8ed..984cbeefeef 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -8,15 +8,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
-              <header>
-                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                  or
-                  <button string="Cancel" class="oe_link" special="cancel"/>
-              </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
                   <field name="date_to"/>
               </group>
+              <footer>
+                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                  or
+                  <button string="Cancel" class="oe_link" special="cancel"/>
+              </footer>
           </form>
         </field>
       </record>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 058feedcde3..084de5c2ae6 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <header>
-                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <separator string="Send Follow-ups"/>
                 <label string ="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."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
+                <footer>
+                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 220c592f6b5..ab90144f0e2 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
-                <header>
-                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="duedate" />
                 </group>
+                <footer>
+                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
@@ -26,14 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
-                    <header>
-                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Entries">
                         <field name="entries"/>
                     </group>
+                    <footer>
+                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ee86ed75a41..1053d47eebd 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -8,12 +8,12 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
-                    <header>
+                    <separator string="Are you sure you want to make payment?"/>
+                    <footer>
                         <button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index de1885b1014..c2789f95d38 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -8,14 +8,14 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
-                    <header>
-                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="lines"/>
                     </group>
+                    <footer>
+                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 5f12eb080b3..2c294fa628c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -112,7 +112,7 @@
                     </notebook>
                   </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5bda06622b1..c3291fb3bc3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -258,7 +258,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
@@ -431,7 +431,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 710a065c341..adb078fac22 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -168,7 +168,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
@@ -321,7 +321,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 5ecb4cd07bb..33014f394a7 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
-                    <header>
-                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="date"/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
+                    <footer>
+                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
-                    <header>
+                    <separator string="Payable and Receivables"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    <footer>
                         <button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Payable and Receivables"/>
-                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 3bfb0fcb4ec..04131b643eb 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                <footer>
                     <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 85a1520e561..0c06c90150c 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -44,7 +44,7 @@
                         </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
index 41e0bbd084a..9dc4c114743 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Projects Management: hr_expense link',
     'version': '1.1',
-    'category': 'Sales Management',
+    'category': 'Hidden',
     'description': """
 This module is for modifying project view to show some data related to the hr_expense module.
 ======================================================================================================
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
index d4350c7325f..3e892d5940f 100644
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -15,13 +15,13 @@
                         </td><td>
                             <field name="charge_expenses"/>
                         </td><td>
-                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <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)]}"/>
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index 981f7226d6a..fb56d3d1749 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Contracts Management: hr_expense link',
     'version': '1.1',
-    'category': 'Sales Management',
+    'category': 'Hidden',
     'description': """
 This module is for modifying account analytic view to show some data related to the hr_expense module.
 ======================================================================================================
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
index ccf712dc987..7ad28c911ba 100644
--- a/addons/analytic_contract_project/__openerp__.py
+++ b/addons/analytic_contract_project/__openerp__.py
@@ -23,6 +23,7 @@
     "name" : "Contract On Project",
     "version": "1.1",
     "author" : "OpenERP SA",
+    'category': 'Hidden',
     "website" : "http://www.openerp.com",
     "depends" : ["project", "account_analytic_analysis"],
     "description": """
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 0e61fe08d01..9914ed455af 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -15,7 +15,9 @@
                             <group string="Validity">
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                    <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>
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index fe48e329aea..e97dc28bca7 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_analytic_user_funct_manager,analytic user funct manager,model_analytic_us
 access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
 access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0
 access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1
+access_analytic_user_funct_grid_all,analytic user funct grid,model_analytic_user_funct_grid,base.group_user,1,0,0,0
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js
index 0e33998cd90..c4dc412dda1 100644
--- a/addons/anonymous/static/src/js/anonymous.js
+++ b/addons/anonymous/static/src/js/anonymous.js
@@ -40,7 +40,7 @@ openerp.anonymous = function(instance) {
                 var am = p.action_manager;
                 p.$element.find('.oe_leftbar').hide();
                 am.do_action({type:'ir.actions.client', tag:'login'});
-                am.client_widget.on('login', p, p.restart);
+                am.inner_widget.on('login', p, p.restart);
             });
         }
     });
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index b66173323e2..fdfffb73c23 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
-                    <header>
-                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                          <field name="from"/>
                          <field name="to"/>
                     </group>
+                    <footer>
+                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index e25e5039751..7462f5a06b6 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-08 02:21+0000\n"
+"PO-Revision-Date: 2012-07-07 21:07+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-06-28 04:39+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -31,7 +31,7 @@ msgstr "パートナを思い出させる"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr "取引先分類"
+msgstr "パートナ分類"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
@@ -156,7 +156,7 @@ msgid ""
 "14 days might trigger an automatic reminder email."
 msgstr ""
 "多種の画面のために自動的なアクションを自動的にトリガー実行するために使います。例えば、特定のユーザにより作成されたリードには自動的に特定の営業チームを設定"
-"したり、オポチュニティが保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
+"したり、商談が保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
diff --git a/addons/web_livechat/__init__.py b/addons/base_calendar/__init__.py
similarity index 85%
rename from addons/web_livechat/__init__.py
rename to addons/base_calendar/__init__.py
index 761db42923c..ec4f5070d63 100644
--- a/addons/web_livechat/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
-#
+#    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -14,9 +15,12 @@
 #    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 publisher_warranty
+
+import base_calendar
+import crm_meeting
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 1c8d35099b8..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Calendar Layer",
     "version": "1.0",
-    "depends": ["base", "mail"],
+    "depends": ["base", "base_status", "mail"],
     'description': """
 This is a full-featured calendar system.
 ========================================
@@ -46,7 +46,8 @@ If you need to manage your meetings, you should install the CRM module.
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
         'wizard/base_calendar_invite_attendee_view.xml',
-        'base_calendar_view.xml'
+        'base_calendar_view.xml',
+        'crm_meeting_view.xml',
     ],
     "test" : ['test/base_calendar_test.yml'],
     "installable": True,
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
new file mode 100644
index 00000000000..dcc97156681
--- /dev/null
+++ b/addons/base_calendar/crm_meeting.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import tools
+from tools.translate import _
+
+import base_calendar
+from base_status.base_state import base_state
+
+#
+# crm.meeting is defined here so that it may be used by modules other than crm,
+# without forcing the installation of crm.
+#
+
+class crm_meeting_type(osv.Model):
+    _name = 'crm.meeting.type'
+    _description = 'Meeting Type'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+    }
+
+class crm_meeting(base_state, osv.Model):
+    """ Model for CRM meetings """
+    _name = 'crm.meeting'
+    _description = "Meeting"
+    _order = "id desc"
+    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _columns = {
+        # base_state required fields
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'write_date': fields.datetime('Write Date', readonly=True),
+        'date_open': fields.datetime('Confirmed', readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
+        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]},
+                        help="These people will receive email."),
+        'state': fields.selection(
+                    [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
+                    string='Status', size=16, readonly=True),
+        # Meeting fields
+        'name': fields.char('Summary', size=128, required=True, states={'done': [('readonly', True)]}),
+        'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type'),
+        'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
+                            'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
+    }
+    _defaults = {
+        'state': 'draft',
+    }
+
+    # ----------------------------------------
+    # OpenChatter
+    # ----------------------------------------
+
+    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)
+
+    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)
+
+
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
new file mode 100644
index 00000000000..b6365ebc53c
--- /dev/null
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!-- Read/Unread actions -->
+
+    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
+        <field name="name">Mark read</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_crm_meeting"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_crm_meeting_read" model="ir.values">
+        <field name="name">action_crm_meeting_read</field>
+        <field name="action_id" ref="actions_server_crm_meeting_read"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
+        <field name="key">action</field>
+        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model">crm.meeting</field>
+        <field name="key2">client_action_multi</field>
+    </record>
+
+    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
+        <field name="name">Mark unread</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_crm_meeting"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_crm_meeting_unread" model="ir.values">
+        <field name="name">action_crm_meeting_unread</field>
+        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
+        <field name="key">action</field>
+        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model">crm.meeting</field>
+        <field name="key2">client_action_multi</field>
+    </record>
+
+    <!-- CRM Meetings Types Form View -->
+
+    <record id="view_crm_meeting_type_tree" model="ir.ui.view">
+        <field name="name">Meeting Types Tree</field>
+        <field name="model">crm.meeting.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Meeting Types" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_crm_meeting_type" model="ir.actions.act_window">
+        <field name="name">Meeting Types</field>
+        <field name="res_model">crm.meeting.type</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_crm_meeting_type_tree"/>
+        <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
+    </record>
+
+    <menuitem id="menu_crm_meeting_type" parent="base.menu_calendar_configuration" sequence="1"
+        action="action_crm_meeting_type" groups="base.group_no_one"/>
+
+    <!-- CRM Meetings Form View -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_form">
+        <field name="name">CRM - Meetings Form</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Meetings" version="7.0">
+                <header>
+                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
+                            states="draft"/>
+                    <button name="case_close" string="Done" type="object" class="oe_highlight"
+                            states="open"/>
+                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
+                            states="cancel,done"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft,open"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name" string="Title"/> 
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                            <label for="allday" string="All Day?"/>)
+                        </div>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <h2>
+                            <label for="date" string="Starting at"/>
+                            <field name="date" required="1" class="oe_inline"/>
+                            <label for="location" string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/>
+                            <field name="location" placeholder="Specify the location here" class="oe_inline"/>
+                        </h2>
+                        <h2>
+                            <label for="duration" string="Duration" />
+                            <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"
+                                class="oe_inline"/> ( 
+                            <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"                            
+                                class="oe_inline"/> )
+                        </h2>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="user_id" />
+                            <field name="organizer"/>
+                        </group>
+                        <group>
+                            <field name="alarm_id" string="Reminder" widget="selection" />
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show Time as"/>
+                            <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" string="Partner"
+                                on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
+                        </group>
+                        <group>
+                            <field name="categ_id" widget="selection"/>
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
+                    <notebook>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" widget="one2many" mode="tree">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="sent_by_uid" string="From"/>
+                                    <field name="user_id" string="To"/>
+                                    <field name="email" string="Mail To"/>
+                                    <field name="role" />
+                                    <field name="state" />
+                                    <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" />
+                                    <button name="do_decline" string="Decline"
+                                        states="needs-action,tentative,accepted"
+                                        type="object" icon="gtk-cancel" />
+                                    <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>
+                                <form string="Invitation details" version="7.0">
+                                    <header>
+                                        <button name="do_tentative" type="object"
+                                            states="needs-action,declined,accepted"
+                                            string="Uncertain" icon="terp-crm" />
+                                        <button name="do_accept" type="object"
+                                            states="needs-action,tentative,declined"
+                                            string="Accept" icon="gtk-apply" />
+                                        <button name="do_decline" type="object"
+                                            states="needs-action,tentative,accepted"
+                                            string="Decline" icon="gtk-cancel" />
+                                        <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"
+                                            context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="email" />
+                                            <field name="rsvp" />
+                                            <field name="cutype" />
+                                            <field name="role" />
+                                        </group>
+                                        <group>
+                                            <field name="user_id"/>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                            <group col="4" colspan="4" name="rrule">
+                                <group col="4" colspan="4">
+                                    <field name="rrule_type" string=" Recurrence Pattern" />
+                                    <field name="interval" />
+                                    <field name="end_type" />
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                    <newline />
+                                </group>
+                                <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                    <separator string="Choose day where repeat the meeting" colspan="8"/>
+                                    <field name="mo" colspan="1" />
+                                    <field name="tu" colspan="1" />
+                                    <field name="we" colspan="1" />
+                                    <field name="th" colspan="1" />
+                                    <newline/>
+                                    <field name="fr" colspan="1" />
+                                    <field name="sa" colspan="1"  />
+                                    <field name="su" colspan="1"  />
+                                    <newline />
+                                </group>
+                                <group col="10" colspan="4"
+                                    attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                    <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
+                                    <group col="2" colspan="1">
+                                        <field name="select1" />
+                                    </group>
+                                    <group col="2" colspan="1">
+                                        <field name="day"
+                                            attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                                'invisible' : [('select1','=','day')]}" />
+                                    </group>
+                                    <group col="3" colspan="1">
+                                        <field name="byday" string="The"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                        <field name="week_list" nolabel="1"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Tree View  -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_tree">
+        <field name="name">CRM - Meetings Tree</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">tree</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')">
+                <field name="name" string="Subject" />
+                <field name="user_id"/>
+                <field name="date"/>
+                <field name="state"/>
+                <field name="duration" />
+                <field name="partner_id" string="Partner" />
+                <field name="location" />
+                <field name="categ_id"/>
+                <field name="needaction_pending" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Calendar -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_calendar">
+        <field name="name">CRM - Meetings Calendar</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Gantt  -->
+
+    <record id="view_crm_meeting_gantt" model="ir.ui.view">
+        <field name="name">CRM - Meetings Gantt</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">gantt</field>
+        <field name="arch" type="xml">
+            <gantt date_delay="duration" date_start="date" string="Meetings"/>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Search View  -->
+
+    <record id="view_crm_meeting_search" model="ir.ui.view">
+        <field name="name">CRM - Meetings Search</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Meetings">
+                <group>
+                    <field name="name" string="Meeting / Partner"
+                        filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
+                    <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new"
+                        name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator orientation="vertical"/>
+                    <filter string="My Meetings" help="My Meetings" icon="terp-personal"
+                        domain="[('user_id','=',uid)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- CRM Meetings action and menu -->
+
+    <record id="action_crm_meeting" model="ir.actions.act_window">
+        <field name="name">Meetings</field>
+        <field name="res_model">crm.meeting</field>
+        <field name="view_mode">calendar,tree,form,gantt</field>
+        <field name="view_id" ref="view_crm_meeting_calendar"/>
+        <field name="search_view_id" ref="view_crm_meeting_search"/>
+        <field name="context">{"calendar_default_user_id": uid}</field>
+        <field name="help">
+            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.
+        </field>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_calendar">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="view_crm_meeting_calendar"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_tree">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_crm_meeting_tree"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_form">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_crm_meeting_form"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_gantt">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="4"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="view_crm_meeting_gantt"/>
+    </record>
+
+    <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
+        name="Meetings" action="action_crm_meeting"/>
+
+    </data>
+</openerp>
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 34543f0e912..24af1abf0e5 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -5,3 +5,9 @@ access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
 access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
 access_calendar_event,calendar.event,model_calendar_event,base.group_user,1,1,1,1
 access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0
+access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
+access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
+access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0
+access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index a16715e0d52..3bdb9144907 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <header>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -36,6 +31,11 @@
                             </group>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index 1abd6ff3570..4072db42318 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
-                    <header>
+                    <separator string="Relationship Graphs" colspan="6"/>
+                    <footer>
                         <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Relationship Graphs" colspan="6"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 93c38d794f4..281576b0b6a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index b947c94f871..a621ae69547 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -86,11 +86,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Module Information">
                         <field name="name"/>
                         <field name="directory_name"/>
@@ -102,6 +97,11 @@
                     </group>
                     <separator string="Description"/>
                     <field name="description"/>
+                    <footer>
+                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
          </record>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 106ad662b0f..39943697d4f 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Recording Information">
                         <field name="info_status"/>
                         <field name="info_text"/>
                         <field name="info_yaml"/>
                    </group>
+                    <footer>
+                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
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 c060f4a961a..12ac67e3ba0 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
-                <header>
+                <group string="Select your report">
+                    <field name="report_id"/>
+                </group>
+                <footer>
                     <button name="get_report" string="Continue" type="object" class="oe_highlight"/>
                     <button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group string="Select your report">
-                    <field name="report_id"/>
-                </group>
+                </footer>
             </form>
             </field>
        </record>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 8bf029ddbdb..7428d51e337 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-25 05:03+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-12 01:34+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-06-26 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-13 04:46+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -200,17 +200,17 @@ msgstr "どのように顧客を呼びますか"
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr "Quickbooks lppids"
+msgstr "QuickBooksのIPP / IDS"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr "取引先"
+msgstr "顧客"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr "Saleforceを取り込む"
+msgstr "Salesforceのインポート"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -249,22 +249,22 @@ msgstr "user.preferences.config"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr "追加ユーザを作成します。"
+msgstr "追加ユーザの作成"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr "顧客を作成または取り込みます。"
+msgstr "顧客の作成 / インポート"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr "SugarCRMを取り込みます。"
+msgstr "SugarCRMのインポート"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr "顧客を取り込みまたは作成します。"
+msgstr "顧客の作成 / インポート"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
@@ -279,7 +279,7 @@ msgstr "SugarCRMを取り込むために"
 #. 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/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 85a20bddf52..8607e671085 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -12,29 +12,27 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Company Settings">
-                            <group>
-                                <field name="module_multi_company"/>
-                            </group>
-                            <group>
-                                <div>
-                                    You will also find several configuration options on your company data:
-                                    address for the header and footer, overdue payments texts, etc.
-                                </div>
-                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            </group>
+                    <group string="Company Settings">
+                        <group>
+                            <field name="module_multi_company"/>
                         </group>
-                        <group string="External Accesses">
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
+                        <group>
+                            <div>
+                                You will also find several configuration options on your company data:
+                                address for the header and footer, overdue payments texts, etc.
+                            </div>
+                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                         </group>
-                        <group string="Others">
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
-                        </group>
-                    </sheet>
+                    </group>
+                    <group string="External Accesses">
+                        <field name="module_share"/>
+                        <field name="module_portal"/>
+                    </group>
+                    <group string="Others">
+                        <label for="id" string="Outgoing Mail Servers"/>
+                        <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -60,15 +58,13 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_sale"/>
-                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <field name="module_plugin_thunderbird"/>
-                            <field name="module_plugin_outlook"/>
-                        </group>
-                        <group name="config_crm"/>
-                    </sheet>
+                    <field name="module_crm" invisible="1"/>
+                    <group name="config_sale"/>
+                    <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <field name="module_plugin_thunderbird"/>
+                        <field name="module_plugin_outlook"/>
+                    </group>
+                    <group name="config_crm"/>
                 </form>
             </field>
         </record>
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 5baf71a01b6..35995ac7da3 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -29,6 +29,7 @@ class base_state(object):
         - ``date_closed`` (datetime field)
         - ``user_id`` (many2one to res.users)
         - ``partner_id`` (many2one to res.partner)
+        - ``email_from`` (char field)
         - ``state`` (selection field)
     """
 
diff --git a/addons/base_tools/i18n/mn.po b/addons/base_tools/i18n/mn.po
new file mode 100644
index 00000000000..fd9a1ec8f59
--- /dev/null
+++ b/addons/base_tools/i18n/mn.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-07-08 19:30+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-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\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 ""
+"\n"
+"    "
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 3720e87cf43..122dcfe9586 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
-                    <header>
-                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
                         <field name="menu_parent_id"/>
                     </group>
+                    <footer>
+                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 29f455d764f..0c16fd0eba4 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Caldav" version="7.0">
-                    <header>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                    </header>
                     <sheet>
                         <group>
                             <separator string="Browse Caldav" colspan="4"/>
@@ -37,6 +34,9 @@
                             
                         </group>
                     </sheet>
+                    <footer>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 3f498504444..014f5500384 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 590daa34561..0601349690d 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 95cf8b53f27..729d54e0fc6 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -22,8 +22,8 @@
 import crm
 import crm_action_rule
 import crm_segmentation
-import crm_meeting
 import crm_lead
+import crm_meeting
 import crm_phonecall
 import report
 import wizard
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 1b8148fe43b..d73939c759e 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -69,10 +69,10 @@
             <field name="name">Meetings</field>
             <field name="res_model">crm.meeting</field>
             <field name="view_mode">calendar,tree,form,gantt</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="view_id" ref="base_calendar.view_crm_meeting_tree"/>
             <field name="context">{"calendar_default_user_id":uid}</field>
             <field name="domain">[('state','=','open'),('date','&gt;',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))]</field>
-            <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+            <field name="search_view_id" ref="base_calendar.view_crm_meeting_search"/>
         </record>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e98b88e60fa..89da8d357f7 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -9,7 +9,7 @@
         <field name="name">Meetings</field>
         <field name="resource">ir.ui.menu</field>
         <field name="user_id" ref="base.user_demo"/>
-        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+        <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
     </record>
 
     <record model="crm.case.section" id="section_sales_marketing_department">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 69d390ff04d..adf15e93a89 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -41,6 +41,7 @@ class crm_lead(base_stage, osv.osv):
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -763,43 +764,21 @@ class crm_lead(base_stage, osv.osv):
         }
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Opportunity
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @return : Dictionary value for created Meeting view
-        """
-        if context is None:
-            context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for opp in self.browse(cr, uid, ids, context=context):
-            # Get meeting views
-            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_meet')
-            calander_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            context.update({
-                'default_opportunity_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_user_id': uid,
-                'default_section_id': opp.section_id and opp.section_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',
-                'default_name': opp.name
-            })
-            value = {
-                'name': _('Meetings'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True
-            }
-        return value
-
+        opportunity = self.browse(cr, uid, ids[0], context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_opportunity_id': opportunity.id,
+            'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
+            'default_user_id': uid,
+            'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
+            'default_email_from': opportunity.email_from,
+            'default_state': 'open',
+            'default_name': opportunity.name,
+        }
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
         for lead in self.browse(cr, uid, ids, context):
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 629d2f43446..67f2b7e7080 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -171,10 +171,13 @@
                             </div>
                         </group>
                         <group>
-                            <field name="contact_name" />
+                            <label for="contact_name" />
+                            <div>
+                                <field name="contact_name" class="oe_inline"/>,
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+                            </div>
                             <field name="email_from" widget="email"/>
                             <field name="function" />
-                            <field domain="[('domain', '=', 'contact')]" name="title"/>
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
@@ -210,7 +213,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
@@ -286,7 +289,7 @@
                     <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">i</span>
+                                <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
@@ -308,18 +311,14 @@
                                     <field name="partner_id"/>
                                 </div>
                                 <div style="padding-left: 0.5em">
-                                    <i>
-                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-                                        <span t-attf-class="#{red || ''}">
-                                            <field name="date_action"/>
-                                        </span>
-                                        <t t-if="record.date_action.raw_value"> : </t>
-                                        <field name="title_action"/>
-                                    </i>
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                    <t t-if="record.date_action.raw_value"> : </t>
+                                    <field name="title_action"/>
                                 </div>
-                                <div class="oe_right">
-                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.7; filter:alpha(opacity=70);"/>
+                                <div class="oe_kanban_bottom_right">
+                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <!--
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
                                     <span t-attf-class="oe_kanban_status #{red}"> </span>
@@ -468,8 +467,8 @@
                         <label for="planned_revenue" class="oe_edit_only"/>
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_edit_only oe_inline"/> at 
-                            <field name="probability" class="oe_inline"/> %% success rate
+                            <field name="company_currency" class="oe_inline"/> at 
+                            <field name="probability" class="oe_inline"/>%% success rate
                         </h2>
                     </div>
                     <group>
@@ -522,18 +521,21 @@
                                     <field name="street" placeholder="Street..."/>
                                     <field name="street2"/>
                                     <div>
-                                        <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                        <field name="city" class="oe_inline" placeholder="City"/>
+                                        <field name="city" placeholder="City" style="width: 40%%"/>
+                                        <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                        <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                     </div>
-                                    <field name="state_id" placeholder="State"/>
                                     <field name="country_id" placeholder="Country"/>
                                 </div>
                             </group>
 
                             <group>
-                                <field name="contact_name" />
+                                <label for="contact_name" />
+                                <div>
+                                    <field name="contact_name" class="oe_inline"/>
+                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline oe_no_button"/>
+                                </div>
                                 <field name="function" />
-                                <field domain="[('domain', '=', 'contact')]" name="title"/>
                                 <field name="mobile"/>
                                 <field name="fax"/>
                             </group>
@@ -563,7 +565,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 37f03d80ec4..bdc5e91ad33 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -19,56 +19,23 @@
 #
 ##############################################################################
 
-from base_calendar import base_calendar
-from base_status.base_state import base_state
-from base_status.base_stage import base_stage
-import logging
 from osv import fields, osv
 import tools
 from tools.translate import _
+import logging
 _logger = logging.getLogger(__name__)
 
-class crm_lead(base_stage, osv.osv):
-        """ CRM Leads """
-        _name = 'crm.lead'
-
-class crm_meeting(base_state, osv.Model):
+#
+# crm.meeting is defined in module base_calendar
+#
+class crm_meeting(osv.Model):
     """ Model for CRM meetings """
-    _name = 'crm.meeting'
-    _description = "Meeting"
-    _order = "id desc"
-    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _inherit = 'crm.meeting'
     _columns = {
-        # base_state required fields
-        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]},
                         select=True, groups='base.group_sale_salesman', help='Sales team to which Case belongs to.'),
-        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'write_date': fields.datetime('Write Date' , readonly=True),
-        'date_action_last': fields.datetime('Last Action', readonly=1),
-        'date_action_next': fields.datetime('Next Action', readonly=1),
-        # Meeting fields
-        'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}),
-        'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
-                        domain="[('object_id.model', '=', 'crm.meeting')]", \
-            ),
         'phonecall_id': fields.many2one ('crm.phonecall', 'Phonecall'),
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
-        'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
-                                 'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
-        'state': fields.selection([ ('draft', 'Unconfirmed'),
-                                    ('open', 'Confirmed'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Done')],
-                                    string='Status', size=16, readonly=True),
-    }
-    _defaults = {
-        'state': 'draft',
-        'active': 1,
-        'user_id': lambda self, cr, uid, ctx: uid,
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -76,52 +43,28 @@ class crm_meeting(base_state, osv.Model):
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
 
-    def case_open(self, cr, uid, ids, context=None):
-        """ Confirms meeting """
-        res = super(crm_meeting, self).case_open(cr, uid, ids, context)
-        for (id, name) in self.name_get(cr, uid, ids):
-            id=base_calendar.base_calendar_id2real_id(id)
-        return res
-    
-    # ----------------------------------------
-    # OpenChatter
-    # ----------------------------------------
-
-    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-        return 'Meeting'
-
     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
         context.pop('default_state', False)
         for meeting in self.browse(cr, uid, ids, context=context):
-            # convert datetime field to a datetime, using server format, then
-            # convert it to the user TZ and re-render it with %Z to add the timezone
-            meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_str)
+            # in the message, transpose meeting.date to the timezone of the current user
+            meeting_date = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            meeting_date_tz = fields.datetime.context_timestamp(cr, uid, meeting_date, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
-                parent_message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (lead.name, meeting.date)
+                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)
             elif meeting.phonecall_id:
                 phonecall = meeting.phonecall_id
-                parent_message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (phonecall.name, meeting.date)
+                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)
             else:
-                parent_message = message
-            if parent_message:
-                meeting.message_append_note(body=parent_message)
+                message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_tz)
+            meeting.message_append_note(body=message)
         return True
 
-    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)
-
-    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)
-
-
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
 
@@ -155,8 +98,6 @@ class calendar_attendee(osv.osv):
                         relation="crm.case.categ", multi='categ_id'),
     }
 
-calendar_attendee()
-
 class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
@@ -177,7 +118,4 @@ class res_users(osv.osv):
                 _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
         return user_id
 
-res_users()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 86cdf97a2a3..82752d1dc7d 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -4,22 +4,16 @@
 
         <!--    CASE CATEGORY(categ_id)        -->
 
-        <record model="crm.case.categ" id="categ_meet1">
+        <record model="crm.meeting.type" id="categ_meet1">
             <field name="name">Customer Meeting</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
-        <record model="crm.case.categ" id="categ_meet2">
+        <record model="crm.meeting.type" id="categ_meet2">
             <field name="name">Internal Meeting</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
-        <record model="crm.case.categ" id="categ_meet3">
+        <record model="crm.meeting.type" id="categ_meet3">
             <field name="name">Phone Call</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
          <record model="res.request.link" id="request_link_meeting">
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 6c4c9051cbf..aec88a5748e 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,102 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <act_window
-        id="crm_case_categ_meet_create_partner"
-        name="Schedule a Meeting"
-        res_model="crm.meeting"
-        view_mode="calendar,tree,form,gantt"
-        context="{'default_partner_id': active_id, 'default_duration': 4.0}"
-    />
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_partner">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_partner">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_partner">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_meet">
-        <field name="name">Meetings</field>
-        <field name="res_model">crm.meeting</field>
-        <field name="view_mode">calendar,tree,form,gantt</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"calendar_default_user_id":uid}</field>
-        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
-        <field name="help">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.
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-<!-- ALL MEETINGS -->
 
     <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
         parent="base.menu_base_partner"/>
 
-    <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-        action="crm_case_categ_meet" parent="base.menu_sales"
-        sequence="7" />
-
-    <record id="action_view_attendee_form" model="ir.actions.act_window">
-         <field name="name">Meeting Invitations</field>
-         <field name="type">ir.actions.act_window</field>
-         <field name="res_model">calendar.attendee</field>
-         <field name="view_type">form</field>
-         <field name="view_mode">tree,form</field>
-         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
-        <field name="domain">[('ref','like','crm.meeting,')]</field>
-         <field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
-        <field name="help">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.</field>
-     </record>
-
-
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml
index 0f75c9e91ab..45488da8a82 100644
--- a/addons/crm/crm_meeting_shortcut_data.xml
+++ b/addons/crm/crm_meeting_shortcut_data.xml
@@ -6,7 +6,7 @@
             <field name="name">Meetings</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
         </record>
 
     </data>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5473b727ea3..f7c2ada05f2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,361 +2,48 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_unread" model="ir.values">
-        <field name="name">action_crm_meeting_unread</field>
-        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_read" model="ir.values">
-        <field name="name">action_crm_meeting_read</field>
-        <field name="action_id" ref="actions_server_crm_meeting_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <!-- CRM Meetings Categories Form View -->
-
-    <record id="crm_meeting_categ_action" model="ir.actions.act_window">
-        <field name="name">Meeting Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
-        <field name="context" eval="{'object_id': ref('model_crm_meeting')}"/>
-        <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
-    </record>
-
-     <menuitem action="crm_meeting_categ_action"
-        groups="base.group_no_one"
-        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
-
     <!-- CRM Meetings Form View -->
 
-    <record model="ir.ui.view" id="crm_case_form_view_meet">
+    <record model="ir.ui.view" id="view_crm_meeting_form">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
         <field name="arch" type="xml">
-            <form string="Meetings" version="7.0">
-                <header>
-                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
-                            states="draft"/>
-                    <button name="case_close" string="Done" type="object" class="oe_highlight"
-                            states="open"/>
-                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft,open"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet>
-                    <div class="oe_title">
-                        <div class="oe_edit_only">
-                            <label for="name" string="Title"/> 
-                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                            <label for="allday" string="All Day?"/>)
-                        </div>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                    </div>
-                    <group>
-                        <h2>
-                            <label for="date" string="Starting at"/>
-                            <field name="date" required="1" class="oe_inline"/>
-                            <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
-                        </h2>
-                    </group>
-                    <group>
-                        <h2>
-                            <label for="duration" string="Duration" />
-                            <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"
-                                class="oe_inline"/> ( 
-                            <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"                            
-                                class="oe_inline"/> )
-                        </h2>
-                    </group>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="organizer"/>
-                        <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
-                    </group>
-                </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
-                <notebook>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree">
-                            <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
-                                <field name="email" string="Mail To"/>
-                                <field name="role" />
-                                <field name="state" />
-                                <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" />
-                                <button name="do_decline" string="Decline"
-                                    states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <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>
-                            <form string="Invitation details" version="7.0">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="email" />
-                                        <field name="rsvp" />
-                                        <field name="cutype" />
-                                        <field name="role" />
-                                        <separator colspan="4" string="" />
-                                        <group col="6" colspan="4">
-                                            <field name="state" />
-                                            <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" />
-                                            <button name="do_decline"
-                                                string="Decline"
-                                                states="needs-action,tentative,accepted"
-                                                type="object"
-                                                icon="gtk-cancel" />
-                                            <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'}" />
-                                        </group>
-                                    </page>
-                                    <page string="Other">
-                                        <field name="user_id"/>
-                                        <newline />
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string=" Recurrence Pattern" />
-                                <field name="interval" />
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
-                                <newline />
-
-
-                            </group>
-                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
-                                <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
-                            </group>
-                            <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
-                                <group col="2" colspan="1">
-                                    <field name="select1" />
-                                </group>
-                                <group col="2" colspan="1">
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="3" colspan="1">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </group>
-                            </group>
-                        </group>
-
-                    </page>
-                </notebook>
-                </sheet>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Tree View  -->
-
-    <record model="ir.ui.view" id="crm_case_tree_view_meet">
-        <field name="name">CRM - Meetings Tree</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">tree</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')">
-                <field name="name" string="Subject" />
-                <field name="user_id"/>
-                <field name="date"/>
-                <field name="state"/>
-                <field name="duration" />
-                <field name="partner_id" string="Partner" />
-                <field name="location" />
-                <field name="categ_id"/>
-                <field name="needaction_pending" invisible="1"/>
-            </tree>
+            <field name="organizer" position="after">
+                <field name="section_id" widget="selection"/>
+            </field>
         </field>
     </record>
 
     <!-- CRM Meeting Calendar -->
 
-    <record model="ir.ui.view" id="crm_case_calendar_view_meet">
+    <record model="ir.ui.view" id="view_crm_meeting_calendar">
         <field name="name">CRM - Meetings Calendar</field>
         <field name="model">crm.meeting</field>
         <field name="type">calendar</field>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_calendar"/>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
+            <field name="partner_id" position="after">
                 <field name="section_id" widget="selection"/>
-            </calendar>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Gantt  -->
-
-    <record id="crm_case_gantt_view_meet" model="ir.ui.view">
-        <field name="name">CRM - Meetings Gantt</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">gantt</field>
-        <field name="arch" type="xml">
-            <gantt date_delay="duration" date_start="date" string="Meetings">
-            </gantt>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Search View  -->
-
-    <record id="view_crm_case_meetings_filter" model="ir.ui.view">
-        <field name="name">CRM - Meetings Search</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-                <search string="Search Meetings">
-                       <group>
-                            <filter icon="terp-mail-message-new"
-			                   string="Inbox" help="Unread messages"
-			                   name="needaction_pending"
-			                   domain="[('needaction_pending','=',True)]"/>
-                           <separator orientation="vertical"/>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
-                           <separator orientation="vertical"/>
-                           <filter string="My Meetings"
-                                   icon="terp-personal"
-                                   domain="[('user_id','=',uid)]"
-                                   help="My Meetings" />
-                           <separator orientation="vertical"/>   
-                           <field name="user_id"/>
-                           <field name="partner_id"/>
-                       </group>
-                </search>
             </field>
-        </record>
+        </field>
+    </record>
 
-        <!-- Calendar Attendee Form 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="type">form</field>
-                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
-                <field name="arch" type="xml">
-                    <field name="ref" position="after">
-                        <field name="categ_id" string="Event Type"/>
-                    </field>
+    <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="type">form</field>
+            <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
+            <field name="arch" type="xml">
+                <field name="ref" position="after">
+                    <field name="categ_id" string="Event Type"/>
                 </field>
-        </record>
-
+            </field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 13991245eda..facd0baba8a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -241,49 +241,20 @@ class crm_phonecall(base_state, osv.osv):
         return opportunity_dict
 
     def action_make_meeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Phonecall
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        for phonecall in self.browse(cr, uid, ids, context=context):
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            context = {
-                        'default_phonecall_id': phonecall.id,
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
-                        'default_email': phonecall.email_from ,
-                        'default_name': phonecall.name
-                    }
-
-            value = {
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-                'nodestroy': True
-                }
-
-        return value
+        phonecall = self.browse(cr, uid, ids[0], context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_phonecall_id': phonecall.id,
+            'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+            'default_user_id': uid,
+            'default_email_from': phonecall.email_from,
+            'default_state': 'open',
+            'default_name': phonecall.name,
+        }
+        return res
     
     # ----------------------------------------
     # OpenChatter
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6d09b2f2947..a874eeee239 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -146,7 +146,7 @@
                 <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
             </form>
         </field>
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index f0761c35843..4281ea13d90 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 07:49+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-09 05: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-06-12 04:55+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\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
@@ -36,12 +36,12 @@ 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
@@ -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
@@ -82,12 +82,12 @@ 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
@@ -98,7 +98,7 @@ msgstr "注記を追加することは出来ません。"
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr "ステージ名"
+msgstr "段階名"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -114,29 +114,29 @@ 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 ""
+msgstr "リード %s は商談に変換されました。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+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
@@ -163,17 +163,17 @@ 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
@@ -202,30 +202,30 @@ msgstr "主催者"
 #: 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 ""
+msgstr "商談 %s は失注としてマークされています。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -235,16 +235,18 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"リード分析は異なるCRMの関連情報を確認することができます。取り扱いの遅延、与えられた回答の番号、送信されたEメールをチェックします。正確な粒度の分析を得"
+"るために、異なったグループによるリード分析を並べ変えることができます。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "新規メールを送信"
+msgstr "新規Eメール送信"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "基準"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -254,12 +256,12 @@ msgstr "回答を除く"
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "セクション"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "統合"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -304,12 +306,12 @@ msgstr "日付"
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "オプトアウトをチェックした場合、この連絡先はEメールの受信を拒否するか、またはキャンペーンには未参加となります。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "予想パートナ"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
@@ -328,7 +330,7 @@ msgstr "Google アドワーズ ２"
 #: 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
@@ -351,33 +353,33 @@ 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
@@ -410,7 +412,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
@@ -425,12 +427,12 @@ 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
@@ -447,6 +449,9 @@ 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
@@ -461,29 +466,29 @@ 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
@@ -501,7 +506,7 @@ msgstr "拡大"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "郵便物"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -518,12 +523,12 @@ msgstr "6月"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "停止中"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr "メール"
+msgstr "Eメール"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -545,7 +550,7 @@ msgstr "回答を含む："
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "これらの人がEメールを受け取ります。"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
@@ -555,19 +560,19 @@ 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
@@ -587,30 +592,30 @@ 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
@@ -622,7 +627,7 @@ msgstr "進行中"
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "Eメールアドレスはこの営業チームの中の案件についてOpenERPにより送信された全てのEメールのReply-Toに置かれます。"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
@@ -638,7 +643,7 @@ msgstr "作業時間"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "パートナ分類行"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
@@ -650,17 +655,17 @@ msgstr "詳細"
 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
@@ -671,16 +676,19 @@ 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
@@ -690,12 +698,12 @@ 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
@@ -705,7 +713,7 @@ 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
@@ -716,6 +724,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
@@ -723,32 +733,32 @@ 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
 msgid "Television"
-msgstr ""
+msgstr "テレビ"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+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
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "通話の検索"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
@@ -758,27 +768,27 @@ 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
 msgid "Event Type"
-msgstr ""
+msgstr "イベントタイプ"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "排他"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -786,13 +796,13 @@ 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 "%s : %sから"
+msgstr "%s から：%s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
@@ -808,49 +818,49 @@ msgstr "作成日"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+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
@@ -860,18 +870,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
@@ -881,7 +891,7 @@ msgstr "仕入先"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "受注とマーク"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -891,7 +901,7 @@ msgstr "仕入高"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "失注とマーク"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -911,7 +921,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
@@ -921,12 +931,12 @@ 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
@@ -941,7 +951,7 @@ msgstr "携帯電話"
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr "次へ"
+msgstr "次の段階"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -951,12 +961,12 @@ 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
@@ -966,7 +976,7 @@ 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
@@ -984,24 +994,24 @@ msgstr "ミーティング"
 #: 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 "アクティブ項目をTrueに設定した場合，イベントアラーム情報を削除することなく，非表示にできます。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1011,7 +1021,7 @@ msgstr "色の変更"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "パートナの分類"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
@@ -1022,7 +1032,7 @@ msgstr "担当"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "商談のみ表示"
 
 #. module: crm
 #: view:res.partner:0
@@ -1032,12 +1042,12 @@ msgstr "前へ"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr "新規見込み客"
+msgstr "新規リード"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "統計"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1047,7 +1057,7 @@ msgstr "差出人"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "商談に変換"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1062,17 +1072,17 @@ msgstr "次へ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr "段階"
+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
@@ -1082,7 +1092,7 @@ msgstr "営業部"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "精神の状態"
 
 #. module: crm
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
@@ -1093,12 +1103,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
@@ -1115,17 +1125,17 @@ msgstr "私の商談"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Webサイトデザインが必要"
 
 #. 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
@@ -1135,7 +1145,7 @@ 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
@@ -1151,37 +1161,37 @@ 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
@@ -1197,14 +1207,14 @@ msgstr "段階"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "見込売上"
 
 #. 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 ""
+msgstr "システム内の通話追跡をより良くするタイプの定義として、特定の通話分類を作成します。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1216,14 +1226,14 @@ msgstr "9月"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+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
@@ -1235,17 +1245,17 @@ msgstr "通話分析"
 #: 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
@@ -1255,14 +1265,14 @@ 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 "アクティブ項目がTrueに設定されると、営業チームを削除することなく非表示にできます。"
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -1274,12 +1284,12 @@ msgstr "番地"
 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
@@ -1294,24 +1304,24 @@ 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
@@ -1329,7 +1339,7 @@ msgstr "パートナを作成"
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "実行ステータス"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -1342,6 +1352,10 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"案件が作成された時に、状態はToDoにセットされます。\n"
+"案件が進行中の時に、状態は開くにセットされます。\n"
+"通話が終了した時に、状態は保留にセットされます。\n"
+"通話が行われる必要がある場合は、状態は未保留にセットされます。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1351,7 +1365,7 @@ msgstr "月曜日"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr "契約日"
+msgstr "終了日"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
@@ -1362,12 +1376,12 @@ msgstr "不明"
 #: 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
@@ -1379,12 +1393,12 @@ 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
@@ -1394,12 +1408,12 @@ 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
@@ -1410,34 +1424,34 @@ msgstr "通話日"
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
-msgstr ""
+msgstr "メールを送信する時、デフォルトEメールアドレスは営業チームのものが使われます。"
 
 #. 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
@@ -1446,31 +1460,33 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 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
@@ -1480,7 +1496,7 @@ msgstr ""
 #: view:crm.phonecall2partner:0 view:res.partner:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
@@ -1490,91 +1506,91 @@ msgstr ""
 #. 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 "パートナにEメールを送信するルールを望む場合は、これをチェックします。"
 
 #. 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
 msgid "Unconfirmed"
-msgstr ""
+msgstr "未確定"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1585,17 +1601,19 @@ 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
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+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
@@ -1604,53 +1622,55 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 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
 msgid "Birthdate"
-msgstr ""
+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
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "高い"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 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
 msgid "_Convert"
-msgstr ""
+msgstr "変換"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1659,198 +1679,200 @@ 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 ""
+"ミーティング招待は同僚やパートナにミーティングの招待を送信する / "
+"されるための作成と管理ができます。OpenERPユーザのみならず、顧客といった外部の関係者を招待することができます。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "土曜"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+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
 msgid "Allow Delete"
-msgstr ""
+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
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+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
 msgid "Value"
-msgstr ""
+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
@@ -1858,31 +1880,31 @@ 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
 msgid "Extra Info"
-msgstr ""
+msgstr "追加情報"
 
 #. 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 ""
+msgstr "商談の統合"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1897,115 +1919,115 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+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 "優先度"
 
 #. 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
 msgid "Reply"
-msgstr ""
+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
 msgid "Planned Date"
-msgstr ""
+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
@@ -2016,72 +2038,74 @@ 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 ""
+msgstr "ｘ回繰り返し"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "営業チーム"
 
 #. module: crm
 #: 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 "分類"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+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
 msgid "Probability"
-msgstr ""
+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
@@ -2089,7 +2113,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
@@ -2104,6 +2128,10 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"リードは製品やサービスに興味を見せる見込み客やパートナに対して全ての初期接触の管理と追跡を続けることを許します。リードは通常、営業サイクルの最初のステップ"
+"です。一度、資格を認められると、リードはビジネスの商談に変換することができます。と同時に、全てのリンクする活動をそれ以上詳細の追跡のために、関連するパート"
+"ナを作成します。見込みのデータベースのインポート、名刺の継続追跡、またはIpenERPリードとあなたのWebサイトの連絡先フォームの統合ができます。リード"
+"はEメールゲートウェイとの接続も可能です：新規Eメールはリードを作成し、それらの各々は自動的に見込みとともに会話の履歴を取得します。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2111,60 +2139,60 @@ 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 "ユーザのEメール"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "オプトインをチェックした場合、この連絡先はEメールの受信を許諾します。"
 
 #. 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
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低い"
 
 #. module: crm
 #: selection:crm.add.note,state:0 field:crm.lead,date_closed:0
@@ -2172,22 +2200,22 @@ 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
 msgid "Internal Meeting"
-msgstr ""
+msgstr "内部ミーティング"
 
 #. module: crm
 #: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
@@ -2195,17 +2223,17 @@ msgstr ""
 #: selection:crm.lead.report,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "保留中"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "顧客ミーティング"
 
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "グローバルCC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2213,46 +2241,46 @@ 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
 #: field:crm.phonecall,partner_phone:0 field:crm.phonecall2phonecall,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "電話"
 
 #. module: crm
 #: field:crm.case.channel,active:0 field:crm.case.section,active:0
 #: 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 ""
+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
@@ -2262,23 +2290,23 @@ msgstr ""
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "電話のスケジュール"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+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
@@ -2286,44 +2314,44 @@ msgstr ""
 #: field:crm.lead2partner,action:0 field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2partner,action:0 field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "アクション"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+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
@@ -2331,89 +2359,89 @@ 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
 msgid "Done"
-msgstr ""
+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
 msgid "Max Interval"
-msgstr ""
+msgstr "最大間隔"
 
 #. module: crm
 #: code:addons/crm/crm.py:396 view:crm.lead:0 view:crm.lead.report:0
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+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
 msgid "Meeting Type"
-msgstr ""
+msgstr "ミーティングタイプ"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2426,59 +2454,63 @@ 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
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "第３"
 
 #. 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 ""
+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 "Eメール数"
 
 #. 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
@@ -2490,236 +2522,236 @@ msgstr ""
 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
 msgid "Continue Process"
-msgstr ""
+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
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+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
 msgid "Fourth"
-msgstr ""
+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
 msgid "Fax"
-msgstr ""
+msgstr "FAX"
 
 #. 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
 #: 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 ""
+msgstr "会社"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "金曜"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+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 "Eメールの標題"
 
 #. 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
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Todo"
-msgstr ""
+msgstr "ToDo"
 
 #. 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 "連絡先のEメールアドレス"
 
 #. 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
@@ -2736,16 +2768,22 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"商談とともに見込み営業を継続するために特定の顧客または見込みに関係する営業ドキュメントを作成することで営業パイプラインの管理と追跡の継続が可能です。予想売"
+"上、商談の段階、予想終了日、通信履歴などの情報を保存することができます。商談はEメールゲートウェイと接続しています：新規Eメールは商談を作成し、それらの各"
+"々は顧客の通信履歴を自動的に取得します。\n"
+"\n"
+"あなたとあなたのチームは、商談からミーティングや電話の計画を行い、それらを見積りに変換し、関係ドキュメントを管理し、全ての顧客に関連する活動を追跡すること"
+"などが可能です。"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "カラーインデックス"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "リンク"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2755,13 +2793,15 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 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
@@ -2771,21 +2811,23 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 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
@@ -2796,86 +2838,89 @@ 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 "Eメール"
 
 #. 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
@@ -2885,119 +2930,121 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"分類が分類基準に一致するパートナに限定される場合はチェックします。\n"
+"チェックした場合、分類l基準一致しないパートナからはその分類が削除されます。"
 
 #. 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 "CRMダッシュボード"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+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
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 msgid "_Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+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 "パートナの連絡先Eメール"
 
 #. 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
 msgid "First"
-msgstr ""
+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
@@ -3010,87 +3057,91 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"期間はこの分類のための販売または購入の２つの周期の間の平均日数です。\n"
+"これは主に、パートナが長期間にわたり仕入れや購入しなかったことを検出するのに使用されます。\n"
+"それは、彼は他の仕入先から製品の購入をしているため、精神状態は低下しているものと考えられます。\n"
+"定期的なビジネスのためにこの機能を使用します。"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+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
 msgid "Team Members"
-msgstr ""
+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 ""
+msgstr "デフォルト（0=なし）"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3098,36 +3149,36 @@ 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 "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間をコンマで区切って下さい。"
 
 #. 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
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "成功確率"
 
 #. module: crm
 #: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
 #: 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
@@ -3135,306 +3186,306 @@ msgstr ""
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Meeting"
-msgstr ""
+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
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+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 ""
+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
 #, python-format
 msgid "Error"
-msgstr ""
+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 "定期ID日付"
 
 #. 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
 msgid "Action Rules"
-msgstr ""
+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
 #: field:crm.meeting,description:0 view:crm.phonecall:0
 #: field:crm.phonecall,description:0 field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+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 "会社の住所にEメールがありません。"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Eメールの数"
 
 #. 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 "ToDoにリセット"
 
 #. 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
 msgid "Customer"
-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 "Lowest"
-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 "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3447,23 +3498,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
@@ -3472,12 +3523,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
@@ -3487,28 +3538,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
@@ -3517,12 +3570,14 @@ 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 ""
+"システム内のドキュメント作成において、維持管理される特定のチャネルの作成によって、リードと商談がどこから来るのかを追跡します。幾つかのチャネルの例：Web"
+"サイト、通話、リセラーなど。"
 
 #. 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
@@ -3532,22 +3587,22 @@ 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 "Eメール作成ウィザード"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3557,7 +3612,7 @@ msgstr "同意"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "制御変数"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3590,3 +3645,9 @@ msgstr "エラーです。再帰的な関係となる会員を作ることはで
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr "ニュースレター"
+
+#~ msgid "Campaign 1"
+#~ msgstr "キャンペーン1"
+
+#~ msgid "Campaign 2"
+#~ msgstr "キャンペーン2"
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 0c3750a66ac..49361097308 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -45,25 +45,57 @@
                 </field>
         </record>
 
-    <act_window
-        id="crm_meeting_partner"
-        name="Meetings"
-        res_model="crm.meeting"
-        src_model="res.partner"
-        view_mode="calendar,tree,form,gantt"
-        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
-    />
-    <act_window
-        id="act_res_partner_2_opportunity"
-        name="Opportunities"
-        res_model="crm.lead"
-        src_model="res.partner"
-        view_mode="kanban,tree,form,graph,calendar"
-        domain="[('type','=','opportunity')]"
-        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
-        />
+        <!-- open meetings related to given partner -->
+        <record id="crm_meeting_partner" model="ir.actions.act_window">
+            <field name="name">Meetings</field>
+            <field name="src_model">res.partner</field>
+            <field name="res_model">crm.meeting</field>
+            <field name="view_mode">calendar,tree,form,gantt</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+        </record>
 
-<!-- Partner kanban view inherte -->
+        <!-- open opportunities related to given partner -->
+        <record model="ir.actions.act_window" id="relate_partner_opportunities">
+            <field name="name">Opportunities</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">kanban,tree,form,graph,calendar</field>
+            <field name="domain">[('type','=','opportunity')]</field>
+            <field name="context">{'search_default_partner_id': active_id,
+                'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+            <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+            <field name="help">
+                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.
+
+                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.
+            </field>
+        </record>
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="crm_case_kanban_view_leads"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_tree_view_oppor"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_form_view_oppor"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="crm_case_graph_view_opportunity"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
+        </record>
+
+        <!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.inherit</field>
             <field name="model">res.partner</field>
@@ -74,13 +106,13 @@
                     <field name="opportunity_count"/>
                     <field name="meeting_count"/>
                 </field>
-                 <xpath expr="//h4[@class='oe_partner_heading']" position="after">
-                        <a name="%(act_res_partner_2_opportunity)d" type="action">
-                            <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
-                        </a>
-                        <a name="%(crm_meeting_partner)d" type="action">
-                            <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
-                        </a>
+                <xpath expr="//h4[@class='oe_partner_heading']" position="after">
+                    <a name="%(relate_partner_opportunities)d" type="action">
+                        <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
+                    </a>
+                    <a name="%(crm_meeting_partner)d" type="action">
+                        <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
+                    </a>
                 </xpath>
             </field>
         </record>
@@ -95,13 +127,13 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
                         string="Schedule a Meeting"
-                        name="%(crm.crm_case_categ_meet_create_partner)d"
-                        context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                        name="%(base_calendar.action_crm_meeting)d"
+                        context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"/>
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
+                        context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities"
-                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
+                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7707118324f..5665839f365 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -7,12 +7,9 @@ access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.g
 access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
 access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
-access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
@@ -40,4 +37,3 @@ access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.grou
 access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
-access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
index b13c9b086cc..d394e65ac29 100644
--- a/addons/crm/test/process/action_rule.yml
+++ b/addons/crm/test/process/action_rule.yml
@@ -2,10 +2,9 @@
   I create a record rule.
 -
   !python {model: base.action.rule}: |
-    modle_id = self.pool.get("ir.model").search(cr, uid, [('name', '=', 'crm.lead')])
+    model_ids = self.pool.get("ir.model").search(cr, uid, [('model', '=', 'crm.lead')])
     from datetime import datetime
-    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': modle_id[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
-    lead_obj = self.pool.get("crm.lead")
+    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': model_ids[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
     self._check(cr, uid)
 -
   I create new lead to check record rule.
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 2fc39c51505..9d128492422 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_compose_message
 import crm_add_note
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 93551eaf943..fc4b57f85dc 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
-                    <header>
-                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Add Note"/>
                         <field name="body"/>
                     </group>
+                    <footer>
+                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index a240a4de66c..5ad9ef1c9c9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -6,11 +6,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
                         <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@@ -27,6 +22,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
@@ -37,11 +37,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
@@ -53,6 +48,11 @@
                             <field name="name" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ce12d62f9bf..a430c943d5d 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
-                  <header>
-                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
+                  <footer>
+                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 99de31afc15..74973193f24 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
-                    <header>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
@@ -24,6 +19,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6c921b3f071..ccabcde88fe 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
-                        or
-                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="action"/>
@@ -34,6 +28,12 @@
                         </group>
                     </group>
                     <field name="note" placeholder="Call Description" />
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
+                        or
+                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 3f37a0b6fa1..8bc97ba141b 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -9,17 +9,17 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
-                  <header>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <field name="name"/>
                       <field name="partner_id"/>
                       <field name="planned_revenue"/>
                       <field name="probability"/>
                   </group>
+                  <footer>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index 9e902142c94..a01765220b8 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -41,58 +41,23 @@ class crm_phonecall2meeting(osv.osv_memory):
         return {'type':'ir.actions.act_window_close'}
 
     def action_make_meeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Phonecall
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        record_id = context and context.get('active_id', False) or False
-
-        if record_id:
-            phonecall_obj = self.pool.get('crm.phonecall')
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
-            context = {
-                        'default_phonecall_id': phonecall.id,
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
-                        'default_email': phonecall.email_from ,
-                        'default_name': phonecall.name
-                    }
-
-            value = {
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id']
-                }
-
-        return value
+        res = {}
+        phonecall_id = context and context.get('active_id', False) or False
+        if phonecall_id:
+            phonecall = self.pool.get('crm.phonecall').browse(cr, uid, phonecall_id, context)
+            res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+            res['context'] = {
+                'default_phonecall_id': phonecall.id,
+                'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                'default_user_id': uid,
+                'default_email_from': phonecall.email_from,
+                'default_state': 'open',
+                'default_name': phonecall.name,
+            }
+        return res
 
 crm_phonecall2meeting()
 
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 85d0bf4bc47..00f6700e5a5 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -11,13 +11,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting" version="7.0">
-                    <header>
+                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    <footer>
                         <button name="action_make_meeting" type="object"
                             string="_Schedule" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 1dc14786cc3..5304bd8beb5 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <header>
-                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="planned_revenue"/>
                         <field name="probability"/>
                     </group>
+                    <footer>
+                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 3281acdeec3..1243d7bc456 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -9,14 +9,14 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
                 <newline/>
                 <label string="You may have to verify that this partner does not exist already."/>
+                <footer>
+                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
         </field>
        </record>
@@ -29,15 +29,15 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="action"/>
                     <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
                 </group>
+                <footer>
+                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 7319c1b0437..25f7dd0ba81 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="action"/>
                         <field name="name"/>
@@ -24,6 +18,12 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                     </group>
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py
deleted file mode 100644
index b82c3083f3a..00000000000
--- a/addons/crm/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,63 +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
-
-SUPPORTED_MODELS = ['crm.lead',]
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(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``.
-
-           Overrides the default implementation to provide more default field values
-           related to the corresponding CRM case.
-
-           :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.
-        """
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, res_id, context=context)
-        if model in SUPPORTED_MODELS and res_id:
-            model_obj = self.pool.get(model)
-            data = model_obj.browse(cr, uid , res_id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result.update({
-                    'subject' : data.name or False,
-                    'email_to' : data.email_from or False,
-                    'email_from' : user.user_email or tools.config.get('email_from', False),
-                    'body_text' : '\n' + tools.ustr(user.signature or ''),
-                    'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model,
-                    'res_id': res_id,
-                    'subtype': 'plain',
-                })
-            if hasattr(data, 'section_id'):
-                result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
index 7e20a318e4f..36f3c3fd78b 100644
--- a/addons/crm_caldav/crm_caldav_setup.xml
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -29,7 +29,7 @@
         <field name="calendar_id" ref="basic_calendar_meetings0"/>
         <field name="domain">[('user_id','=', dctx_user_id)]</field>
         <field name="name">vevent</field>
-        <field name="object_id" ref="crm.model_crm_meeting"/>
+        <field name="object_id" ref="base_calendar.model_crm_meeting"/>
     </record>
 
 
@@ -103,7 +103,7 @@
     <record id="basic_calendar_fields_12" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_organizer"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_organizer"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_organizer"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_13" model="basic.calendar.fields">
@@ -127,7 +127,7 @@
     <record id="basic_calendar_fields_16" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_attendee"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_attendee_ids"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_17" model="basic.calendar.fields">
@@ -163,7 +163,7 @@
     <record id="basic_calendar_fields_22" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_status"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_state"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_state"/>
         <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
         <field name="fn">field</field>
     </record>
@@ -176,7 +176,7 @@
     <record id="basic_calendar_fields_24" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_dtstamp"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_write_date"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_write_date"/>
         <field name="fn">datetime_utc</field>
     </record>
     <record id="basic_calendar_fields_25" model="basic.calendar.fields">
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 5b98258240c..ec6252bcdca 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,14 +22,11 @@
 from base_status.base_stage import base_stage
 import binascii
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 import time
 import tools
 from tools.translate import _
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.claim')
-
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
     crm.AVAILABLE_STATES[3][0], # Done
@@ -75,6 +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),
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 5c6e66de076..cf803fe6384 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,9 +168,9 @@
                         </notebook>
                     </group>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index f76197d8d79..c4736037adb 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-09 18:59+0000\n"
+"PO-Revision-Date: 2012-07-07 21:23+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-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr "件数"
+msgstr "案件の数"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -249,7 +249,7 @@ msgstr "次のアクション"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -670,7 +670,7 @@ msgstr "クレームを検索する"
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 20d90795ffc..495be4d729c 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -21,12 +21,9 @@
 
 from base_status.base_stage import base_stage
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 from tools.translate import _
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.fundraising')
-
 class crm_fundraising(base_stage, osv.osv):
     """ Fund Raising Cases """
 
@@ -34,6 +31,7 @@ class crm_fundraising(base_stage, osv.osv):
     _description = "Fund Raising"
     _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),
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 212ef29a6a1..26a95c99505 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -129,7 +129,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po
index e094f9ed8d0..2e87ece13d7 100644
--- a/addons/crm_fundraising/i18n/ja.po
+++ b/addons/crm_fundraising/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-09 19:04+0000\n"
+"PO-Revision-Date: 2012-07-08 22:15+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-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -236,7 +236,7 @@ msgstr "最低"
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
@@ -324,7 +324,7 @@ msgid ""
 "Have a general overview of all fund raising activities by sorting them with "
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
-msgstr "予測金額、平均成功確率、締切の延期などの基準で分類して全ての資金調達の一覧を表示する。"
+msgstr "予測売上、平均成功確率、締切の延期などの特定の基準で分類することで、全ての資金調達活動の一般的な概要を持ちます。"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -626,7 +626,7 @@ msgstr "責任者"
 msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
-msgstr "案件が割当てられた販売チーム。担当ユーザとEメール・アカウントを指定します。"
+msgstr "案件が割当てられた営業チーム。担当ユーザとEメール・アカウントを指定します。"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
@@ -763,7 +763,7 @@ msgstr "高い"
 #: field:crm.fundraising,section_id:0
 #: view:crm.fundraising.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index fe7b0581e9b..4b0cb2e3ffa 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -21,7 +21,6 @@
 
 from base_status.base_state import base_state
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 import tools
 from tools.translate import _
@@ -32,8 +31,6 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.helpdesk')
-
 class crm_helpdesk(base_state, osv.osv):
     """ Helpdesk Cases """
 
@@ -41,6 +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),
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4b7af86799a..79760a0a9fd 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -100,7 +100,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 3228f329919..8a0e027baec 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-28 19:12+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 04:05+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-05-29 04:46+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -207,7 +207,7 @@ msgstr "Eメールの数"
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -533,7 +533,7 @@ msgstr "催促を送る"
 msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
-msgstr "事象を割り当てる販売チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
+msgstr "事象を割り当てる営業チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -708,7 +708,7 @@ msgstr "高い"
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 043ade7d9cc..1deac08f254 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 04:47+0000\n"
+"PO-Revision-Date: 2012-07-08 19:19+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-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -329,7 +329,7 @@ msgstr "パートナの割当て"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "リードと機会を区別するためにタイプを使います。"
+msgstr "リードと商談を区別するためにタイプを使います。"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -362,7 +362,7 @@ msgstr "ジオロケーション"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "好機割当て分析"
+msgstr "商談割当分析"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -409,7 +409,7 @@ msgstr "重量"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr "開始をを延期する"
+msgstr "開始を延期する"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -455,7 +455,7 @@ msgstr "分類"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr "好機の数"
+msgstr "商談の数"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -492,7 +492,7 @@ msgstr "パートナに大量に転送"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr "割り当てられた好機"
+msgstr "割当済商談"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
@@ -527,12 +527,12 @@ msgstr "6月"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr "当件を開くまでの日数"
+msgstr "案件を開くまでの日数"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr "開始をを延期する"
+msgstr "開始を延期する"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
@@ -566,7 +566,7 @@ msgstr "ジオ緯度"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr "好機の数"
+msgstr "商談の数"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -738,7 +738,7 @@ msgstr "住所"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr "好機"
+msgstr "商談"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -776,7 +776,7 @@ msgstr "メッセージの見出し"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "好機に転換する"
+msgstr "商談に変換"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
@@ -858,7 +858,7 @@ msgstr "高"
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
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 4fda17b5264..e70a053305f 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
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <header>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -46,6 +41,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index bb07a87bb23..dec5af0dce0 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 04:06+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-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -30,7 +30,7 @@ msgid ""
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
 msgstr ""
-"特定のトピックに関連した質問票を作成して、それを使って販売チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
+"特定のトピックに関連した質問票を作成して、それを使って営業チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
 "ナを自動的に区分することができます。"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 04dca6da22f..4a1291f01aa 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
-                    <header>
-                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="questionnaire_id"/>
                     </group>
+                    <footer>
+                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index c7617f317b0..c959f1722e6 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -58,7 +58,7 @@
         id="menu_crm_todo"
         parent="base.menu_sales"
         action="crm_todo_action"
-        sequence="5"/>
+        sequence="6"/>
 
 
     </data>
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index ffa0a726173..002d9e0acc3 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-20 03:47+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-07 21:25+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-04-21 05:01+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -82,7 +82,7 @@ msgstr "その他の情報"
 #. module: crm_todo
 #: field:project.task,lead_id:0
 msgid "Lead / Opportunity"
-msgstr "見込み客 / 商談"
+msgstr "リード / 商談"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..f7053f1da1d 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -257,13 +257,15 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='sale_total']" position="after">
-                    <group>
+                    <group width="50%%">
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Charge in Sale Order" type="object"
+                                attrs="{'invisible':[('carrier_id','=',False)]}"/>
                         </div>
-                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
+                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
+                             attrs="{'invisible':[('carrier_id','=',False)]}"/>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..de9d422edab 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -238,51 +238,27 @@
         <field name="model">ir.attachment</field>
         <field name="priority" eval="1"/>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
-            <form string="Documents" version="7.0">
-                <sheet>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="user_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Attachment">
-                        <group>
-                            <group string="Data">
-                                <field name="type"/>
-                                <newline />
-                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                            </group>
-                            <group>
-                                <field name="res_id" invisible="True"/>
-                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <separator string="Related to" colspan="2"/>
-                                <field name="partner_id"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Created">
-                                <field name="create_uid" readonly="1"/>
-                                <field name="create_date" readonly="1"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Modified">
-                                <field name="write_uid" readonly="1"/>
-                                <field name="write_date" readonly="1"/>
-                            </group>
-                        </group>
-                    </page>
-                    <page string="Indexed Content - experimental" groups="base.group_no_one">
-                        <field name="index_content"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="description"/>
-                    </page>
-                    </notebook>
-                </sheet>
-            </form>
+            <field name="url" position="after">
+                <field name="user_id"/>
+            </field>
+            <field name="company_id" position="before">
+                <field name="parent_id"/>
+                <field name="partner_id"/>
+            </field>
+            <xpath expr="//div[@name='creation_div']" position='after'>
+                <label for="write_uid" string="Modification"/>
+                <div>
+                    <field name="write_uid" readonly="1" class="oe_inline"/> on 
+                    <field name="write_date" readonly="1" class="oe_inline"/>
+                </div>
+            </xpath>
+            <xpath expr="//group[@name='description_group']" position='after'>
+                <group string="Indexed Content" colspan="4">
+                    <field name="index_content" nolabel="1"/>
+                </group>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index e2e1825f522..52f012a92ff 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -7,15 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
-                    <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Browse Document"/>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index 486cbbc8533..cf25f0186d5 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-06 00:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-06 02:21+0000\n"
+"Last-Translator: Ahmad Khayyat <Unknown>\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-04-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "يجب  أن يكون رمز العملة فريداً للشركة!"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner_address
@@ -30,12 +30,12 @@ msgstr "عناوين الشريك"
 #. module: edi
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "اسم الشركة يجب أن يكون فريداً !"
+msgstr "يجب أن يكون اسم الشركة فريداً !"
 
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: edi
 #: field:edi.document,name: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-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
@@ -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-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
@@ -202,12 +202,12 @@ msgstr "تحميل"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
 msgid "Powered by"
-msgstr "مدعوم من kifcaliph و"
+msgstr "يتم تشغيل هذا التطبيق بواسطة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
 msgid "OpenERP"
-msgstr "أوبنيرب"
+msgstr "أوبن إي آر بي"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css
index 1601151ae1f..6385959c036 100644
--- a/addons/edi/static/src/css/edi.css
+++ b/addons/edi/static/src/css/edi.css
@@ -24,21 +24,6 @@ button.oe_edi_action_print img {
     height: 32px;
 }
 
-.openerp input.invalid {
-    background-color: #F66 !important;
-    border: 1px solid #D00 !important;
-    color: #000;
-}
-/* following browse-specific hacks need to be separate rules, as browsers are
-   required to ignore rules with unknown selectors. At time of writing, there
-   is no standard way to style HTML5 placeholders */
-.openerp input.invalid:-moz-placeholder {
-    color: #FFF;
-}
-.openerp input.invalid::-webkit-input-placeholder {
-    color: #FFF;
-}
-
 /** EDI Sidebar **/
 .oe_edi_sidebar_title {
     border-bottom: 1px solid #D2CFCF;
@@ -81,9 +66,6 @@ button.oe_edi_action_print img {
 
 
 /** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/
-body {
-    background: #EEE; /* contrast with paper */
-}
 .oe_edi_paperbox {
     position: relative;
     width: 700px;
@@ -225,4 +207,4 @@ table.oe_edi_data, .oe_edi_doc_title {
 .python .nu0 {color: #ff4500;}
 .python .me1 {color: black;}
 .python span.xtra { display:block; }
-.python ol { padding: 0px; }
\ No newline at end of file
+.python ol { padding: 0px; }
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index efe0074b313..96ea55da9e5 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,12 +9,12 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/header/button" position="before">
-						<field name="use_template" invisible="1"/>
-						<button icon="gtk-paste" type="object" name="template_toggle"
-						        string="" help="Use a message template" />
-						<button icon="gtk-save" type="object" name="save_as_template"
-						        string="" help="Save as a new template"/>
+                    <xpath expr="//form/footer/button" position="before">
+                        <field name="use_template" invisible="1"/>
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                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">
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 040df5ce987..1a7f3ba09c5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo_xml': ['event_demo.yml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 26fef61d2b5..6a8cf9f8a0b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -55,22 +55,14 @@ class event_event(osv.osv):
               return []
         res = []
         for record in self.browse(cr, uid, ids, context=context):
-            date = record.date_begin.split(" ")
-            date = date[0]
-            registers=''
-            if record.register_max !=0:
-                register_max = str(record.register_max)
-                register_tot = record.register_current+record.register_prospect
-                register_tot = str(register_tot)
-                registers = register_tot+'/'+register_max
-            name = record.name+' ('+date+') '+registers
-            res.append((record['id'], name))
+            date = record.date_begin.split(" ")[0]
+            date_end = record.date_end.split(" ")[0]
+            if date != date_end:
+                date += ' - ' + date_end
+            display_name = record.name + ' (' + date + ')'
+            res.append((record['id'], display_name))
         return res
 
-    def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -210,10 +202,12 @@ class event_event(osv.osv):
             help='If event is created, the state is \'Draft\'.If event is confirmed for the 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\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
-        'full_name' : fields.function(_name_get_fnc, type="char", string='Name'),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'street': fields.related('address_id','street',type='char',string='Street'),
+        'zip': fields.related('address_id','zip',type='char',string='zip'),
+        'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
@@ -302,7 +296,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['ir.needaction_mixin','mail.thread','res.partner']
+    _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -316,13 +310,16 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
+        'email': fields.char('Email', size=64),
+        'phone': fields.char('Phone', size=64),
+        'name': fields.char('Name', size=128, select=True),
     }
 
     _defaults = {
@@ -331,7 +328,6 @@ class event_registration(osv.osv):
     }
     _order = 'name, create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         self.do_draft_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -400,18 +396,15 @@ class event_registration(osv.osv):
         return True
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
-        data ={}
         if not contact:
-            return data
+            return {}
         addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
-        data = {
+        return {'value': {
             'email':contact_id.email,
-            'contact_id':contact_id.id,
             'name':contact_id.name,
             'phone':contact_id.phone,
-            }
-        return {'value': data}
+            }}
 
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
-
-
-<!-- Demo Data for Event Type -->
-    <record id="event_type_0" model="event.type">
-        <field name="name">Seminar</field>
-    </record>
-
-    <record id="event_type_1" model="event.type">
-        <field name="name">Exhibition</field>
-    </record>
-
-    <record id="event_type_2" model="event.type">
-        <field name="name">Conference</field>
-    </record>
-
-    <record id="event_type_3" model="event.type">
-        <field name="name">Show</field>
-    </record>
-
-    <record id="event_type_4" model="event.type">
-        <field name="name">Training</field>
-    </record>
-
-<!-- Demo data for Event -->
-    <record id="event_0" model="event.event">
-        <field name="name">Concert of Bon Jovi</field>
-        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="register_max">500</field>
-        <field name="type" ref="event_type_1"/>
-    </record>
-
-    <record id="event_1" model="event.event">
-        <field name="name">Opera of Verdi</field>
-        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_1"/>
-        <field name="register_min">50</field>
-        <field name="register_max">350</field>
-    </record>
-    <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Business</field>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
-        <field name="register_max">200</field>
-    </record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-
-<!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
-        <field name="name">Agrolait</field>
-        <field name="email">s.l@agrolait.be</field>
-        <field name="phone">003281588558</field>
-        <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    <record id="reg_1_2" model="event.registration">
-        <field name="name">ASUStek</field>
-        <field name="email">info@asustek.com</field>
-        <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="event_id" ref="event_1"/>
-        <field name="nb_register">10</field>
-    </record>
-
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
-    <record id="reg_0_2" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">openerp@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..6f843fd0965
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+  from datetime import datetime, timedelta
+-
+  !record {model: event.type, id: event_type_0}:
+    name: 'Seminar'
+-
+  !record {model: event.type, id: event_type_1}:
+    name: 'Exhibition'
+-
+  !record {model: event.type, id: event_type_2}:
+    name: 'Conference'
+-
+  !record {model: event.type, id: event_type_3}:
+    name: 'Show'
+-
+  !record {model: event.type, id: event_type_4}:
+    name: 'Training'
+-
+  !record {model: event.event, id: event_0}:
+    name: 'Concert of Bon Jovi'
+    date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+    date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+    register_max: 500
+    type: event_type_1
+-
+  !record {model: event.event, id: event_1}:
+    name: 'Opera of Verdi'
+    date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 21:00:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_1
+-
+  !record {model: event.event, id: event_2}:
+    name: 'Conference on ERP Business'
+    date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_2
+-
+  !record {model: event.registration, id: reg_1_1}:
+    name: 'Agrolait'
+    email: 's.l@agrolait.be'
+    phone: '003281588558'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 5
+-
+  !record {model: event.registration, id: reg_1_2}:
+    name: 'ASUStek'
+    email: 'info@asustek.com'
+    phone: '+ 1 64 61 04 01'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 10
+-
+  !record {model: event.registration, id: reg_0_1}:
+    name: 'Syleam'
+    email: 'contact@syleam.fr'
+    phone: '+33 (0) 2 33 31 22 10'
+    event_id: event_0
+    partner_id: base.res_partner_sednacom
+    nb_register: 6
+-
+  !record {model: event.registration, id: reg_0_2}:
+    name: 'Camptocamp'
+    email: 'openerp@camptocamp.com'
+    phone: '+41 21 619 10 04'
+    event_id: event_2
+    partner_id: base.res_partner_c2c
+    nb_register: 5
+ 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index fcf8231f5f7..142ba2bb2a4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
+            view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
@@ -17,10 +24,10 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="default_reply_to"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_min"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_max"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                     </group>
                 </form>
             </field>
@@ -89,88 +96,103 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" version="7.0">
-                <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </header>
-                <sheet>
-
-                <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_title">
-                    <h1><field name="name"/></h1>
-                    <group>
-                        <group>
-                            <field name="type" on_change="onchange_event_type(type,context)"/>
-                            <field name="user_id"/>
-                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                        </group>
-                        <group>
-                            <field name="date_begin"/>
-                            <field name="date_end"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                    </group>
-                </div>
-
-                <notebook>
-                    <page string="Event Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Internal Data">
-                         <group class="oe_group_label_border" colspan="2" col="2">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                         </group> 
-                         <group class="oe_group_label_border" colspan="2" col="2">
-                            <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                            <field name="speaker_confirmed"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
+                <form string="Events" version="7.0">
+                    <header>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                        </div> 
+                        <div>
+                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                            </h2>
+                            <group>
+                                <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="street" placeholder="Street..."/>
+                                        <div>
+                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                    </div>
                                 </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <group>
+                                       <field name="type" on_change="onchange_event_type(type,context)"/>
+                                       <field name="register_min"/>
+                                       <field name="register_max"/>
+                                       <label for="register_current" string="Current Registrations"/>
+                                       <div>
+                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                       </div>
+                                   </group>
+                            </group>
+                        </div>
+                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <notebook>
+                            <page string="Event Description">
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Internal Data">
+                                <group>
+                                    <group>
+                                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                        <field name="speaker_confirmed"/>
                                     </group>
-                            </form>
-                            </field>
-                    </page>
-                    </notebook>
+                                    <group>
+                                        <field name="register_attended"/>
+                                    </group> 
+                                </group>
+                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                    <tree string="Registration" editable="top">
+                                        <field name="name" />
+                                        <field name="email" />
+                                        <field name="phone"/>
+                                        <field name="nb_register" />
+                                        <field name="state"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </tree>
+                                    <form string="Registration">
+                                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                        <field name="name"/>
+                                        <group colspan="4" col="4">
+                                        <field name="email"/>
+                                        <field name="phone"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                            <field name="nb_register"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                        </group>
+                                            <group col="8" colspan="4">
+                                                <separator string="" colspan="4"/>
+                                                <newline/>
+                                                <field name="state" colspan="2"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
-            </form>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -351,15 +373,6 @@
            <field name="help">Event is the low level object used by meeting and others documents that 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.</field>
        </record>
 
-      <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
-            view_type="form"/>
-
       <act_window
             id="act_register_event_partner"
             name="Subscribe"
@@ -436,61 +449,44 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet string="Registration">
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
+                    <header>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                        <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                        <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </header>
+                    <sheet string="Registration">
+                        <label for="event_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                                 <field name="name"/>
-                                <field name="email"/>
                                 <field name="phone"/>
+                                <label for="email"/>
+                                <div>
+                                    <field name="email" class="oe_inline"/>
+                                    <button class="oe_inline oe_right" string="Send Email"
+                                      name="%(mail.action_email_compose_message_wizard)d"
+                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                </div>
                             </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
+                            <group>
+                                <field name="nb_register"/>
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                            </group>
+                            <group groups="base.group_no_one">
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
                             </group>
-                        </page>
-                        <page string="Emails">
-<!--
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="History">
-                                    <field name="display_text" string="History Information"/>
-                                    <field name="reply_to" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
--->
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
+                        </group>
                     </sheet>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 8697f46d867..17472e0cc95 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -77,12 +77,10 @@ class report_event_registration(osv.osv):
                 r.state AS  registration_state
                 FROM
                 event_event e
-                
+
                 LEFT JOIN
                     event_registration r ON (e.id=r.event_id)
 
-                WHERE r.active = 'true'
-               
                GROUP BY
                 event_id,
                 user_id_registration,
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index cf95d00876e..b6cdc4c4ec6 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event_type,event.type,model_event_type,event.group_event_user,1,0,0,0
 access_event_type_manager,event.type manager,model_event_type,event.group_event_manager,1,1,1,1
-access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,0
-access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,0
+access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,1
+access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,1
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
-access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,0,0,0
-access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,0,0,0
+access_event_event_portal,event.event,model_event_event,,1,0,0,0
+access_event_registration_portal,event.registration,model_event_registration,,1,0,0,0
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 93b9830ef82..12d8555b0ab 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
-                  <header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <footer>
                       <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                       or
                       <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </footer>
             </form>
             </field>
         </record>
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Emails']" position="after">
-                    <page string="Moodle">
-                        <field name="moodle_user_password" readonly='1' colspan="2"/>
-                        <field name="moodle_uid" readonly="1"/>
-                    </page>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="moodle_user_password" readonly='1'/>
+                    <field name="moodle_uid" readonly="1"/>
                 </xpath>
                 <field name="email" position="replace">
-                     <field name="email" required="1" />
+                     <!-- set the email as required -->
+                     <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
                      <field name="moodle_username" colspan="2" on_change="onchange_moodle_name(moodle_user_password)"/>
@@ -29,12 +28,12 @@
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
-                     <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
-                     <field name="name" required="1" />
+                   <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
+                   <field name="name" required="1" />
                 </xpath>
-                      <field name="email" position="replace">
-                          <field name="email" required="1" />
-                      </field>
+                <field name="email" position="replace">
+                    <field name="email" required="1" />
+                </field>
            </field>
         </record>
     </data>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index cfac9944d1b..b7ab7a55357 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
-                   <header>
-                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
-                       or
-                       <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
                        <field name="date_start"/>
                        <field name="date"/>
                    </group>
+                   <footer>
+                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
+                       or
+                       <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
               </form>
             </field>
         </record>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index acd9e622b01..ddbd4db7ee2 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
-                    <header>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
                         <field name="password" password="True"/>
                     </group>
+                    <footer>
+                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 1135b55034a..71d7d9aa93d 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -43,12 +43,12 @@ You can manage:
     'update_xml': [
         'security/hr_security.xml',
         'security/ir.model.access.csv',
+        'board_hr_view.xml',
         'hr_view.xml',
         'hr_department_view.xml',
         'process/hr_process.xml',
         'hr_installer.xml',
         'hr_data.xml',
-        'board_hr_view.xml',
         'res_config_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 44b533fdc52..aac2b0637ce 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -309,6 +309,10 @@ class res_users(osv.osv):
 
         return user_id
 
+    _columns = {
+        'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
+        }
+
 res_users()
 
 
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1935cbbd03d..bbf66f0d4c3 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,12 +13,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="manager_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="manager_id"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e6953a29d2..1797f32e9ce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,6 +9,8 @@
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
+        <menuitem id="menu_hr_reporting_timesheet" name="Reports"
+            parent="menu_hr_reporting" sequence="6" />
 
         <!--Employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
@@ -18,60 +20,64 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                    <div class="oe_right oe_button_box">
-                        <!-- Put here related buttons -->
-                    </div>
-                    <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-
-                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
-                        <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
-
-                        <label for="department_id" class="oe_edit_only"/>
-                        <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
-                    </div>
-                    <notebook>
-                        <page string="Personal Information">
-                            <group>
-                                <group string="General">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                    <field name="active"/>
-                                    <field name="parent_id"/>
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <div class="oe_right oe_button_box" name="button_box">
+                            <!-- Put here related buttons -->
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                            </h1>
+                            <label for="department_id" class="oe_edit_only"/>
+                            <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                            <label for="category_ids" class="oe_edit_only"/>
+                            <h3><field name="category_ids" widget="many2many_tags"/></h3>
+                        </div>
+                        <group colspan="4" col="4">
+                            <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"/>
+                        </group>
+                        <notebook>
+                            <page string="Information">
+                                <group>
+                                    <group>
+                                        <field name="user_id" on_change="onchange_user(user_id)"/>
+                                        <field name="parent_id" />
+                                        <field name="coach_id"/>
+                                    </group>
+                                    <group>
+                                        <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"/>
+                                    </group>
                                 </group>
-                                <group groups="base.group_hr_user" string="Social IDs">
-                                    <field name="identification_id"/>
-                                    <field name="passport_id"/>
-                                    <field name="otherid"/>
+                                <field name="notes" placeholder="Other Information ..." colspan="4"/>
+                            </page>
+                            <page string="Personal Information" groups="base.group_hr_user">
+                                <group col="4">
+                                    <group>
+                                        <field name="country_id"/>
+                                        <field name="bank_account_id"/>
+                                        <field name="address_home_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="gender"/>
+                                        <field name="marital"/>
+                                        <field name="birthday"/>
+                                    </group>
                                 </group>
-                                <group groups="base.group_hr_user" string="Status">
-                                    <field name="gender"/>
-                                    <field name="marital"/>
-                                    <field name="country_id"/>
-                                    <field name="birthday"/>
-                                </group>
-                                <group string="Contact Information">
-                                    <field name="address_home_id"/>
-                                    <field name="address_id" on_change="onchange_address_id(address_id)"/>
-                                    <field name="work_phone"/>
-                                    <field name="mobile_phone"/>
-                                    <field name="work_email" widget="email"/>
-                                    <field name="work_location"/>
-                                </group>
-                                <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                                    <field name="coach_id"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" widget="many2many_tags"/>
-                        </page>
-                        <page string="Notes" groups="base.group_hr_user">
-                            <field name="notes"/>
-                        </page>
-                    </notebook>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -357,16 +363,21 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" class="oe_inline"/>
+                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            <field name="department_id" class="oe_inline"/>
+                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                        </h1>
                         <group>
                             <group>
-                                <field name="name"/>
-                                <field name="department_id"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
-                            <group>
-                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                                 <field name="no_of_employee"/>
                                 <field name="expected_employees"/>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            </group>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </group>
                         <notebook>
@@ -376,9 +387,6 @@
                                 <label for="requirements"/>
                                 <field name="requirements"/>
                             </page>
-                            <page string="Employees" groups="base.group_user">
-                                <field name="employee_ids" widget="many2many" mode="tree,form"/>
-                            </page>
                         </notebook>
                     </sheet>
                 </form>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index b41ccd0e935..3285f4c32a6 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,34 +20,32 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Additional Features">
-                            <group>
-                                <field name="module_hr_expense"/>
-                                <field name="module_hr_evaluation"/>
-                                <field name="module_hr_holidays"/>
-                            </group>
-                            <group>
-                                <field name="module_hr_recruitment"/>
-                                <field name="module_hr_contract"/>
-                                <label for="module_hr_payroll"/>
-                                <div>
-                                    <field name="module_hr_payroll"/>
-                                    <button name="%(open_payroll_modules)d" type="action"
-                                        string="Install Country-Specific Payroll" icon="gtk-go-forward"
-                                        attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
-                                </div>
-                            </group>
+                    <group string="Additional Features">
+                        <group>
+                            <field name="module_hr_expense"/>
+                            <field name="module_hr_evaluation"/>
+                            <field name="module_hr_holidays"/>
                         </group>
                         <group>
-                            <group string="Timesheets">
-                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
-                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
-                                <field name="module_hr_timesheet_sheet"/>
-                            </group>
-                            <group name="config_recruitment"/>
+                            <field name="module_hr_recruitment"/>
+                            <field name="module_hr_contract"/>
+                            <label for="module_hr_payroll"/>
+                            <div>
+                                <field name="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install Country-Specific Payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                            </div>
                         </group>
-                    </sheet>
+                    </group>
+                    <group>
+                        <group string="Timesheets">
+                            <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
+                            <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
+                            <field name="module_hr_timesheet_sheet"/>
+                        </group>
+                        <group name="config_recruitment"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e769f3ff684..448e6401cbd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -133,12 +133,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
-                    <group colspan="2">
-                        <field name="state"/>
-                        <button 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 name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-                    </group>
+                <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"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 3bf762b0f50..c9daaffbe4c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="month"/>
                     <field name="year"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index e4f6ec33bcb..554355edbb1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="init_date"/>
                     <field name="end_date"/>
                 </group>    
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 0657855c549..4e284cd396c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
                     <field name="end_date"/>
                     <field name="max_delay"/>
                 </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index acc1f5e01b0..96d924f88a7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
-                    <header>
-                        <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" />
-                    </header>
                     <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."/>
@@ -22,6 +16,12 @@
                     <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>
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 4f82d1b3014..1267f13ac04 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -44,7 +44,7 @@ class hr_employee(osv.osv):
         'place_of_birth': fields.char('Place of Birth', size=30),
         'children': fields.integer('Number of Children'),
         'vehicle': fields.char('Company Vehicle', size=64),
-        'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
+        'vehicle_distance': fields.integer('Home-Work Dist.', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
         'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
     }
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 11cdba387ca..ae6789ea234 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,30 +8,32 @@
             <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="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                        <separator string="Personal Info" colspan="2"/>
-                        <field name="bank_account_id"/>
-                        <field name="place_of_birth"/>
+                <data>
+                    <xpath expr="//field[@name='parent_id']" position="before">
+                        <field name="manager"/>
+                    </xpath>
+                    <xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+                            <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="children"/>
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Job Info" colspan="2"/>
-                        <field name="manager" />
-                        <field name="vehicle" />
-                        <field name="vehicle_distance" />
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Others Info" colspan="2"/>
-                        <field name="medic_exam" />
-                        </group>
-                    </page>
-                </page>
+                    </field>
+                    <field name="birthday" position="after">
+                        <field name="place_of_birth"/>
+                    </field>
+                    <field name="bank_account_id" position="replace">
+                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                    </field>
+                </data>
             </field>
         </record>
 
-
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
@@ -67,34 +69,44 @@
             <field name="arch" type="xml">
                 <form string="Contract" version="7.0">
                     <sheet>
-                    <group col="4">
-                        <field name="name" />
-                        <field name="employee_id" />
-                        <field name="job_id"/>
-                        <field name="wage"/>
-                        <field name="type_id"/>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" placeholder="Contract Reference"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="employee_id"/>
+                            <field name="job_id"/>
+                        </group>
+                        <group>
+                            <field name="type_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Information" name="information">
                             <group>
-                                <group name="left_column" string="Duration">
-                                    <field name="date_start" />
-                                    <field name="date_end" />
+                                <group name="salary_and_advantages" string="Salary and Advantages">
+                                    <field name="wage"/>
+                                    <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
+                                </group>
+                                <group name="duration_group" string="Duration">
+                                    <label for="trial_date_start" string="Trial Period Duration"/>
+                                    <div>
+                                        <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
+                                    </div>
+                                    <label for="date_start" string="Duration"/>
+                                    <div>
+                                        <field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
+                                    </div>
                                     <field name="working_hours"/>
                                 </group>
-                                <group string="Trial Period">
-                                    <field name="trial_date_start" />
-                                    <field name="trial_date_end" />
-                                </group>
-                                <group name="right_column" string="Advantages">
-                                    <field name="advantages" nolabel="1" colspan="2"/>
-                                </group>
                             </group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Work Permit">
-                            <group string="Valid for">
+                            <group col="4">
                                 <field name="visa_no"/>
                                 <field name="permit_no"/>
                                 <field name="visa_expire"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e6e3dd69a26..a5efaf42347 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -28,11 +28,15 @@
             <field name="arch" type="xml">
                 <form string="Appraisal Plan" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="month_first"/>
-                        <field name="month_next"/>
-                        <field name="active"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
+                        </group>
+                        <group>
+                            <field name="month_first"/>
+                            <field name="month_next"/>
+                        </group>
                     </group>
                      <notebook>
                          <page string="Appraisal Phases">
@@ -133,10 +137,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Notes" position="before">
+                <page string="Personal Information" position="after">
                     <page string="Appraisal" groups="base.group_hr_user">
-                        <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                        <field name="evaluation_date"/>
+                        <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>
             </field>
@@ -157,49 +163,50 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </header>
                 <sheet>
+                    <label for="employee_id" class="oe_edit_only"/>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
+                    <label for="plan_id" class="oe_edit_only"/>
+                    <h2><field name="plan_id"/></h2>
                     <group>
-                        <group string="Appraisal Data">
-                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                            <field name="plan_id"/>
-                            <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}" string="Ending Summary">
+                        <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
                             <field name="date_close" readonly="1"/>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="survey_request_ids">
-                                <form string="Interview Appraisal" version="7.0">
-                                    <group col="4">
+                    <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="survey_request_ids">
+                            <form string="Interview Appraisal" version="7.0">
+                                <div class="oe_right oe_button_box">
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,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)]}"/>
+                                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                                </div>
+                                <group>
+                                    <group>
                                         <field name="survey_id"/>
-                                        <div colspan="2">
-                                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,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)]}"/>
-                                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                        </div>
-                                        <field name="date_deadline"/>
-                                        <field name="response" readonly="1"/>
                                         <field name="user_to_review_id"/>
                                         <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <group col="4" string="Status">
-                                         <field name="state"/>
-                                         <div>
-                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                         </div>
+                                    <group>              
+                                        <field name="date_deadline"/>
+                                        <field name="response" readonly="1"/>
                                     </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_action"
-                                groups="base.group_hr_manager"/>
-                        </page>
-                        <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_summary"/>
-                        </page>
-                    </notebook>
+                                </group>
+                                <group col="4" string="Status" invisible="1">
+                                     <field name="state"/>
+                                     <div>
+                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                     </div>
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                    <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_action"
+                            groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
+                    </group>
+                    <group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
+                    </group>
               </sheet>
               </form>
             </field>
@@ -279,13 +286,17 @@
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                             <field name="user_to_review_id"/>
-                             <field name="user_id" string="Interviewer"/>
-                             <field name="date_deadline"/>
-                             <field name="survey_id"/>
-                             <field name="evaluation_id"/>
-                             <field name="response" readonly="1"/>
+                        <group>
+                            <group>
+                                <field name="survey_id"/>
+                                <field name="user_to_review_id"/>
+                                <field name="user_id" string="Interviewer"/>
+                            </group>
+                            <group>
+                                <field name="date_deadline"/>
+                                <field name="response" readonly="1"/>
+                                <field name="evaluation_id" string="Appraisal Plan"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c9d51139fa7..d855e02eea7 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -90,7 +90,7 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 5be8871446a..fffdf76f0e9 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -8,14 +8,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
-                <header>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <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>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9d7ec10cc28..b1192701dfb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
 
     _name = "hr.expense.expense"
+    _inherit = ['mail.thread']
     _description = "Expense"
     _order = "id desc"
     _columns = {
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
-        'ref': fields.char('Reference', size=32),
         'date': fields.date('Date', select=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index dd89a3ab57d..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
-                    <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -74,38 +73,44 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
-                    <group col="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="name"/>
-                        <field name="ref"/>
-                        <field name="date"/>
-                        <field name="currency_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="date"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_valid"/>
+                            <field name="currency_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines" version="7.0">
-                                    <group col="6" colspan="4">
-                                        <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="name" colspan="4"/>
-                                        <newline/>
-                                        <field name="unit_amount"/>
-                                        <field name="unit_quantity"/>
-                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)"/>
-                                    </group>
-                                    <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
-                                        <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','in',['normal','contract'])]" name="analytic_account"/>
-                                    </group>
-                                    <group colspan="2" col="2">
-                                        <separator string="References" colspan="2"/>
-                                        <field name="date_value" />
-                                        <field name="ref"/>
+                                    <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="name"/>
+                                            <field name="ref"/>
+                                            <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                        </group>
+                                        <group>
+                                            <field name="unit_amount"/>
+                                            <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"/>
+                                            </div>
+                                            <field name="date_value" />
+                                        </group>
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Free Notes"/>
                         </page>
                         <page string="Other Info">
                             <group>
@@ -113,17 +118,13 @@
                                     <field name="journal_id"/>
                                     <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                                 </group>
-                                <group groups="base.group_no_one" string="Validation">
-                                    <field name="date_confirm" readonly="1"/>
-                                    <field name="date_valid" readonly="1"/>
-                                    <field name="user_valid"/>
-                                </group>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index d0d73aa5ca4..bf456cfc4d6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -160,7 +160,7 @@
           <para style="terp_tblheader_General_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Reference</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Validated By</para>
@@ -176,7 +176,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.ref ]]</para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..7877edf4b3a 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -8,7 +8,6 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
-                <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -105,7 +104,7 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..4509508b2be 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -50,7 +50,7 @@ Note that:
                 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', 'crm', 'process', 'resource'],
+    'depends': ['hr', 'base_calendar', 'process', 'resource'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
@@ -58,7 +58,6 @@ Note that:
         'hr_holidays_workflow.xml',
         'hr_holidays_view.xml',
         'hr_holidays_data.xml',
-        'hr_holidays_wizard.xml',
         'hr_holidays_report.xml',
         'report/hr_holidays_report_view.xml',
         'report/available_holidays_view.xml',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a1ab0ae04f3..04fe67b94f7 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -74,7 +74,8 @@ class hr_holidays_status(osv.osv):
 
     _columns = {
         'name': fields.char('Leave Type', size=64, required=True, translate=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
+        'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
+            help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
@@ -128,7 +129,7 @@ class hr_holidays(osv.osv):
         '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)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
-        'case_id': fields.many2one('crm.meeting', 'Meeting'),
+        'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
@@ -217,19 +218,12 @@ class hr_holidays(osv.osv):
         }
         return result
 
-    def onchange_sec_id(self, cr, uid, ids, status, context=None):
-        warning = {}
+    def onchange_status_id(self, cr, uid, ids, status_id, context=None):
         double_validation = False
-        obj_holiday_status = self.pool.get('hr.holidays.status')
-        if status:
-            holiday_status = obj_holiday_status.browse(cr, uid, status, context=context)
+        if status_id:
+            holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context)
             double_validation = holiday_status.double_validation
-            if holiday_status.categ_id and holiday_status.categ_id.section_id and not holiday_status.categ_id.section_id.allow_unlink:
-                warning = {
-                    'title': "Warning for ",
-                    'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
-                }
-        return {'warning': warning, 'value': {'double_validation': double_validation}}
+        return {'value': {'double_validation': double_validation}}
 
     def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
@@ -271,7 +265,7 @@ class hr_holidays(osv.osv):
                 holiday_ids.append(record.id)
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
-                vals = {
+                meeting_vals = {
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
                     'duration': record.number_of_days_temp * 8,
@@ -280,11 +274,11 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
-                    'leave_id': record.id,
+                    'state': 'done',            # to block that meeting date in the calendar
                 }
-                case_id = meeting_obj.create(cr, uid, vals)
+                meeting_id = meeting_obj.create(cr, uid, meeting_vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
-                self.write(cr, uid, ids, {'case_id': case_id})
+                self.write(cr, uid, ids, {'meeting_id': meeting_id})
             elif record.holiday_type == 'category':
                 emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])])
                 leave_ids = []
@@ -330,11 +324,11 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_cancel(self, cr, uid, ids, context=None):
-        obj_crm_meeting = self.pool.get('crm.meeting')
+        meeting_obj = self.pool.get('crm.meeting')
         for record in self.browse(cr, uid, ids):
             # Delete the meeting
-            if record.case_id:
-                obj_crm_meeting.unlink(cr, uid, [record.case_id.id])
+            if record.meeting_id:
+                meeting_obj.unlink(cr, uid, [record.meeting_id.id])
 
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
@@ -424,7 +418,7 @@ class resource_calendar_leaves(osv.osv):
     _inherit = "resource.calendar.leaves"
     _description = "Leave Detail"
     _columns = {
-        'holiday_id': fields.many2one("hr.holidays", "Holiday"),
+        'holiday_id': fields.many2one("hr.holidays", "Leave Request"),
     }
 
 resource_calendar_leaves()
@@ -519,10 +513,4 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
-class crm_meeting(osv.osv):
-    _inherit = 'crm.meeting'
-    _columns = {
-        'leave_id': fields.many2one('hr.holidays','Leave'),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bda18f1bc6c..b1bb96c876c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -110,35 +110,45 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
-                    <group col="8" colspan="4">
-                    <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"/>
-                    <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+                    <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 attrs="{'invisible':[('holiday_type','=','category')]}">
-                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
+                        <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"/>
+                                <div>
+                                    <field name="number_of_days_temp" class="oe_inline"/> days
+                                </div>
+                            </div>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="number_of_days_temp"/>
-                            <field name="double_validation" invisible="1"/>
+                            <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="manager_id" groups="base.group_no_one"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                            <separator string="Reasons" colspan="4"/>
-                            <field name="notes" nolabel="1" colspan="4"/>
+                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -159,31 +169,34 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
-                <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')]}"/>
-                </group>
-                <notebook>
-                    <page string="General">
-                        <group col="4">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                    <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'))]}"/>
-                            <field name="number_of_days_temp"/>
-                            <field name="double_validation" invisible="1"/>
-                            <field name="manager_id"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         </group>
-                        <separator string="Reasons"/>
-                        <field name="notes"/>
-                    </page>
-                </notebook>
-            </sheet>
-            <div class="oe_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+                        <group>
+                            <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>
+                    <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>
+                </sheet>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
+                </form>
             </field>
         </record>
 
@@ -342,7 +355,7 @@
         <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="request_approve_holidays"/>
         </record>
 
@@ -409,8 +422,7 @@
                 <form string="Leave Type" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="color_name"/>
-                        <field name="categ_id" widget="selection"/>
+                        <field name="categ_id"/>
                     </group>
                     <notebook>
                       <page string="Details">
@@ -420,6 +432,7 @@
                                   <field name="limit"/>
                               </group>
                               <group name="second" string="Misc">
+                                  <field name="color_name"/>
                                   <field name="active"/>
                               </group>
                           </group>
@@ -488,7 +501,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
-                <field name="date_to" position="after">
+                <field name="name" position="after">
                     <field name="holiday_id"/>
                 </field>
             </field>
@@ -529,8 +542,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
-                    <field name="remaining_leaves"/>
+                <field name="active" position="before">
+                    <label for="remaining_leaves"/>
+                    <div>
+                        <field name="remaining_leaves" class="oe_inline"/>
+                        <label/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
deleted file mode 100644
index efeb8e29115..00000000000
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-     <menuitem
-            id="menu_hr_reporting_holidays"
-            name="Leaves"
-            parent="hr.menu_hr_reporting"
-            sequence="6"/>
-     </data>
-</openerp>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 082bf198e34..e7441060204 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -17,7 +17,7 @@
             name="Leaves Analysis" 
             id="menu_hr_available_holidays_report_tree" 
             action="action_hr_available_holidays_report" 
-            parent="menu_hr_reporting_holidays"/>
+            parent="hr.menu_hr_reporting" sequence="5" />
 
 
     </data>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index f6f5851c051..c0bbf741277 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -8,16 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="date_from" />
                     <field name="holiday_type"/>
                     <field name="depts"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" special="cancel" class="oe_link"/>
+                </footer>
             </form>
             </field>
         </record>
@@ -33,7 +32,7 @@
 
         <menuitem
             name="Leaves by Department"
-            parent="menu_hr_reporting_holidays"
+            parent="hr.menu_hr_reporting_timesheet"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
             icon="STOCK_PRINT"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 4ef2dcc96c4..976d732ee69 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -20,6 +15,11 @@
                         <newline/>
                         <field name="emp" invisible="True"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f52c420df8a..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" />
-                            <field name="vehicle" />
-                            <field name="vehicle_distance" />
-                            <field name="medic_exam"  string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
-            </data>
-            </field>
-        </record>
-        <!-- End Employee View -->
-
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
@@ -45,8 +15,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="before">
-                    <separator string="Payslip Info" colspan="2"/>
+                <xpath expr="//field[@name='wage']" position="after">
                     <field name="struct_id" required="1"/>
                 </xpath>
                  <xpath expr="//field[@name='working_hours']" position="after">
@@ -105,7 +74,7 @@
             <field name="model">hr.payroll.structure</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Function">
+                <form string="Employee Function" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -249,6 +218,12 @@
                 </tree>
             </field>
         </record>
+        
+        <act_window name="Payslip Computation Details"
+            context="{'default_slip_id': active_id,'search_default_slip_id': active_id}"
+            res_model="hr.payslip.line"
+            src_model="hr.payslip"
+            id="act_payslip_lines"/>
 
         <record id="view_hr_payslip_form" model="ir.ui.view">
             <field name="name">hr.payslip.form</field>
@@ -265,13 +240,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
-                    <label for="date_from" class="oe_edit_only" string="Period"/>
-                    <h2>
-                        from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                        to <field name="date_to"/>
-                    </h2>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="employee_id" class="oe_edit_only"/>
+                        <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
+                        <label for="date_from" class="oe_edit_only" string="Period"/>
+                        <h2>
+                            From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
+                            to <field name="date_to"/>
+                        </h2>
+                    </div>
                     <group col="4">
                         <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
@@ -281,6 +261,7 @@
                     </group>
                     <notebook>
                         <page string="Worked Days &amp; Inputs">
+                            <separator string="Worked Days"/>
                             <field name="worked_days_line_ids">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -302,6 +283,7 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Other Inputs"/>
                             <field name="input_line_ids" colspan="4" nolabel="1">
                                 <tree string="Input Data" editable="bottom">
                                     <field name="name"/>
@@ -360,14 +342,18 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <group col="2" string="Other Information">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="payslip_run_id" domain="[('state','=','draft')]"/>
-                                <field name="paid" readonly="1"/>
-                            </group>
-                            <group string="Notes">
-                            <field name="note"/>
+                            <group>
+                                <group string="Miscellaneous">
+                                    <field name="company_id" groups="base.group_multi_company"/>
+                                    <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                </group>
+                                <group name="accounting" string="Accounting">
+                                    <field name="paid" readonly="1"/>
+                                </group>
                             </group>
+                            <div colspan="4">
+                                <field name="note" Placeholder="Add an internal note..."/>
+                            </div>
                        </page>
                     </notebook>
                     </sheet>
@@ -413,7 +399,27 @@
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
+        <act_window name="Payslips"
+                    context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+                    res_model="hr.payslip"
+                    src_model="hr.employee"
+                    view_id ="view_hr_payslip_tree"
+                    id="act_hr_employee_payslip_list"
+                    groups="base.group_hr_manager"/>
 
+        <!-- Employee View -->
+        <record id="payroll_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">payroll.hr.employee.view.form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
         <!-- Salary Category-->
         <record id="hr_salary_rule_category_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.form</field>
@@ -730,12 +736,20 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <group col="4">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
                         <field name="name"/>
-                        <field name="credit_note"/>
-                        <field name="date_start"/>
+                    </h1>
+                    <h2>
+                        Period from 
+                        <field name="date_start"/> 
+                        to 
                         <field name="date_end"/>
+                    </h2>
+                    <group col="4">
+                        <field name="credit_note"/>
                     </group>
+                    <separator string="Payslips"/>
                     <field name="slip_ids"/>
                 </sheet>
                 </form>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 8077ed88152..9e3aab3ecb6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
@@ -27,10 +25,12 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-                        <field name="account_debit" />
-                        <field name="account_credit"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="account_tax_id"/>
+                        <group colspan="4">
+                            <field name="account_debit" />
+                            <field name="account_credit"/>
+                            <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="account_tax_id"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
@@ -44,14 +44,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='advantages']" position="after">
-                   <separator colspan="4" string="Accounting"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="journal_id"/>
+                <xpath expr="//group[@name='duration_group']" position="after">
+                   <group string="Accounting">
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="journal_id"/>
+                    </group>
                 </xpath>
             </field>
         </record>
-        
+
     <!-- Payslip Run View -->
 
         <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
@@ -85,12 +86,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                    <newline/>
+                <field name="credit_note" position="before">
                     <field name="journal_id"/>
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index b83a482e1c1..e5df8cf2bf3 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -42,11 +42,10 @@ system to store and search in your CV base.
         'decimal_precision',
         'hr',
         'survey',
-        'crm',
+        'base_calendar',
         'fetchmail',
     ],
     'update_xml': [
-        'wizard/hr_recruitment_phonecall_view.xml',
         'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7b0090d60ea..a3cd2f3a629 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -24,15 +24,10 @@ import time
 from datetime import datetime, timedelta
 
 from osv import fields, osv
-from crm import crm
 import tools
 import collections
 import binascii
-import tools
 from tools.translate import _
-from crm import wizard
-
-wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -98,6 +93,7 @@ class hr_applicant(base_stage, osv.Model):
     _description = "Applicant"
     _order = "id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
@@ -181,7 +177,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=128, required=True),
+        'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -213,7 +209,7 @@ class hr_applicant(base_stage, osv.Model):
         'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
         'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
-        'availability': fields.integer('Availability (Days)'),
+        'availability': fields.integer('Availability'),
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
@@ -239,7 +235,7 @@ class hr_applicant(base_stage, osv.Model):
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'priority': lambda *a: '',
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
     }
 
@@ -293,49 +289,22 @@ class hr_applicant(base_stage, osv.Model):
         return False
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current applicant
+            @return: Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Opportunity to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return: Dictionary value for created Meeting view
-        """
-        data_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        value = {}
-        for opp in self.browse(cr, uid, ids, context=context):
-            # Get meeting views
-            search_view = data_obj.get_object(cr, uid, 'crm', 'view_crm_case_meetings_filter', context)
-            calendar_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_calendar_view_meet', context)
-            form_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_form_view_meet', context)
-            tree_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_tree_view_meet', context)
-            category = data_obj.get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
-            context.update({
-                'default_applicant_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',
-                'default_categ_id': category.id,
-                'default_name': opp.name,
-            })
-            value = {
-                'name': ('Meetings'),
-                'domain': "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(calendar_view.id, 'calendar'), (form_view.id, 'form'), (tree_view.id, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view.id,
-                'nodestroy': True,
-            }
-        return value
+        applicant = self.browse(cr, uid, ids[0], context)
+        category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_applicant_id': applicant.id,
+            'default_partner_id': applicant.partner_id and applicant.partner_id.id or False,
+            'default_user_id': uid,
+            'default_email_from': applicant.email_from,
+            'default_state': 'open',
+            'default_name': applicant.name,
+            'default_categ_id': category.id,
+        }
+        return res
 
     def action_print_survey(self, cr, uid, ids, context=None):
         """
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 13436bef45a..fe5d3d9969b 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,11 +5,9 @@
 -->
 <data>
 
-    <!-- Case category (for interview meetings) -->
-    <record model="crm.case.categ" id="categ_meet_interview">
+    <!-- Meeting Types (for interview meetings) -->
+    <record model="crm.meeting.type" id="categ_meet_interview">
         <field name="name">Interview</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
     </record>
 
         <!--    HR Recruitment Source        -->
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 00b300cb6f6..9118fb05ea1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -16,18 +16,6 @@
             view_mode="tree,form,calendar,graph"
             view_type="form"/>
 
-    # ------------------------------------------------------
-    # Job Categories
-    # ------------------------------------------------------
-
-    <record id="hr_job_categ_action" model="ir.actions.act_window">
-        <field name="name">Applicant Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-        <field name="context" eval="{'object_id': ref('model_hr_applicant')}"/>
-    </record>
     # ------------------------------------------------------
     # Stage
     # ------------------------------------------------------
@@ -150,61 +138,61 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/></h2>
-                    <field name="type_id" placeholder="Degree"/>
+                    <h2>
+                        <field name="partner_name" class="oe_inline"/>
+                    </h2>
                 </div>
-
                 <group>
-                    <group>
-                        <field name="user_id"/>
-                        <field name="title_action"/>
-                        <field name="date_action"/>
+                    <group string="Contact Details">
+                        <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                        <field name="email_from" widget="email"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <field name="type_id" placeholder="Degree"/>
                     </group>
-                    <group>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="priority" string="Appreciation"/>
+                    <group string="Application Followup">
+                        <field name="user_id"/>
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action"/> -
+                            <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
+                        </div>
+                        <field name="priority"/>
+                        <field name="state" invisible="1"/>
+                    </group>
+                    <group string="Job">
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
-                        <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" groups="base.group_no_one"/>
+                        <field name="job_id" on_change="onchange_job(job_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <label for="availability"/>
+                        <div>
+                            <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
+                        </div>
+                    </group>
+                    <group string="Contract">
+                        <label for="salary_expected"/>
+                        <div>
+                            <field name="salary_expected" class="oe_inline"/>, 
+                            <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                        <label for="salary_proposed"/>
+                        <div>
+                            <field name="salary_proposed" class="oe_inline"/>, 
+                            <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                    </group>
+                    <group string="Reference">
+                        <field name="source_id"/>
+                        <field name="reference"/>
                     </group>
                 </group>
-                <notebook>
-                    <page string="Application">
-                        <group>
-                            <group string="Contact">
-                                <label for="partner_id"/>
-                                <div>
-                                    <field name="partner_id" class="oe_inline"
-                                        on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button class="oe_inline"
-                                        string="Create" help="Create a new contact for this applicant" icon="gtk-index"
-                                        name="%(action_hr_recruitment_partner_create)d" type="action"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                                </div>
-                                <field name="email_from" widget="email"/>
-                                <field name="partner_phone"/>
-                                <field name="partner_mobile"/>
-                            </group>
-                            <group string="Reference">
-                                <field name="source_id"/>
-                                <field name="reference"/>
-                            </group>
-                            <group string="Contract">
-                                <field name="salary_expected"/>
-                                <field name="salary_expected_extra"/>
-                                <field name="salary_proposed"/>
-                                <field name="salary_proposed_extra"/>
-                                <field name="availability"/>
-                            </group>
-                        </group>
-                        <separator string="Details"/>
-                        <field name="description"/>
-                   </page>
-                </notebook>
+                <separator string="Application Summary"/>
+                <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
           </form>
         </field>
@@ -371,15 +359,15 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" version="7.0" position="after">
-                <label for="survey_id" />
-                <div>
-                    <field name="survey_id" class="oe_inline"/>
-                    <button class="oe_inline"
-                        string="Interview" icon="gtk-print"
-                        name="action_print_survey" type="object"
-                        attrs="{'invisible':[('survey_id','=',False)]}"/>
-                </div>
+            <field name="no_of_recruitment" version="7.0" position="after">
+            <label for="survey_id" />
+            <div>
+                <field name="survey_id" class="oe_inline"/>
+                <button class="oe_inline"
+                    string="Interview" icon="gtk-print"
+                    name="action_print_survey" type="object"
+                    attrs="{'invisible':[('survey_id','=',False)]}"/>
+            </div>
             </field>
         </field>
     </record>
@@ -517,21 +505,15 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
-    <record model="ir.ui.view" id="crm_meeting_form_view">
+    <record model="ir.ui.view" id="view_crm_meeting_form">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
         <field name="arch" type="xml">
             <field name="partner_id" position="before">
                 <field name="applicant_id" attrs="{'invisible': [('categ_id','!=',%(hr_recruitment.categ_meet_interview)d)]}"/>
             </field>
-            <field name="partner_id" position="attributes">
-                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
-            </field>
-            <field name="section_id" position="attributes">
-                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
-            </field>
         </field>
     </record>
 
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5ddbe5045ab..9d81d39f240 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -114,7 +114,7 @@
         <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6bbc30b7b41..7d082070be5 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -6,7 +6,6 @@ access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,b
 access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
-access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
-access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,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
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 38b84fccab2..841a49dc866 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -50,13 +50,6 @@
 -
   !python {model: hr.applicant}: |
     self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_developer')})
--
-  I start communication with applicant, first schedule phonecall.
--
-  !python {model: hr.recruitment.job2phonecall}: |
-     context.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
-     id = self.create(cr, uid, {}, context=context)
-     self.make_phonecall(cr, uid, [id], context=context)
 -
   I schedule meeting with applicant for interview.
 -
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index acabd219857..fde7df63456 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import hr_recruitment_phonecall
 import hr_recruitment_create_partner_job
 import hr_recruitment_employee_hired
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 985f6b25eec..cf8a30c9847 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Partner" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    <footer>
                         <button name="make_order" string="Create Contact" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
                         <label string="or" groups="base.group_partner_manager"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
deleted file mode 100644
index 12c294c20bc..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import time
-
-from osv import osv, fields
-from tools.translate import _
-
-class job2phonecall(osv.osv_memory):
-    _name = 'hr.recruitment.job2phonecall'
-    _description = 'Schedule Phone Call'
-    _columns = {
-        'user_id': fields.many2one('res.users', 'Assign To'),
-        'deadline': fields.datetime('Planned Date'),
-        'note': fields.text('Goals'),
-        'category_id': fields.many2one('crm.case.categ', 'Category', required=True),
-    }
-
-    def _date_user(self, cr, uid, context=None):
-        case_obj = self.pool.get('hr.applicant')
-        if context is None:
-            context = {}
-        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        return case.user_id and case.user_id.id or False
-
-    def _date_category(self, cr, uid, context=None):
-        case_obj = self.pool.get('hr.applicant')
-        if context is None:
-            context = {}
-        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
-        return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
-
-    def _get_note(self, cr, uid, context=None):
-        mail_message = self.pool.get('mail.message')
-        if context is None:
-            context = {}
-        if context.get('active_id'):
-            case = self.pool.get('hr.applicant').browse(cr, uid, context['active_id'], context=context)
-            if case.description:
-                return case.description
-            else:
-                msg_ids = mail_message.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1)
-                if msg_ids:
-                    return mail_message.browse(cr, uid, msg_ids[0], context=context).body_text
-        return False
-
-
-    _defaults = {
-         'user_id': _date_user,
-         'category_id': _date_category,
-         'note': _get_note
-                 }
-
-    def make_phonecall(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        job_case_obj = self.pool.get('hr.applicant')
-        data_obj = self.pool.get('ir.model.data')
-        phonecall_case_obj = self.pool.get('crm.phonecall')
-        if context is None:
-            context = {}
-        form = self.browse(cr, uid, ids, context=context)[0]
-        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-        # Select the view
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        new_phonecall_id = []
-        for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            #TODO: Take other info from job
-            new_phonecall_id = phonecall_case_obj.create(cr, uid, {
-                        'name': job.name,
-                        'user_id': form.user_id.id,
-                        'categ_id': form.category_id.id,
-                        'description': form.note,
-                        'date': form.deadline,
-                        'description': job.description,
-                        'partner_id': job.partner_id.id,
-                        'partner_phone': job.partner_phone,
-                        'partner_mobile': job.partner_mobile,
-                        'description': job.description,
-                        'date':job.date,
-                    }, context=context)
-            new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id, context=context)
-            vals = {}
-            job_case_obj.write(cr, uid, [job.id], vals, context=context)
-#            job_case_obj.case_cancel(cr, uid, [job.id])
-            phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
-
-        return {
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.phonecall',
-            'res_id': new_phonecall_id,
-            'views': [(id3,'form'), (id2,'tree'), (False,'calendar'), (False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-
-job2phonecall()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
deleted file mode 100644
index 8537186ac6f..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_hr_recruitment_phonecall" model="ir.ui.view">
-            <field name="name">hr.recruitment.job2phonecall.form</field>
-            <field name="model">hr.recruitment.job2phonecall</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Schedule Phone Call" version="7.0">
-                <header>
-                    <button name="make_phonecall" string="Schedule Phone Call" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <group col="4" colspan="6">
-                    <separator string="Phone Call Description" colspan="4" />
-                    <newline />
-                    <field name='user_id' />
-                    <field name='deadline' />
-                    <newline />
-                    <field name='note' colspan="4"/>
-                    <newline />
-                    <field name='category_id' domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_hr_recruitment_phonecall" model="ir.actions.act_window">
-            <field name="name">Schedule Phone Call</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.recruitment.job2phonecall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..487dcd592bd 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-         <menuitem
-            id="menu_hr_reporting_timesheet"
-            name="Timesheet"
-            parent="hr.menu_hr_reporting"
-            sequence="5" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 45bbb6456ef..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Lines">
-                    <group col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                        <field name="date" on_change="on_change_date(date)"/>
+                <form string="Timesheet Lines" version="7.0">
+                    <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                        </group>
+                        <group>
+                            <field name="date" on_change="on_change_date(date)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Information">
-                            <group>
-                                <group string="Product">
-                                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                </group>
-                                <group string="Accounting">
-                                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
-                                    <field name="journal_id"/>
-                                </group>
+                        <group>
+                            <group string="Product">
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
+                                <label string="Quantity" for="unit_amount"/>
+                                <div>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                </div>
                             </group>
+                            <group string="Accounting">
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                        </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -112,10 +121,14 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Categories" position="after">
+                <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="journal_id" widget="selection"/>
+                        <group>
+                            <group col="2">
+                                <field name="product_id" domain="[('type','=','service')]"/>
+                                <field name="journal_id"/>
+                            </group>
+                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 097bf764429..ae5b294aa16 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -7,7 +7,7 @@
     ctx.update({'model': 'hr.employee','active_ids': []})
     data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee_fp')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_my',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
+    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_employee',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
 
 -
  Print the HR Timesheet By Employee report through the wizard
@@ -18,4 +18,4 @@
     ctx.update({'model': 'hr.employee','active_ids': []})
     data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])]}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
\ No newline at end of file
+    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index f72ccd1fc2a..afcf64808b7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employee Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
                         <field name="employee_id" colspan="3"/>
                     </group>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -34,39 +34,8 @@
 
         <menuitem action="action_hr_timesheet_employee"
             id="menu_hr_timesheet_employee"
-            parent="menu_hr_reporting_timesheet"
+            parent="hr.menu_hr_reporting"
             sequence="2" icon="STOCK_PRINT"/>
 
-
-      <!-- Print My Timesheet -->
-      <record id="view_hr_timesheet_my" model="ir.ui.view">
-            <field name="name">hr.analytical.timesheet.my.form</field>
-            <field name="model">hr.analytical.timesheet.employee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Print My Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4">
-                    <separator string="This wizard will print monthly timesheet" colspan="4"/>
-                        <field name="month"/>
-                        <field name="year"/>
-                    </group>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_hr_timesheet_my" model="ir.actions.act_window">
-            <field name="name">My Timesheet</field>
-            <field name="res_model">hr.analytical.timesheet.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_timesheet_my"/>
-           <field name="target">new</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 32291489627..8ead6ea63d6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -9,19 +9,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employees Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group height="260" width="460">
-                        <group colspan="4">
-                            <field name="month"/>
-                            <field name="year"/>
-                            <separator string="Employees" colspan="4"/>
-                            <field name="employee_ids" colspan="4" nolabel="1"/>
+                    <sheet>
+                        <group>
+                             <label for="month" string="Period"/>
+                             <div>
+                                <field name="month" class="oe_inline"/>
+                                <field name="year" class="oe_inline"/>
+                            </div> 
                         </group>
-                    </group>
+                        <group string="Employees">
+                            <field name="employee_ids" nolabel="1"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -37,9 +40,8 @@
 
         <menuitem action="action_hr_timesheet_users"
             id="menu_hr_timesheet_users"
-            parent="menu_hr_reporting_timesheet"
-            groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
-
+            parent="hr.menu_hr_reporting_timesheet"
+            groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
 
      </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c7b7f320c37..dc2a6c47b8d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
                         <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
                     </group>
+                    <footer>
+                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -26,11 +26,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -40,6 +35,11 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
+                    <footer>
+                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -60,12 +60,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
-                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -80,6 +74,12 @@
                         <field name="analytic_amount"/>
                     </group>
 
+                    <footer>
+                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
+                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d07314498e1..9888972105e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -123,7 +123,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Bill Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index c279b27498e..f0679de8d95 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,22 +8,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Profit" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group height="420" width="370">
-                        <group col="4" colspan="4">
-                            <field name="date_from"/>
-                            <field name="date_to"/>
-                            <separator string="Journals" colspan="4"/>
-                            <field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Users" colspan="4"/>
-                            <field name="employee_ids" colspan="4" nolabel="1"/>
-                        </group>
-                    </group>
-                </form>
+                   <sheet>
+                       <group> 
+                           <label for="date_from" string="Duration" />
+                           <div>
+                               <field name="date_from" nolabel="1" class="oe_inline" />
+                               - <field name="date_to" nolabel="1" class="oe_inline"/>
+                           </div>
+                       </group>
+                       <group>
+                           <separator string="Journals" colspan="4"/>
+                           <field name="journal_ids" colspan="4" nolabel="1"/>
+                           <separator string="Users" colspan="4"/>
+                           <field name="employee_ids" colspan="4" nolabel="1"/>
+                       </group>
+                   </sheet>
+                   <footer>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                   </footer>
+               </form>
             </field>
         </record>
 
@@ -38,7 +42,7 @@
 
            <menuitem action="action_hr_timesheet_analytic_profit"
             id="menu_hr_timesheet_analytic_profit"
-            parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
+            parent="hr.menu_hr_reporting_timesheet" sequence="3" icon="STOCK_PRINT"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 28e8662f010..85d9538cc5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -27,11 +27,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -39,6 +34,11 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
+                <footer>
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index aec0b52d5e6..1c163a1ac0e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <notebook>
                     <page string="Billing Data">
                        <group>
@@ -28,6 +23,11 @@
                        </group>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c43b1206541..6635c38b909 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,39 +62,50 @@
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
-                    <h2>
-                        From <field name="date_from"/>
-                        to <field name="date_to"/>
-                    </h2>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" invisible="1"/>
+                    <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_timesheet" widget="float_time"/>
+                            <field name="total_difference" widget="float_time"/>
+                            <field name="user_id" invisible="1"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Daily">
-                            <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <field name="date_current" nolabel="1"/>
-                                <label string=""/>
-                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
-                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                            <group>
+                                <div>
+                                    <button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
+                                    <field name="date_current" class="oe_inline"/>
+                                </div>
+                                <div align="right">
+                                    <button class="oe_inline" icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                    <button class="oe_inline" name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                    <button class="oe_inline" icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                                </div>
                             </group>
-
-                            <field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
-                                <tree string="Attendances" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="action"/>
-                                    <field invisible="1" name="employee_id"/>
-                                </tree>
-                            </field>
-                            <group col="4" colspan="1">
+                            <group colspan="4" col="3">
+                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                    <tree string="Attendances" editable="bottom">
+                                        <field name="name"/>
+                                        <field name="action"/>
+                                        <field invisible="1" name="employee_id"/>
+                                    </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>
+                                </group>
+                            </group>
+                            <group col="4">
                                 <field name="state_attendance"/>
-                                <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"/>
-                                <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
@@ -124,8 +135,6 @@
                                     <field name="user_id" required="1"/>
                                 </form>
                             </field>
-                            <field name="total_difference_day" widget="float_time"/>
-                            <field name="total_timesheet_day" widget="float_time"/>
                         </page>
                         <page string="Summary">
                             <field colspan="4" name="period_ids" nolabel="1">
@@ -136,11 +145,6 @@
                                     <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
-                            <group colspan="4" col="6">
-                                <field name="total_attendance" widget="float_time"/>
-                                <field name="total_timesheet" widget="float_time"/>
-                                <field name="total_difference" widget="float_time"/>
-                            </group>
                         </page>
                     </notebook>
                 </sheet>
@@ -227,7 +231,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
+                <field name="date" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>
@@ -349,6 +353,17 @@
   <act_window
            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
            id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+           
+      <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.employee.extd_form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/i18n/es_EC.po b/addons/hr_timesheet_sheet/i18n/es_EC.po
new file mode 100644
index 00000000000..487693048f4
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/es_EC.po
@@ -0,0 +1,1045 @@
+# Spanish (Ecuador) 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-07-12 14:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-13 04:46+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "Hoja"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "¡No se ha definido un empleo para su usuario!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+#: field:hr_timesheet_sheet.sheet,total_attendance_day:0
+msgid "Total Attendance"
+msgstr "Total servicio"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0 view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current year"
+msgstr "Hoja de servicios del año en curso"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr "Hoja de servicios de tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"¡Por favor, verifique que la diferencia total de la hoja de servicios es "
+"menor que %.2f!"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "March"
+msgstr "March"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#Costo"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet of last month"
+msgstr "Hoja de servicios del último mes"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "Hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "Poner en borrador"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr "Basado en la hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by day of date"
+msgstr "Agrupar por día o fecha"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet!"
+msgstr "No se puede modificar una entrada en hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "Aprobada"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "Costo total"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal!"
+msgstr ""
+"Patra crear una hoja de asistencia para este empleado, se debe asignar al "
+"empleado a un diario analítico!"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "Rechazar"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
+"¡No puede introducir una fecha de asistencia fuera de las fechas de la hoja "
+"de servicio actual!"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+"Mi hoja de servicios abre su hoja de servicios para que pueda registrar sus "
+"actividades en el sistema. De la misma forma, puede registrar sus "
+"asistencias (entrar/salir) y describir las horas de trabajo realizadas en "
+"los diferentes proyectos. Al final del período definido en la empresa, la "
+"hoja de sercicios se confirma por el usuario y puede ser validado por su "
+"gerente. Si es necesario, tal como se define en el proyecto, puede generar "
+"las facturas en base a la tabla de tiempos."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr "Diferencia total"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid " Month-1 "
+msgstr " Mes-1 "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "My Departments Timesheet"
+msgstr "Hojas de servicios de departamento"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr "Hoja de servicios por día"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr "Proyecto / Cuenta Analítica"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "Validación"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr "Entrada de hojas de sercicios del empleado"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0 field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#Núm"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "Fecha desde"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid " Month "
+msgstr " Mes "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "Asistencia"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "Confirmado"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "Líneas hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No puede crear compañías recursivas."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "El estado es 'confirmado'"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "Empleado(a)"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr "Mis asistencias totales por semana"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de servicio"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by month of date"
+msgstr "Agrupar por mes o fecha"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción inválida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr "El jefe de proyecto valida las hojas de servicio."
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr "Trabajar en tarea"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily"
+msgstr "Diario"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr "#Cantidad"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "Total hoja servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr "Asistencia disponible"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "Iniciar sesión"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr "#Total hoja servicios"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "rrhh.hojaasistencia.actual.abrir"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "Ir a:"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr "Abrirá su hoja de servicios actual"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#, python-format
+msgid "You cannot duplicate a timesheet!"
+msgstr "No puede duplicar una hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr "#Total dif."
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr "En borrador"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product!"
+msgstr ""
+"Para crear una hoja de servicios para este empleado, se debe vincular al "
+"empleado a un producto!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "Entrar/salir"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0 view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlaps!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"Check your timesheets for a specific period. You can also encode time spent "
+"on a project (i.e. an analytic account) thus generating costs in the "
+"analytic account concerned."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0 field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by year of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0 field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet,total_difference_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal, like 'Timesheet'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#, python-format
+msgid "You cannot sign in/sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submited to Manager"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
+#: view:timesheet.report:0 field:timesheet.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8b102b19f72..fd5d6b0b6d1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -82,6 +82,6 @@
         <menuitem
             action="action_hr_timesheet_report_stat_all"
             id="menu_hr_timesheet_report_all"
-            parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
+            parent="hr.menu_hr_reporting" sequence="3"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index fe497b6f46c..613f92d3cf6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -110,6 +110,6 @@
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+                parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c04f116b48..b2dfabb310e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -7,14 +7,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
-               <header>
-                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-               </header>
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
+               <footer>
+                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+               </footer>
            </form>
         </field>
     </record>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 31fbb6d3924..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,13 +72,16 @@
                     <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
+                <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_ids"/>
-                    <h2><field name="category_ids"/></h2>
+                    <label for="category_ids" class="oe_edit_only"/>
+                    <field name="category_ids" widget="many2many_tags"/>
+                    <label for="description"/><newline/>
                     <field name="description"/>
+                </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 5c538e5912f..5242633747f 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -26,7 +26,7 @@
     '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','crm'],
+    'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv',
                 'sync_google_calendar_view.xml',
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
new file mode 100644
index 00000000000..1f6bda316dc
--- /dev/null
+++ b/addons/import_google/i18n/ar.po
@@ -0,0 +1,217 @@
+# 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:36+0000\n"
+"PO-Revision-Date: 2012-07-07 15:59+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-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\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/ja.po b/addons/import_google/i18n/ja.po
index ad1ab085495..75e4f08b159 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 18:56+0000\n"
+"PO-Revision-Date: 2012-07-09 04:44+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-05-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
@@ -70,7 +70,7 @@ msgstr "グループ名"
 #. module: import_google
 #: model:ir.model,name:import_google.model_crm_case_categ
 msgid "Category of Case"
-msgstr "ケースの分類"
+msgstr "案件の分類"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
diff --git a/addons/import_google/partner.py b/addons/import_google/partner.py
index 232f18d06a3..e7aa4dd8ca7 100644
--- a/addons/import_google/partner.py
+++ b/addons/import_google/partner.py
@@ -21,11 +21,11 @@
 
 from osv import fields,osv
 
-class crm_case_categ(osv.osv):
-    """ Category of Case """
-    _inherit = "crm.case.categ"
+class crm_meeting_type(osv.osv):
+    """ Meeting Types """
+    _inherit = "crm.meeting.type"
     _columns = {
         'user_id': fields.many2one('res.users', 'User')
     }
-crm_case_categ()
+
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 84f0176c5ec..626d803d4df 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="crm_case_form_view_meet_inherit">
+        <record model="ir.ui.view" id="view_crm_meeting_form">
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+            <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit">
-            <field name="name">CRM - Meetings Tree (Inherited)</field>
-            <field name="model">crm.meeting</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/>
-            <field name="arch" type="xml">
-               <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+                    <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
                 </field>
             </field>
         </record>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 9a9b2802826..c34a14e224d 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -235,10 +235,10 @@ class google_import(import_framework):
 
 
     def get_event_category(self, val, name):
-        fields = ['name', 'object_id']
-        nameid = 'event_category_'+name
-        data = [name, 'crm.meeting']
-        return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
+        nameid = 'event_category_' + name
+        fields = ['name']
+        data = [name]
+        return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
 
     def get_rec(self, val):
         if val.get("recurrency"):
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 2968b009a51..b8adc71f2a5 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <newline/>
@@ -21,6 +16,11 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -33,14 +33,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index 811bd6016fb..6f67aed9ada 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-09 09:19+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-09 18:11+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-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -28,7 +28,7 @@ msgstr "エラー"
 #: view:import.sugarcrm:0
 msgid ""
 "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
+msgstr "SugarSoap API URL（ツールヒントを参照）とフルアクセスのSugarCRMログインを使用します。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -51,11 +51,12 @@ 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 "連絡先"
+msgstr "コンタクト"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -65,12 +66,12 @@ msgstr "人事"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,bug:0
 msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
+msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,instance_name:0
 msgid "Instance's Name"
-msgstr "事例の名前"
+msgstr "インスタンスの名前"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
@@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
 msgid "Notify End Of Import To:"
-msgstr "へインポートの終了を通知する。"
+msgstr "インポート終了の通知先："
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,user:0
@@ -89,35 +90,37 @@ msgid ""
 "user with the same login exist in OpenERP, user information will be erase by "
 "sugarCRM user information"
 msgstr ""
+"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
+"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
 
 #. 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 "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+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 "インポート完了を通知するEメールを忘れないで下さい。"
+msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,call:0
 msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
+msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
 
 #. 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 ""
+msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
@@ -132,12 +135,12 @@ msgstr "ドキュメント"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータをインポートする。"
+msgstr "SugarCRMからデータのインポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -149,7 +152,7 @@ msgstr "CRM"
 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 ""
+msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
@@ -159,19 +162,19 @@ msgstr "通話"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Multi Instance Management"
-msgstr ""
+msgstr "複数インスタンスの管理"
 
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr "_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 ""
+msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
@@ -186,6 +189,9 @@ msgid ""
 "application "
 "http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 msgstr ""
+"データを取得するためのWebサービスのURL。例：'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
+"CRMアプリケーションのアドレスをコピーします。 "
+"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
@@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr "インポート(_I)"
+msgstr "インポート"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
@@ -208,18 +214,18 @@ msgstr "ユーザ"
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1131
 #, python-format
 msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
+msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,claim:0
 msgid "Cases"
-msgstr "お問合せ"
+msgstr "案件"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,meeting:0
 msgid ""
 "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
+msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,email_history:0
@@ -227,6 +233,7 @@ msgid ""
 "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
 "Messages and Attachments"
 msgstr ""
+"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project:0
@@ -240,13 +247,13 @@ msgid ""
 "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 msgstr ""
-"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from "
+"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project:0
 msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
+msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1098
@@ -263,12 +270,12 @@ msgstr "ミーティング"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,employee:0
 msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
+msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,url:0
 msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
+msgstr "SugarSoap API URL："
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -282,6 +289,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,bug:0
@@ -296,12 +305,12 @@ msgstr "プロジェクト"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project_task:0
 msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
+msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,opportunity:0
 msgid "Leads & Opp"
-msgstr "見込み客 ＆ 商談"
+msgstr "リード ＆ 商談"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -310,6 +319,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password or bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -330,12 +341,12 @@ msgstr "警告"
 msgid ""
 "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
 "from different server."
-msgstr ""
+msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス（接頭辞）は異なるサーバから来ます。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,contact:0
 msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
+msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,password:0
@@ -350,12 +361,12 @@ msgstr "ログイン情報"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,claim:0
 msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
+msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Notification When Import is Finished"
-msgstr ""
+msgstr "インポート完了時にEメール通知"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,username:0
@@ -366,17 +377,17 @@ msgstr "ユーザ名"
 #: view:import.message:0
 #: model:ir.model,name:import_sugarcrm.model_import_message
 msgid "Import Message"
-msgstr "メッセージをインポートする。"
+msgstr "メッセージのインポート"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,account:0
 msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
+msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Online documentation:"
-msgstr ""
+msgstr "オンラインドキュメンテーション："
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,account:0
@@ -386,7 +397,7 @@ msgstr "顧客情報"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Cancel"
-msgstr "キャンセル(_C)"
+msgstr "キャンセル"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
@@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Address to Notify"
-msgstr ""
+msgstr "通知のEメールアドレス"
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ad3488deb98..0cec5899c41 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -13,19 +13,17 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Wiki">
-                                <field name="module_wiki_faq"/>
-                                <field name="module_wiki_quality_manual"/>
-                            </group>
-                            <group string="Documents">
-                                <field name="module_document"/>
-                                <field name="module_document_ftp"/>
-                                <field name="module_document_webdav"/>
-                            </group>
+                    <group>
+                        <group string="Wiki">
+                            <field name="module_wiki_faq"/>
+                            <field name="module_wiki_quality_manual"/>
                         </group>
-                    </sheet>
+                        <group string="Documents">
+                            <field name="module_document"/>
+                            <field name="module_document_ftp"/>
+                            <field name="module_document_webdav"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 357dc78c9d7..30ff9a9ed8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group string="Declare Periodical VAT">
                             <field name="period_id" widget="selection"/>
@@ -26,6 +21,11 @@
                     </group>
                     <separator string="Comments"/>
                     <field name="comments"/>
+                    <footer>
+                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d4bcd756922..f0bdb2a2a3f 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -8,12 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
-                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>
                     </group>   
@@ -33,6 +27,12 @@
                             <field name="country_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
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 46caa9f6478..79c7c08ffca 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
@@ -9,23 +9,17 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//page[@name='information']/group/group[@name='right_column']" position="before">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
+                    <field name="car_employee_deduction"/>
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
+                    <field name="meal_voucher_employee_deduction"/>
                     <field name="misc_advantage_amount"/>
-                    <separator string="Miscellaneous" colspan="2"/>
                     <field name="additional_net_amount"/>
                     <field name="retained_net_amount"/>
-                 </xpath>
-                 <xpath expr="//field[@name='trial_date_end']" position="after">
-                    <group colspan="2" col="2">
-                        <separator string="by Worker" colspan="2"/>
-                        <field name="insurance_employee_deduction"/>
-                        <field name="meal_voucher_employee_deduction"/>
-                        <field name="car_employee_deduction"/>
-                    </group>
+                    <field name="insurance_employee_deduction"/>
                  </xpath>
             </data>
             </field>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ed704810e45..222aad3b6b9 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
-                    <header>
-                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="file"/>
                     </group>
+                    <footer>
+                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 1340d869941..7e9d5894dfc 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
-                    <header>
-                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="dta_file"/>
                     </group>
+                    <footer>
+                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index 9d16f44252b..525dabfcc8a 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -8,135 +8,24 @@
         jusqu'à décembre 2007
 
         Version du fichier : 12-04-2008
+
+        Utilise les 'account types' de addons/account/data/data_account_type.xml
       -->
 
-        <!--  Account Types -->
-        <record id="account_type_dettes" model="account.account.type">
-            <field name="name">Dettes long terme</field>
-            <field name="code">dettes</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_immobilisations" model="account.account.type">
-            <field name="name">Immobilisations</field>
-            <field name="code">immobilization</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_stock" model="account.account.type">
-            <field name="name">Stocks</field>
-            <field name="code">stocks</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_cloture" model="account.account.type">
-            <field name="name">Cloture</field>
-            <field name="code">cloture</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_receivable" >
-              <field name="name">Receivable</field>
-              <field name="code">receivable</field>
-              <field name="report_type">asset</field>
-              <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_payable" >
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="report_type">liability</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_income" >
-          <field name="name">Income</field>
-          <field name="code">income</field>
-          <field name="report_type">income</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_expense">
-          <field name="name">Expense</field>
-          <field name="code">expense</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_tax">
-          <field name="name">Tax</field>
-          <field name="code">tax</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_cash">
-          <field name="name">Cash</field>
-          <field name="code">cash</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_asset">
-          <field name="name">Asset</field>
-          <field name="code">asset</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_equity">
-          <field name="name">Equity</field>
-          <field name="code">equity</field>
-          <field name="report_type">liability</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_provision">
-          <field name="name">Provisions</field>
-          <field name="code">provision</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_commitment">
-          <field name="name">Engagements</field>
-          <field name="code">commitment</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_stocks">
-          <field name="name">Actif circulant</field>
-          <field name="code">current asset</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_special">
-          <field name="name">Comptes spéciaux</field>
-          <field name="code">special</field>
-          <field name="close_method">none</field>
-        </record>
-
 
     <!-- Account Templates -->
     <record id="pcg_0" model="account.account.template">
       <field name="name">Plan Comptable Général</field>
       <field name="code">0</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
     </record>
 
     <record id="pcg_Classes_1_a_5" model="account.account.template">
       <field name="name">Comptes de bilan</field>
       <field name="code">Classes 1 à 5</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_0"/>
     </record>
 
@@ -144,9 +33,8 @@
       <field name="name">Comptes de capitaux</field>
       <field name="code">Classe 1</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Capitaux propres, autres fonds propres, emprunts et dettes assimilées</field>
-
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -154,8 +42,7 @@
       <field name="name">Capital et réserves</field>
       <field name="code">10</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -163,9 +50,8 @@
       <field name="name">Capital</field>
       <field name="code">101</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Capital pour sociétés de type (SARL, SA). Pour une EI utiliser le compte 108</field>
-
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -173,8 +59,7 @@
       <field name="name">Capital souscrit - non appelé</field>
       <field name="code">1011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -182,8 +67,7 @@
       <field name="name">Capital souscrit - appelé non versé</field>
       <field name="code">1012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -191,8 +75,7 @@
       <field name="name">Capital souscrit - appelé versé</field>
       <field name="code">1013</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -200,8 +83,7 @@
       <field name="name">Capital non amorti</field>
       <field name="code">10131</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1013"/>
     </record>
 
@@ -209,8 +91,7 @@
       <field name="name">Capital amorti</field>
       <field name="code">10132</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1013"/>
     </record>
 
@@ -218,8 +99,7 @@
       <field name="name">Capital souscrit soumis à des réglementations particulières</field>
       <field name="code">1018</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -227,8 +107,7 @@
       <field name="name">Primes liées au capital social</field>
       <field name="code">104</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -236,8 +115,7 @@
       <field name="name">Primes d'émission</field>
       <field name="code">1041</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -245,8 +123,7 @@
       <field name="name">Primes de fusion</field>
       <field name="code">1042</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -254,8 +131,7 @@
       <field name="name">Primes d'apport</field>
       <field name="code">1043</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -263,8 +139,7 @@
       <field name="name">Primes de conversion d'obligations en actions</field>
       <field name="code">1044</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -272,8 +147,7 @@
       <field name="name">Bons de souscription d'actions</field>
       <field name="code">1045</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -281,8 +155,7 @@
       <field name="name">Écarts de réévaluation</field>
       <field name="code">105</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -290,8 +163,7 @@
       <field name="name">Réserve spéciale de réévaluation</field>
       <field name="code">1051</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -299,8 +171,7 @@
       <field name="name">Écart de réévaluation libre</field>
       <field name="code">1052</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -308,8 +179,7 @@
       <field name="name">Réserve de réévaluation</field>
       <field name="code">1053</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -317,8 +187,7 @@
       <field name="name">Écarts de réévaluation (autres opérations légales)</field>
       <field name="code">1055</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -326,8 +195,7 @@
       <field name="name">Autres écarts de réévaluation en France</field>
       <field name="code">1057</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -335,8 +203,7 @@
       <field name="name">Autres écarts de réévaluation à l'étranger</field>
       <field name="code">1058</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -344,8 +211,7 @@
       <field name="name">Réserves</field>
       <field name="code">106</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -353,8 +219,7 @@
       <field name="name">Réserve légale</field>
       <field name="code">1061</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -362,8 +227,7 @@
       <field name="name">Réserve légale proprement dite</field>
       <field name="code">10611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1061"/>
     </record>
 
@@ -371,8 +235,7 @@
       <field name="name">Plus-values nettes à long terme</field>
       <field name="code">10612</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1061"/>
     </record>
 
@@ -380,8 +243,7 @@
       <field name="name">Réserves indisponibles</field>
       <field name="code">1062</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -389,8 +251,7 @@
       <field name="name">Réserves statutaires ou contractuelles</field>
       <field name="code">1063</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -398,8 +259,7 @@
       <field name="name">Réserves réglementées</field>
       <field name="code">1064</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -407,8 +267,7 @@
       <field name="name">Plus-values nettes à long terme</field>
       <field name="code">10641</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -416,8 +275,7 @@
       <field name="name">Réserves consécutives à l'octroi de subventions d'investissement</field>
       <field name="code">10643</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -425,8 +283,7 @@
       <field name="name">Autres réserves réglementées</field>
       <field name="code">10648</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -434,8 +291,7 @@
       <field name="name">Autres réserves</field>
       <field name="code">1068</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -443,8 +299,7 @@
       <field name="name">Réserve de propre assureur</field>
       <field name="code">10681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1068"/>
     </record>
 
@@ -452,8 +307,7 @@
       <field name="name">Réserves diverses</field>
       <field name="code">10688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1068"/>
     </record>
 
@@ -461,8 +315,7 @@
       <field name="name">Écarts d'équivalence</field>
       <field name="code">107</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -470,9 +323,8 @@
       <field name="name">Compte de l'exploitant</field>
       <field name="code">108</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="note">Capital pour une Entreprise Individuelle</field>
-
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -480,8 +332,7 @@
       <field name="name">Actionnaires: capital souscrit - non appelé</field>
       <field name="code">109</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_asset"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -489,8 +340,7 @@
       <field name="name">Report à nouveau (solde créditeur ou débiteur)</field>
       <field name="code">11</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -498,8 +348,7 @@
       <field name="name">Report à nouveau (solde créditeur)</field>
       <field name="code">110</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_11"/>
     </record>
 
@@ -507,8 +356,7 @@
       <field name="name">Report à nouveau (solde débiteur)</field>
       <field name="code">119</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_11"/>
     </record>
 
@@ -516,8 +364,7 @@
       <field name="name">Résultat de l'exercice (bénéfice ou perte)</field>
       <field name="code">12</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -525,8 +372,7 @@
       <field name="name">Résultat de l'exercice (bénéfice)</field>
       <field name="code">120</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_12"/>
     </record>
 
@@ -534,8 +380,7 @@
       <field name="name">Résultat de l'exercice (perte)</field>
       <field name="code">129</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_12"/>
     </record>
 
@@ -543,8 +388,7 @@
       <field name="name">Subventions d'investissement</field>
       <field name="code">13</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -552,8 +396,7 @@
       <field name="name">Subventions d'équipement</field>
       <field name="code">131</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -561,8 +404,7 @@
       <field name="name">État</field>
       <field name="code">1311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -570,8 +412,7 @@
       <field name="name">Régions</field>
       <field name="code">1312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -579,8 +420,7 @@
       <field name="name">Départements</field>
       <field name="code">1313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -588,8 +428,7 @@
       <field name="name">Communes</field>
       <field name="code">1314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -597,8 +436,7 @@
       <field name="name">Collectivités publiques</field>
       <field name="code">1315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -606,8 +444,7 @@
       <field name="name">Entreprises publiques</field>
       <field name="code">1316</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -615,8 +452,7 @@
       <field name="name">Entreprises et organismes privés</field>
       <field name="code">1317</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -624,8 +460,7 @@
       <field name="name">Autres</field>
       <field name="code">1318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -633,8 +468,7 @@
       <field name="name">Autres subventions d'investissement (même ventilation que celle du compte 131)</field>
       <field name="code">138</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -642,8 +476,7 @@
       <field name="name">Subventions d'investissement inscrites au compte de résultat</field>
       <field name="code">139</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -651,8 +484,7 @@
       <field name="name">Subventions d'équipement</field>
       <field name="code">1391</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_139"/>
     </record>
 
@@ -660,8 +492,7 @@
       <field name="name">Etat</field>
       <field name="code">13911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -669,8 +500,7 @@
       <field name="name">Régions</field>
       <field name="code">13912</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -678,8 +508,7 @@
       <field name="name">Départements</field>
       <field name="code">13913</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -687,8 +516,7 @@
       <field name="name">Communes</field>
       <field name="code">13914</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -696,8 +524,7 @@
       <field name="name">Collectivités publiques</field>
       <field name="code">13915</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -705,8 +532,7 @@
       <field name="name">Entreprises publiques</field>
       <field name="code">13916</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -714,8 +540,7 @@
       <field name="name">Entreprises et organismes privés </field>
       <field name="code">13917</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -723,8 +548,7 @@
       <field name="name">Autres</field>
       <field name="code">13918</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -732,8 +556,7 @@
       <field name="name">Autres subventions d'investissement (même ventilation que celle du compte 1391)</field>
       <field name="code">1398</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_139"/>
     </record>
 
@@ -741,8 +564,7 @@
       <field name="name">Provisions réglementées</field>
       <field name="code">14</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -750,8 +572,7 @@
       <field name="name">Provisions réglementées relatives aux immobilisations</field>
       <field name="code">142</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -759,8 +580,7 @@
       <field name="name">Provisions reconstitution des gisements miniers et pétroliers</field>
       <field name="code">1423</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_142"/>
     </record>
 
@@ -768,8 +588,7 @@
       <field name="name">Provisions pour investissement (participation des salariés)</field>
       <field name="code">1424</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_142"/>
     </record>
 
@@ -777,8 +596,7 @@
       <field name="name">Provisions réglementées relatives aux stocks</field>
       <field name="code">143</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -786,8 +604,7 @@
       <field name="name">Hausse des prix</field>
       <field name="code">1431</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_143"/>
     </record>
 
@@ -795,8 +612,7 @@
       <field name="name">Fluctuation des cours</field>
       <field name="code">1432</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_143"/>
     </record>
 
@@ -804,8 +620,7 @@
       <field name="name">Provisions réglementées relatives aux autres éléments de l'actif</field>
       <field name="code">144</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -813,8 +628,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">145</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -822,8 +636,7 @@
       <field name="name">Provision spéciale de réévaluation</field>
       <field name="code">146</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -831,8 +644,7 @@
       <field name="name">Plus-values réinvesties</field>
       <field name="code">147</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -840,8 +652,7 @@
       <field name="name">Autres provisions réglementées</field>
       <field name="code">148</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -849,8 +660,7 @@
       <field name="name">Provisions</field>
       <field name="code">15</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -858,8 +668,7 @@
       <field name="name">Provisions pour risques</field>
       <field name="code">151</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -867,8 +676,7 @@
       <field name="name">Provisions pour litiges</field>
       <field name="code">1511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -876,8 +684,7 @@
       <field name="name">Provisions pour garanties données aux clients</field>
       <field name="code">1512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -885,8 +692,7 @@
       <field name="name">Provisions pour pertes sur marchés à terme</field>
       <field name="code">1513</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -894,8 +700,7 @@
       <field name="name">Provisions pour amendes et pénalités</field>
       <field name="code">1514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -903,8 +708,7 @@
       <field name="name">Provisions pour pertes de change</field>
       <field name="code">1515</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -912,8 +716,7 @@
       <field name="name">Provisions pour pertes sur contrats</field>
       <field name="code">1516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -921,8 +724,7 @@
       <field name="name">Autres provisions pour risques</field>
       <field name="code">1518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -930,8 +732,7 @@
       <field name="name">Provisions pour pensions et obligations similaires</field>
       <field name="code">153</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -939,8 +740,7 @@
       <field name="name">Provisions pour restructurations</field>
       <field name="code">154</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -948,8 +748,7 @@
       <field name="name">Provisions pour impôts</field>
       <field name="code">155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -957,8 +756,7 @@
       <field name="name">Provisions pour renouvellement des immobilisations (entreprises concessionnaires)</field>
       <field name="code">156</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -966,8 +764,7 @@
       <field name="name">Provisions pour charges à répartir sur plusieurs exercices</field>
       <field name="code">157</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -975,8 +772,7 @@
       <field name="name">Provisions pour gros entretien ou grandes révisions </field>
       <field name="code">1572</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_157"/>
     </record>
 
@@ -984,8 +780,7 @@
       <field name="name">Autres provisions pour charges</field>
       <field name="code">158</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -993,8 +788,7 @@
       <field name="name">Provisions pour remises en état</field>
       <field name="code">1581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_158"/>
     </record>
 
@@ -1002,8 +796,7 @@
       <field name="name">Emprunts et dettes assimilées</field>
       <field name="code">16</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1011,8 +804,7 @@
       <field name="name">Emprunts obligataires convertibles</field>
       <field name="code">161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1020,8 +812,7 @@
       <field name="name">Autres emprunts obligataires </field>
       <field name="code">163</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1029,8 +820,7 @@
       <field name="name">Emprunts auprès des établissements de crédit</field>
       <field name="code">164</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1038,8 +828,7 @@
       <field name="name">Dépôts et cautionnements reçus</field>
       <field name="code">165</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1047,8 +836,7 @@
       <field name="name">Dépôts</field>
       <field name="code">1651</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_165"/>
     </record>
 
@@ -1056,8 +844,7 @@
       <field name="name">Cautionnements</field>
       <field name="code">1655</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_165"/>
     </record>
 
@@ -1065,8 +852,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">166</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1074,8 +860,7 @@
       <field name="name">Comptes bloqués</field>
       <field name="code">1661</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_166"/>
     </record>
 
@@ -1083,8 +868,7 @@
       <field name="name">Fonds de participation</field>
       <field name="code">1662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_166"/>
     </record>
 
@@ -1092,8 +876,7 @@
       <field name="name">Emprunts et dettes assortis de conditions particulières</field>
       <field name="code">167</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1101,8 +884,7 @@
       <field name="name">Emissions de titres participatifs</field>
       <field name="code">1671</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1110,8 +892,7 @@
       <field name="name">Avances conditionnées de l'État</field>
       <field name="code">1674</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1119,8 +900,7 @@
       <field name="name">Emprunts participatifs</field>
       <field name="code">1675</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1128,8 +908,7 @@
       <field name="name">Autres emprunts et dettes assimilées</field>
       <field name="code">168</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1137,8 +916,7 @@
       <field name="name">Autres emprunts</field>
       <field name="code">1681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1146,8 +924,7 @@
       <field name="name">Rentes viagères capitalisées</field>
       <field name="code">1685</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1155,8 +932,7 @@
       <field name="name">Autres dettes</field>
       <field name="code">1687</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1164,8 +940,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">1688</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1173,8 +948,7 @@
       <field name="name">Sur emprunts obligataires convertibles </field>
       <field name="code">16881</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1182,8 +956,7 @@
       <field name="name">Sur autres emprunts obligataires</field>
       <field name="code">16883</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1191,8 +964,7 @@
       <field name="name">Sur emprunts auprès des établissements de crédit</field>
       <field name="code">16884</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1200,8 +972,7 @@
       <field name="name">Sur dépôts et cautionnements reçus</field>
       <field name="code">16885</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1209,8 +980,7 @@
       <field name="name">Sur participation des salariés aux résultats</field>
       <field name="code">16886</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1218,8 +988,7 @@
       <field name="name">Sur emprunts et dettes assortis de conditions particulières</field>
       <field name="code">16887</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1227,8 +996,7 @@
       <field name="name">Sur autres emprunts et dettes assimilées</field>
       <field name="code">16888</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1236,8 +1004,7 @@
       <field name="name">Primes de remboursement des obligations</field>
       <field name="code">169</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1245,8 +1012,7 @@
       <field name="name">Dettes rattachées à des participations</field>
       <field name="code">17</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1254,8 +1020,7 @@
       <field name="name">Dettes rattachées à des participations (groupe)</field>
       <field name="code">171</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1263,8 +1028,7 @@
       <field name="name">Dettes rattachées à des participations (hors groupe)</field>
       <field name="code">174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1272,8 +1036,7 @@
       <field name="name">Dettes rattachées à des sociétés en participation</field>
       <field name="code">178</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1281,8 +1044,7 @@
       <field name="name">Principal</field>
       <field name="code">1781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_178"/>
     </record>
 
@@ -1290,8 +1052,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">1788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_178"/>
     </record>
 
@@ -1299,8 +1060,7 @@
       <field name="name">Comptes de liaison des établissements et sociétés en participation</field>
       <field name="code">18</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1308,8 +1068,7 @@
       <field name="name">Comptes de liaison des établissements</field>
       <field name="code">181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1317,8 +1076,7 @@
       <field name="name">Biens et prestations de services échangés entre établissements (charges)</field>
       <field name="code">186</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1326,8 +1084,7 @@
       <field name="name">Biens et prestations de services échangés entre établissements (produits)</field>
       <field name="code">187</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1335,8 +1092,7 @@
       <field name="name">Comptes de liaison des sociétés en participation</field>
       <field name="code">188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1344,9 +1100,8 @@
       <field name="name">Comptes d'immobilisations</field>
       <field name="code">Classe 2</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Immobilisations incorporelles, corporelles, financières et frais d'établissement</field>
-
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -1354,8 +1109,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">20</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1363,8 +1117,7 @@
       <field name="name">Frais d'établissement</field>
       <field name="code">201</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1372,8 +1125,7 @@
       <field name="name">Frais de constitution</field>
       <field name="code">2011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1381,8 +1133,7 @@
       <field name="name">Frais de premier établissement</field>
       <field name="code">2012</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1390,8 +1141,7 @@
       <field name="name">Frais de prospection</field>
       <field name="code">20121</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2012"/>
     </record>
 
@@ -1399,8 +1149,7 @@
       <field name="name">Frais de publicité</field>
       <field name="code">20122</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2012"/>
     </record>
 
@@ -1408,8 +1157,7 @@
       <field name="name">Frais d'augmentation de capital et d'opérations diverses (fusions, scissions, transformations)</field>
       <field name="code">2013</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1417,8 +1165,7 @@
       <field name="name">Frais de recherche et de développement</field>
       <field name="code">203</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1426,8 +1173,7 @@
       <field name="name">Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">205</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1435,8 +1181,7 @@
       <field name="name">Droit au bail</field>
       <field name="code">206</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1444,8 +1189,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">207</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1453,8 +1197,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">208</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1462,9 +1205,8 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">21</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Si valeur unitaire supérieure à 500 Euros HT</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1472,8 +1214,7 @@
       <field name="name">Terrains</field>
       <field name="code">211</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1481,8 +1222,7 @@
       <field name="name">Terrains nus</field>
       <field name="code">2111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1490,8 +1230,7 @@
       <field name="name">Terrains aménagés</field>
       <field name="code">2112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1499,8 +1238,7 @@
       <field name="name">Sous-sols et sur-sols</field>
       <field name="code">2113</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1508,8 +1246,7 @@
       <field name="name">Terrains de gisement</field>
       <field name="code">2114</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1517,8 +1254,7 @@
       <field name="name">Carrières</field>
       <field name="code">21141</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2114"/>
     </record>
 
@@ -1526,8 +1262,7 @@
       <field name="name">Terrains bâtis</field>
       <field name="code">2115</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1535,8 +1270,7 @@
       <field name="name">Ensembles immobiliers industriels (A, B, ...)</field>
       <field name="code">21151</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1544,8 +1278,7 @@
       <field name="name">Ensembles immobiliers administratifs et commerciaux (A, B, ...)</field>
       <field name="code">21155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1553,8 +1286,7 @@
       <field name="name">Autres ensembles immobiliers</field>
       <field name="code">21158</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1562,8 +1294,7 @@
       <field name="name">Affectés aux opérations professionnelles (A, B, ...)</field>
       <field name="code">211581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21158"/>
     </record>
 
@@ -1571,8 +1302,7 @@
       <field name="name">Affectés aux opérations non professionnelles (A, B, ...)</field>
       <field name="code">211588</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21158"/>
     </record>
 
@@ -1580,8 +1310,7 @@
       <field name="name">Compte d'ordre sur immobilisations</field>
       <field name="code">2116</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1589,8 +1318,7 @@
       <field name="name">Agencements et aménagements de terrains (même ventilation que celle du compte 211)</field>
       <field name="code">212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1598,8 +1326,7 @@
       <field name="name">Constructions</field>
       <field name="code">213</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1607,8 +1334,7 @@
       <field name="name">Bâtiments</field>
       <field name="code">2131</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1616,8 +1342,7 @@
       <field name="name">Ensembles immobiliers industriels (A, B, ...)</field>
       <field name="code">21311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1625,8 +1350,7 @@
       <field name="name">Ensembles immobiliers administratifs et commerciaux (A, B, ...)</field>
       <field name="code">21315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1634,8 +1358,7 @@
       <field name="name">Autres ensembles immobiliers</field>
       <field name="code">21318</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1643,8 +1366,7 @@
       <field name="name">Affectés aux opérations professionnelles (A, B, ...)</field>
       <field name="code">213181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21318"/>
     </record>
 
@@ -1652,8 +1374,7 @@
       <field name="name">Affectés aux opérations non professionnelles (A, B, ...)</field>
       <field name="code">213188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21318"/>
     </record>
 
@@ -1661,8 +1382,7 @@
       <field name="name">Installations générales agencements aménagements des constructions (même ventilation que celle du compte 2131)</field>
       <field name="code">2135</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1670,8 +1390,7 @@
       <field name="name">Ouvrages d'infrastructure</field>
       <field name="code">2138</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1679,8 +1398,7 @@
       <field name="name">Voies de terre</field>
       <field name="code">21381</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1688,8 +1406,7 @@
       <field name="name">Voies de fer</field>
       <field name="code">21382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1697,8 +1414,7 @@
       <field name="name">Voies d'eau</field>
       <field name="code">21383</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1706,8 +1422,7 @@
       <field name="name">Barrages</field>
       <field name="code">21384</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1715,8 +1430,7 @@
       <field name="name">Pistes d'aérodromes</field>
       <field name="code">21385</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1724,8 +1438,7 @@
       <field name="name">Constructions sur sol d'autrui (même ventilation que celle du compte 213)</field>
       <field name="code">214</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1733,8 +1446,7 @@
       <field name="name">Installations techniques matériels et outillages industriels</field>
       <field name="code">215</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1742,8 +1454,7 @@
       <field name="name">Installations complexes spécialisées</field>
       <field name="code">2151</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1751,8 +1462,7 @@
       <field name="name">Sur sol propre</field>
       <field name="code">21511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2151"/>
     </record>
 
@@ -1760,8 +1470,7 @@
       <field name="name">Sur sol d'autrui</field>
       <field name="code">21514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2151"/>
     </record>
 
@@ -1769,8 +1478,7 @@
       <field name="name">Installations à caractère spécifique</field>
       <field name="code">2153</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1778,8 +1486,7 @@
       <field name="name">Sur sol propre</field>
       <field name="code">21531</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2153"/>
     </record>
 
@@ -1787,8 +1494,7 @@
       <field name="name">Sur sol d'autrui</field>
       <field name="code">21534</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2153"/>
     </record>
 
@@ -1796,8 +1502,7 @@
       <field name="name">Matériel industriel</field>
       <field name="code">2154</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1805,8 +1510,7 @@
       <field name="name">Outillage industriel</field>
       <field name="code">2155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1814,8 +1518,7 @@
       <field name="name">Agencements et aménagements du matériel et outillage industriels</field>
       <field name="code">2157</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1823,8 +1526,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">218</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1832,8 +1534,7 @@
       <field name="name">Installations générales agencements aménagements divers</field>
       <field name="code">2181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1841,8 +1542,7 @@
       <field name="name">Matériel de transport</field>
       <field name="code">2182</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1850,8 +1550,7 @@
       <field name="name">Matériel de bureau et matériel informatique </field>
       <field name="code">2183</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1859,8 +1558,7 @@
       <field name="name">Mobilier</field>
       <field name="code">2184</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1868,8 +1566,7 @@
       <field name="name">Cheptel</field>
       <field name="code">2185</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1877,8 +1574,7 @@
       <field name="name">Emballages récupérables</field>
       <field name="code">2186</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1886,8 +1582,7 @@
       <field name="name">Immobilisations mises en concession</field>
       <field name="code">22</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1895,8 +1590,7 @@
       <field name="name">Immobilisations en cours</field>
       <field name="code">23</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1904,8 +1598,7 @@
       <field name="name">Immobilisations corporelles en cours</field>
       <field name="code">231</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1913,9 +1606,8 @@
       <field name="name">Terrains</field>
       <field name="code">2312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les terrains</field>
-
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1923,8 +1615,7 @@
       <field name="name">Constructions</field>
       <field name="code">2313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1932,8 +1623,7 @@
       <field name="name">Installations techniques matériel et outillage industriels</field>
       <field name="code">2315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1941,8 +1631,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">2318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1950,8 +1639,7 @@
       <field name="name">Immobilisations incorporelles en cours </field>
       <field name="code">232</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1959,8 +1647,7 @@
       <field name="name">Avances et acomptes versés sur commandes d'immobilisations incorporelles</field>
       <field name="code">237</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1968,8 +1655,7 @@
       <field name="name">Avances et acomptes versés sur commandes d'immobilisations corporelles</field>
       <field name="code">238</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1977,8 +1663,7 @@
       <field name="name">Terrains</field>
       <field name="code">2382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -1986,8 +1671,7 @@
       <field name="name">Constructions</field>
       <field name="code">2383</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -1995,8 +1679,7 @@
       <field name="name">Installations techniques matériel et outillage industriels</field>
       <field name="code">2385</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -2004,8 +1687,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">2388</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -2013,8 +1695,7 @@
       <field name="name">Parts dans des entreprises liées et créances dans des entreprises liées</field>
       <field name="code">25</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2022,8 +1703,7 @@
       <field name="name">Participations et créances rattachées à des participations</field>
       <field name="code">26</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2031,9 +1711,8 @@
       <field name="name">Titres de participation</field>
       <field name="code">261</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pas d'amortissement sur les titres de participation</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2041,8 +1720,7 @@
       <field name="name">Actions</field>
       <field name="code">2611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_261"/>
     </record>
 
@@ -2050,8 +1728,7 @@
       <field name="name">Autres titres</field>
       <field name="code">2618</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_261"/>
     </record>
 
@@ -2059,9 +1736,8 @@
       <field name="name">Titres évalués par équivalence</field>
       <field name="code">262</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les titres évalués par équivalence</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2069,9 +1745,8 @@
       <field name="name">Autres formes de participation</field>
       <field name="code">266</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les titres évalués par équivalence</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2079,8 +1754,7 @@
       <field name="name">Créances rattachées à des participations</field>
       <field name="code">267</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2088,8 +1762,7 @@
       <field name="name">Créances rattachées à des participations (groupe)</field>
       <field name="code">2671</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2097,8 +1770,7 @@
       <field name="name">Créances rattachées à des participations (hors groupe)</field>
       <field name="code">2674</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2106,8 +1778,7 @@
       <field name="name">Versements représentatifs d'apports non capitalisés (appel de fonds)</field>
       <field name="code">2675</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2115,8 +1786,7 @@
       <field name="name">Avances consolidables</field>
       <field name="code">2676</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2124,8 +1794,7 @@
       <field name="name">Autres créances rattachées à des participations </field>
       <field name="code">2677</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2133,8 +1802,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2678</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2142,8 +1810,7 @@
       <field name="name">Créances rattachées à des sociétés en participation</field>
       <field name="code">268</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2151,8 +1818,7 @@
       <field name="name">Principal</field>
       <field name="code">2681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_268"/>
     </record>
 
@@ -2160,8 +1826,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_268"/>
     </record>
 
@@ -2169,8 +1834,7 @@
       <field name="name">Versements restant à effectuer sur titres de participation non libérés</field>
       <field name="code">269</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2178,9 +1842,8 @@
       <field name="name">Autres immobilisations financières</field>
       <field name="code">27</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pas d'amortissement sur les immobilisations financières</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2188,8 +1851,7 @@
       <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille (droit de propriété)</field>
       <field name="code">271</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2197,8 +1859,7 @@
       <field name="name">Actions</field>
       <field name="code">2711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_271"/>
     </record>
 
@@ -2206,8 +1867,7 @@
       <field name="name">Autres titres</field>
       <field name="code">2718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_271"/>
     </record>
 
@@ -2215,8 +1875,7 @@
       <field name="name">Titres immobilisés (droit de créance)</field>
       <field name="code">272</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2224,8 +1883,7 @@
       <field name="name">Obligations</field>
       <field name="code">2721</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_272"/>
     </record>
 
@@ -2233,8 +1891,7 @@
       <field name="name">Bons</field>
       <field name="code">2722</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_272"/>
     </record>
 
@@ -2242,8 +1899,7 @@
       <field name="name">Titres immobilisés de l'activité de portefeuille (TIAP)</field>
       <field name="code">273</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2251,8 +1907,7 @@
       <field name="name">Prêts</field>
       <field name="code">274</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2260,8 +1915,7 @@
       <field name="name">Prêts participatifs</field>
       <field name="code">2741</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2269,8 +1923,7 @@
       <field name="name">Prêts aux associés</field>
       <field name="code">2742</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2278,8 +1931,7 @@
       <field name="name">Prêts au personnel</field>
       <field name="code">2743</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2287,8 +1939,7 @@
       <field name="name">Autres prêts</field>
       <field name="code">2748</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2296,9 +1947,7 @@
       <field name="name">Dépôts et cautionnements versés</field>
       <field name="code">275</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-      <field name="note">ex : badge autoroute..</field>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2306,8 +1955,7 @@
       <field name="name">Dépôts</field>
       <field name="code">2751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_275"/>
     </record>
 
@@ -2315,8 +1963,7 @@
       <field name="name">Cautionnements</field>
       <field name="code">2755</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_275"/>
     </record>
 
@@ -2324,8 +1971,7 @@
       <field name="name">Autres créances immobilisées</field>
       <field name="code">276</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2333,8 +1979,7 @@
       <field name="name">Créances diverses</field>
       <field name="code">2761</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_276"/>
     </record>
 
@@ -2342,8 +1987,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2768</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_276"/>
     </record>
 
@@ -2351,8 +1995,7 @@
       <field name="name">Sur titres immobilisés (droits de créance)</field>
       <field name="code">27682</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2360,8 +2003,7 @@
       <field name="name">Sur prêts</field>
       <field name="code">27684</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2369,8 +2011,7 @@
       <field name="name">Sur dépôts et cautionnements</field>
       <field name="code">27685</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2378,8 +2019,7 @@
       <field name="name">Sur créances diverses</field>
       <field name="code">27688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2387,8 +2027,7 @@
       <field name="name">Actions propres ou parts propres</field>
       <field name="code">277</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2396,8 +2035,7 @@
       <field name="name">Actions propres ou parts propres</field>
       <field name="code">2771</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_277"/>
     </record>
 
@@ -2405,8 +2043,7 @@
       <field name="name">Actions propres ou parts propres en voie d'annulation</field>
       <field name="code">2772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_277"/>
     </record>
 
@@ -2414,8 +2051,7 @@
       <field name="name">Versements restant à effectuer sur titres immobilisés non libérés</field>
       <field name="code">279</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2423,9 +2059,8 @@
       <field name="name">Amortissement des immobilisations</field>
       <field name="code">28</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">http://fr.wikipedia.org/wiki/Amortissement_comptable</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2433,8 +2068,7 @@
       <field name="name">Amortissements des immobilisations incorporelles</field>
       <field name="code">280</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2442,8 +2076,7 @@
       <field name="name">Frais d'établissement (même ventilation que celle du compte 201) </field>
       <field name="code">2801</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2451,8 +2084,7 @@
       <field name="name">Frais de recherche et de développement </field>
       <field name="code">2803</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2460,8 +2092,7 @@
       <field name="name">Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires</field>
       <field name="code">2805</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2469,8 +2100,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">2807</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2478,8 +2108,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">2808</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2487,8 +2116,7 @@
       <field name="name">Amortissements des immobilisations corporelles</field>
       <field name="code">281</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2496,8 +2124,7 @@
       <field name="name">Terrains de gisement</field>
       <field name="code">2811</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2505,8 +2132,7 @@
       <field name="name">Agencements aménagements de terrains (même ventilation que celle du compte 212)</field>
       <field name="code">2812</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2514,8 +2140,7 @@
       <field name="name">Constructions (même ventilation que celle du compte 213)</field>
       <field name="code">2813</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2523,8 +2148,7 @@
       <field name="name">Constructions sur sol d'autrui (même ventilation que celle du compte 214)</field>
       <field name="code">2814</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2532,8 +2156,7 @@
       <field name="name">Installations matériel et outillage industriels (même ventilation que celle du compte 215)</field>
       <field name="code">2815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2541,8 +2164,7 @@
       <field name="name">Autres immobilisations corporelles (même ventilation que celle du compte 218)</field>
       <field name="code">2818</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2550,8 +2172,7 @@
       <field name="name">Amortissements des immobilisations mises en concession</field>
       <field name="code">282</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2559,8 +2180,7 @@
       <field name="name">Dépréciation des immobilisations</field>
       <field name="code">29</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2568,8 +2188,7 @@
       <field name="name">Dépréciations des immobilisations incorporelles</field>
       <field name="code">290</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2577,8 +2196,7 @@
       <field name="name">Marques, procédés, droits et valeurs similaires</field>
       <field name="code">2905</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2586,8 +2204,7 @@
       <field name="name">Droit au bail</field>
       <field name="code">2906</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2595,8 +2212,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">2907</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2604,8 +2220,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">2908</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2613,8 +2228,7 @@
       <field name="name">Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)</field>
       <field name="code">291</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2622,8 +2236,7 @@
       <field name="name">Terrains (autres que terrains de gisement)</field>
       <field name="code">2911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_291"/>
     </record>
 
@@ -2631,8 +2244,7 @@
       <field name="name">Dépréciations des immobilisations mises en concession</field>
       <field name="code">292</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2640,8 +2252,7 @@
       <field name="name">Dépréciations des immobilisations en cours</field>
       <field name="code">293</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2649,8 +2260,7 @@
       <field name="name">Immobilisations corporelles en cours</field>
       <field name="code">2931</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_293"/>
     </record>
 
@@ -2658,8 +2268,7 @@
       <field name="name">Immobilisations incorporelles en cours</field>
       <field name="code">2932</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_293"/>
     </record>
 
@@ -2667,8 +2276,7 @@
       <field name="name">Provisions pour dépréciation des participations et créances rattachées à des participations</field>
       <field name="code">296</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2676,8 +2284,7 @@
       <field name="name">Titres de participation</field>
       <field name="code">2961</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2685,8 +2292,7 @@
       <field name="name">Autres formes de participation</field>
       <field name="code">2966</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2694,8 +2300,7 @@
       <field name="name">Créances rattachées à des participations (même ventilation que celle du compte 267)</field>
       <field name="code">2967</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2703,8 +2308,7 @@
       <field name="name">Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)</field>
       <field name="code">2968</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2712,8 +2316,7 @@
       <field name="name">Dépréciations des autres immobilisations financières</field>
       <field name="code">297</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2721,8 +2324,7 @@
       <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille - droit de propriété (ventilation : 271)</field>
       <field name="code">2971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2730,8 +2332,7 @@
       <field name="name">Titres immobilisés - droit de créance (même ventilation que celle du compte 272) </field>
       <field name="code">2972</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2739,16 +2340,14 @@
       <field name="name">Titres immobilisés de l'activité de portefeuille</field>
       <field name="code">2973</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
     <record id="pcg_2974" model="account.account.template">
       <field name="name">Prêts (même ventilation que celle du compte 274)</field>
       <field name="code">2974</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2756,8 +2355,7 @@
       <field name="name">Dépôts et cautionnements versés (même ventilation que celle du compte 275)</field>
       <field name="code">2975</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2765,8 +2363,7 @@
       <field name="name">Autres créances immobilisées (même ventilation que celle du compte 276)</field>
       <field name="code">2976</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2774,8 +2371,7 @@
       <field name="name">Comptes de stocks et d'en-cours</field>
       <field name="code">Classe 3</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -2783,8 +2379,7 @@
       <field name="name">Matières premières (et fourniture)</field>
       <field name="code">31</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2792,7 +2387,7 @@
       <field name="name">Matière (ou groupe) A</field>
       <field name="code">311</field>
       <field name="type">other</field>
-          <field name="user_type" ref="account_type_stocks" />
+          <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2800,8 +2395,7 @@
       <field name="name">Matière (ou groupe) B</field>
       <field name="code">312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2809,8 +2403,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">317</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2818,8 +2411,7 @@
       <field name="name">Autres approvisionnements</field>
       <field name="code">32</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2827,8 +2419,7 @@
       <field name="name">Matières consommables</field>
       <field name="code">321</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2836,8 +2427,7 @@
       <field name="name">Matière (ou groupe) C</field>
       <field name="code">3211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_321"/>
     </record>
 
@@ -2845,8 +2435,7 @@
       <field name="name">Matière (ou groupe) D</field>
       <field name="code">3212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_321"/>
     </record>
 
@@ -2854,8 +2443,7 @@
       <field name="name">Fournitures consommables</field>
       <field name="code">322</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2863,8 +2451,7 @@
       <field name="name">Combustibles</field>
       <field name="code">3221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2872,8 +2459,7 @@
       <field name="name">Produits d'entretien</field>
       <field name="code">3222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2881,8 +2467,7 @@
       <field name="name">Fournitures d'atelier et d usine</field>
       <field name="code">3223</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2890,8 +2475,7 @@
       <field name="name">Fournitures de magasin</field>
       <field name="code">3224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2899,8 +2483,7 @@
       <field name="name">Fournitures de bureau</field>
       <field name="code">3225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2908,8 +2491,7 @@
       <field name="name">Emballages</field>
       <field name="code">326</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2917,8 +2499,7 @@
       <field name="name">Emballages perdus</field>
       <field name="code">3261</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2926,8 +2507,7 @@
       <field name="name">Emballages récupérables non identifiables</field>
       <field name="code">3265</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2935,8 +2515,7 @@
       <field name="name">Emballages à usage mixte</field>
       <field name="code">3267</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2944,8 +2523,7 @@
       <field name="name">En-cours de production de biens</field>
       <field name="code">33</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2953,8 +2531,7 @@
       <field name="name">Produits en cours</field>
       <field name="code">331</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_33"/>
     </record>
 
@@ -2962,8 +2539,7 @@
       <field name="name">Produit en cours P 1</field>
       <field name="code">3311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_331"/>
     </record>
 
@@ -2971,8 +2547,7 @@
       <field name="name">Produit en cours P 2</field>
       <field name="code">3312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_331"/>
     </record>
 
@@ -2980,8 +2555,7 @@
       <field name="name">Travaux en cours</field>
       <field name="code">335</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_33"/>
     </record>
 
@@ -2989,8 +2563,7 @@
       <field name="name">Travaux en cours T 1</field>
       <field name="code">3351</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_335"/>
     </record>
 
@@ -2998,8 +2571,7 @@
       <field name="name">Travaux en cours T 2</field>
       <field name="code">3352</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_335"/>
     </record>
 
@@ -3007,8 +2579,7 @@
       <field name="name">En-cours de production de services</field>
       <field name="code">34</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3016,8 +2587,7 @@
       <field name="name">Études en cours</field>
       <field name="code">341</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_34"/>
     </record>
 
@@ -3025,8 +2595,7 @@
       <field name="name">Études en cours E 1</field>
       <field name="code">3411</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_341"/>
     </record>
 
@@ -3034,8 +2603,7 @@
       <field name="name">Études en cours E 2</field>
       <field name="code">3412</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_341"/>
     </record>
 
@@ -3043,8 +2611,7 @@
       <field name="name">Prestations de services en cours</field>
       <field name="code">345</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_34"/>
     </record>
 
@@ -3052,8 +2619,7 @@
       <field name="name">Prestations de services S 1</field>
       <field name="code">3451</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_345"/>
     </record>
 
@@ -3061,8 +2627,7 @@
       <field name="name">Prestations de services S 2</field>
       <field name="code">3452</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_345"/>
     </record>
 
@@ -3070,8 +2635,7 @@
       <field name="name">Stocks de produits</field>
       <field name="code">35</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3079,8 +2643,7 @@
       <field name="name">Produits intermédiaires</field>
       <field name="code">351</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3088,8 +2651,7 @@
       <field name="name">Produits intermédiaires (ou groupe) A </field>
       <field name="code">3511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_351"/>
     </record>
 
@@ -3097,8 +2659,7 @@
       <field name="name">Produits intermédiaires (ou groupe) B</field>
       <field name="code">3512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_351"/>
     </record>
 
@@ -3106,8 +2667,7 @@
       <field name="name">Produits finis</field>
       <field name="code">355</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3115,8 +2675,7 @@
       <field name="name">Produits finis (ou groupe) A</field>
       <field name="code">3551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_355"/>
     </record>
 
@@ -3124,8 +2683,7 @@
       <field name="name">Produits finis (ou groupe) B</field>
       <field name="code">3552</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_355"/>
     </record>
 
@@ -3133,8 +2691,7 @@
       <field name="name">Produits résiduels (ou matières de récupération)</field>
       <field name="code">358</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3142,8 +2699,7 @@
       <field name="name">Déchets</field>
       <field name="code">3581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3151,8 +2707,7 @@
       <field name="name">Rebuts</field>
       <field name="code">3585</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3160,8 +2715,7 @@
       <field name="name">Matières de récupération</field>
       <field name="code">3586</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3169,8 +2723,7 @@
       <field name="name">Stocks provenant d'immobilisations</field>
       <field name="code">36</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3178,8 +2731,7 @@
       <field name="name">Stocks de marchandises</field>
       <field name="code">37</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3187,8 +2739,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">371</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_37"/>
     </record>
 
@@ -3196,8 +2747,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">372</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_37"/>
     </record>
 
@@ -3205,8 +2755,7 @@
       <field name="name">Stocks en voie d'acheminement</field>
       <field name="code">38</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3214,8 +2763,7 @@
       <field name="name">Provisions pour dépréciation des stocks et en-cours</field>
       <field name="code">39</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3223,8 +2771,7 @@
       <field name="name">Provisions pour dépréciation des matières premières (et fournitures)</field>
       <field name="code">391</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3232,8 +2779,7 @@
       <field name="name">Matières (ou groupe) A</field>
       <field name="code">3911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3241,8 +2787,7 @@
       <field name="name">Matières (ou groupe) B</field>
       <field name="code">3912</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3250,8 +2795,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">3917</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3259,8 +2803,7 @@
       <field name="name">Provisions pour dépréciation des autres approvisionnements</field>
       <field name="code">392</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3268,8 +2811,7 @@
       <field name="name">Matières consommables (même ventilation que celle du compte 321)</field>
       <field name="code">3921</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3277,8 +2819,7 @@
       <field name="name">Fournitures consommables (même ventilation que celle du compte 322)</field>
       <field name="code">3922</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3286,8 +2827,7 @@
       <field name="name">Emballages (même ventilation que celle du compte 326)</field>
       <field name="code">3926</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3295,8 +2835,7 @@
       <field name="name">Provisions pour dépréciation des en-cours de production de biens</field>
       <field name="code">393</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3304,8 +2843,7 @@
       <field name="name">Produits en cours (même ventilation que celle du compte 331)</field>
       <field name="code">3931</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_393"/>
     </record>
 
@@ -3313,8 +2851,7 @@
       <field name="name">Travaux en cours (même ventilation que celle du compte 335)</field>
       <field name="code">3935</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_393"/>
     </record>
 
@@ -3322,8 +2859,7 @@
       <field name="name">Provisions pour dépréciation des en-cours de production de services</field>
       <field name="code">394</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3331,8 +2867,7 @@
       <field name="name">Études en cours (même ventilation que celle du compte 341)</field>
       <field name="code">3941</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_394"/>
     </record>
 
@@ -3340,8 +2875,7 @@
       <field name="name">Prestations de services en cours (même ventilation que celle du compte 345)</field>
       <field name="code">3945</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_394"/>
     </record>
 
@@ -3349,8 +2883,7 @@
       <field name="name">Provisions pour dépréciation des stocks de produits</field>
       <field name="code">395</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3358,8 +2891,7 @@
       <field name="name">Produits intermédiaires (même ventilation que celle du compte 351)</field>
       <field name="code">3951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_395"/>
     </record>
 
@@ -3367,8 +2899,7 @@
       <field name="name">Produits finis (même ventilation que celle du compte 355)</field>
       <field name="code">3955</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_395"/>
     </record>
 
@@ -3376,8 +2907,7 @@
       <field name="name">Provisions pour dépréciation des stocks de marchandises</field>
       <field name="code">397</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3385,8 +2915,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">3971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_397"/>
     </record>
 
@@ -3394,8 +2923,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">3972</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_397"/>
     </record>
 
@@ -3403,7 +2931,7 @@
       <field name="name">Comptes de tiers</field>
       <field name="code">Classe 4</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -3411,7 +2939,7 @@
       <field name="name">Fournisseurs et comptes rattachés</field>
       <field name="code">40</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3420,7 +2948,7 @@
       <field name="name">Fournisseurs et comptes rattachés </field>
       <field name="code">400</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3429,7 +2957,7 @@
       <field name="name">Fournisseurs</field>
       <field name="code">401</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3439,7 +2967,7 @@
       <field name="name">Fournisseurs - Achats de biens et prestations de services</field>
       <field name="code">4011</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_401"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3449,7 +2977,7 @@
       <field name="name">Fournisseurs - Retenues de garantie</field>
       <field name="code">4017</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_401"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3458,7 +2986,7 @@
       <field name="name">Fournisseurs - Effets à payer</field>
       <field name="code">403</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3467,7 +2995,7 @@
       <field name="name">Fournisseurs d'immobilisations</field>
       <field name="code">404</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3476,7 +3004,7 @@
       <field name="name">Fournisseurs - Achats d'immobilisations</field>
       <field name="code">4041</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_404"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3485,7 +3013,7 @@
       <field name="name">Fournisseurs d'immobilisations - Retenues de garantie</field>
       <field name="code">4047</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_404"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3494,7 +3022,7 @@
       <field name="name">Fournisseurs d'immobilisations - Effets à payer</field>
       <field name="code">405</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3503,8 +3031,7 @@
       <field name="name">Fournisseurs - Factures non parvenues</field>
       <field name="code">408</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3513,8 +3040,7 @@
       <field name="name">Fournisseurs</field>
       <field name="code">4081</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3523,7 +3049,7 @@
       <field name="name">Fournisseurs d'immobilisations </field>
       <field name="code">4084</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3532,8 +3058,7 @@
       <field name="name">Fournisseurs - Intérêts courus</field>
       <field name="code">4088</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3542,8 +3067,7 @@
       <field name="name">Fournisseurs débiteurs</field>
       <field name="code">409</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3552,8 +3076,7 @@
       <field name="name">Fournisseurs - Avances et acomptes versés sur commandes</field>
       <field name="code">4091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3562,8 +3085,7 @@
       <field name="name">Fournisseurs - Créances pour emballages et matériel à rendre</field>
       <field name="code">4096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3572,8 +3094,7 @@
       <field name="name">Fournisseurs - Autres avoirs</field>
       <field name="code">4097</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3582,8 +3103,7 @@
       <field name="name">Fournisseurs d'exploitation</field>
       <field name="code">40971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_4097"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3592,8 +3112,7 @@
       <field name="name">Fournisseurs d'immobilisations</field>
       <field name="code">40974</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_4097"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3602,8 +3121,7 @@
       <field name="name">Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus</field>
       <field name="code">4098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3612,8 +3130,7 @@
       <field name="name">Clients et comptes rattachés</field>
       <field name="code">41</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3622,8 +3139,7 @@
       <field name="name">Clients et comptes rattachés </field>
       <field name="code">410</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3632,8 +3148,7 @@
       <field name="name">Clients</field>
       <field name="code">411</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3643,8 +3158,7 @@
       <field name="name">Clients - Ventes de biens ou de prestations de services</field>
       <field name="code">4111</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_411"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3654,8 +3168,7 @@
       <field name="name">Clients - Retenues de garantie</field>
       <field name="code">4117</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_411"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3664,8 +3177,7 @@
       <field name="name">Clients - Effets à recevoir</field>
       <field name="code">413</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3674,8 +3186,7 @@
       <field name="name">Clients douteux ou litigieux</field>
       <field name="code">416</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3684,8 +3195,7 @@
       <field name="name">Clients - Produits non encore facturés</field>
       <field name="code">418</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3694,8 +3204,7 @@
       <field name="name">Clients - Factures à établir </field>
       <field name="code">4181</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_418"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3704,8 +3213,7 @@
       <field name="name">Clients - Intérêts courus</field>
       <field name="code">4188</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_418"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3714,8 +3222,7 @@
       <field name="name">Clients créditeurs</field>
       <field name="code">419</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3724,8 +3231,7 @@
       <field name="name">Clients - Avances et acomptes reçus sur commandes</field>
       <field name="code">4191</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3734,8 +3240,7 @@
       <field name="name">Clients - Dettes pour emballages et matériels consignés </field>
       <field name="code">4196</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3744,8 +3249,7 @@
       <field name="name">Clients - Autres avoirs </field>
       <field name="code">4197</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3754,8 +3258,7 @@
       <field name="name">Rabais, remises, ristournes à accorder et autres avoirs à établir</field>
       <field name="code">4198</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3764,17 +3267,15 @@
       <field name="name">Personnel et comptes rattachés</field>
       <field name="code">42</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
     <record id="pcg_421" model="account.account.template">
       <field name="name">Personnel - Rémunérations dues</field>
       <field name="code">421</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3783,8 +3284,7 @@
       <field name="name">Comités d'entreprise d'établissement </field>
       <field name="code">422</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3793,8 +3293,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">424</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3803,8 +3302,7 @@
       <field name="name">Réserve spéciale</field>
       <field name="code">4246</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_424"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3813,8 +3311,7 @@
       <field name="name">Comptes courants</field>
       <field name="code">4248</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_424"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3823,8 +3320,7 @@
       <field name="name">Personnel - Avances et acomptes</field>
       <field name="code">425</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3833,8 +3329,7 @@
       <field name="name">Personnel - Dépôts</field>
       <field name="code">426</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3843,8 +3338,7 @@
       <field name="name">Personnel - Oppositions</field>
       <field name="code">427</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3853,8 +3347,7 @@
       <field name="name">Personnel - Charges à payer et produits à recevoir</field>
       <field name="code">428</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3863,8 +3356,7 @@
       <field name="name">Dettes provisionnées pour congés à payer</field>
       <field name="code">4282</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3873,8 +3365,7 @@
       <field name="name">Dettes provisionnées pour participation des salariés aux résultats</field>
       <field name="code">4284</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3883,8 +3374,7 @@
       <field name="name">Autres charges à payer</field>
       <field name="code">4286</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3893,8 +3383,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4287</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3903,8 +3392,7 @@
       <field name="name">Sécurité Sociale et autres organismes sociaux</field>
       <field name="code">43</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -3912,8 +3400,7 @@
       <field name="name">Sécurité Sociale</field>
       <field name="code">431</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3921,9 +3408,8 @@
     <record id="pcg_437" model="account.account.template">
       <field name="name">Autres organismes sociaux</field>
       <field name="code">437</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3932,8 +3418,7 @@
       <field name="name">Organismes sociaux - Charges à payer et produits à recevoir</field>
       <field name="code">438</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3942,8 +3427,7 @@
       <field name="name">Charges sociales sur congés à payer </field>
       <field name="code">4382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3952,8 +3436,7 @@
       <field name="name">Autres charges à payer</field>
       <field name="code">4386</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3962,8 +3445,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4387</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3972,8 +3454,7 @@
       <field name="name">Etat et autres collectivités publiques</field>
       <field name="code">44</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -3981,8 +3462,7 @@
       <field name="name">État - Subventions à recevoir</field>
       <field name="code">441</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3991,8 +3471,7 @@
       <field name="name">Subventions d'investissement</field>
       <field name="code">4411</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4001,8 +3480,7 @@
       <field name="name">Subventions d'exploitation</field>
       <field name="code">4417</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4011,8 +3489,7 @@
       <field name="name">Subventions d'équilibre</field>
       <field name="code">4418</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4021,8 +3498,7 @@
       <field name="name">Avances sur subventions</field>
       <field name="code">4419</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4031,8 +3507,7 @@
       <field name="name">État -Impôts et taxes recouvrables sur des tiers </field>
       <field name="code">442</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4041,8 +3516,7 @@
       <field name="name">Obligataires</field>
       <field name="code">4424</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_442"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4051,8 +3525,7 @@
       <field name="name">Associés</field>
       <field name="code">4425</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_442"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4061,8 +3534,7 @@
       <field name="name">Opérations particulières avec l'État, les collectivités publiques, les organismes internationaux</field>
       <field name="code">443</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4071,8 +3543,7 @@
       <field name="name">Créances sur l'État résultant de la suppression de la règle du décalage d'un mois en matière de TVA</field>
       <field name="code">4431</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_443"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4081,8 +3552,7 @@
       <field name="name">Intérêts courus sur créances figurant au compte 4431</field>
       <field name="code">4438</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_443"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4091,8 +3561,7 @@
       <field name="name">État - Impôts sur les bénéfices</field>
       <field name="code">444</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4101,8 +3570,7 @@
       <field name="name">État - Taxes sur le chiffre d'affaires</field>
       <field name="code">445</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4111,8 +3579,7 @@
       <field name="name">TVA due intracommunautaire</field>
       <field name="code">4452</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4121,8 +3588,7 @@
       <field name="name">TVA due intracommunautaire 19,6%</field>
       <field name="code">445201</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4131,8 +3597,7 @@
       <field name="name">TVA due intracommunautaire 5,5%</field>
       <field name="code">445202</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4141,8 +3606,7 @@
       <field name="name">TVA due intracommunautaire (autre taux)</field>
       <field name="code">445203</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4151,8 +3615,7 @@
       <field name="name">Taxes sur le chiffre d'affaires à décaisser</field>
       <field name="code">4455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4161,8 +3624,7 @@
       <field name="name">TVA à décaisser</field>
       <field name="code">44551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4171,8 +3633,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44558</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4181,8 +3642,7 @@
       <field name="name">Taxes sur le chiffre d'affaires déductibles</field>
       <field name="code">4456</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4191,8 +3651,7 @@
       <field name="name">TVA sur immobilisations</field>
       <field name="code">44562</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4201,8 +3660,7 @@
       <field name="name">TVA transférée par d'autres entreprises</field>
       <field name="code">44563</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4211,8 +3669,7 @@
       <field name="name">TVA sur autres biens et services</field>
       <field name="code">44566</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4221,8 +3678,7 @@
       <field name="name">TVA déductible intracommunautaire</field>
       <field name="code">445662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4231,9 +3687,8 @@
       <field name="name">Crédit de TVA à reporter</field>
       <field name="code">44567</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Si le remboursement n'a pas été demandé</field>
-
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4242,8 +3697,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44568</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4252,8 +3706,7 @@
       <field name="name">Taxes sur le chiffre d'affaires collectées par l'entreprise</field>
       <field name="code">4457</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4262,8 +3715,7 @@
       <field name="name">TVA collectée</field>
       <field name="code">44571</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_4457"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4272,8 +3724,7 @@
       <field name="name">TVA collectée 19,6%</field>
       <field name="code">445711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4282,8 +3733,7 @@
       <field name="name">TVA collectée 5,5%</field>
       <field name="code">445712</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4292,8 +3742,7 @@
       <field name="name">TVA collectée (autre taux)</field>
       <field name="code">445713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4302,8 +3751,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44578</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4457"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4312,8 +3760,7 @@
       <field name="name">Taxes sur le chiffre d'affaires à régulariser ou en attente</field>
       <field name="code">4458</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4322,8 +3769,7 @@
       <field name="name">Acomptes - Régime simplifié d'imposition</field>
       <field name="code">44581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4332,8 +3778,7 @@
       <field name="name">Acomptes - Régime du forfait</field>
       <field name="code">44582</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4342,8 +3787,7 @@
       <field name="name">Remboursement de taxes sur le chiffre d'affaires demandé</field>
       <field name="code">44583</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4352,8 +3796,7 @@
       <field name="name">TVA récupérée d'avance</field>
       <field name="code">44584</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4362,8 +3805,7 @@
       <field name="name">Taxes sur le chiffre d'affaires sur factures non parvenues</field>
       <field name="code">44586</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4372,8 +3814,7 @@
       <field name="name">Taxes sur le chiffre d'affaires sur factures à établir</field>
       <field name="code">44587</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4382,8 +3823,7 @@
       <field name="name">Obligations cautionnées</field>
       <field name="code">446</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4392,8 +3832,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés</field>
       <field name="code">447</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4402,8 +3841,7 @@
       <field name="name">État - Charges à payer et produits à recevoir</field>
       <field name="code">448</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4412,8 +3850,7 @@
       <field name="name">Charges fiscales sur congés à payer </field>
       <field name="code">4482</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4422,8 +3859,7 @@
       <field name="name">Charges à payer</field>
       <field name="code">4486</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4432,8 +3868,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4487</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4442,8 +3877,7 @@
       <field name="name">Quotas d'émission à restituer à l'État</field>
       <field name="code">449</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4452,8 +3886,7 @@
       <field name="name">Groupe et associés</field>
       <field name="code">45</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4461,8 +3894,7 @@
       <field name="name">Groupe</field>
       <field name="code">451</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4471,9 +3903,8 @@
       <field name="name">Associés - Comptes courants</field>
       <field name="code">455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pour frais avancés personnellement</field>
-
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4482,8 +3913,7 @@
       <field name="name">Principal</field>
       <field name="code">4551</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4492,8 +3922,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">4558</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4502,8 +3931,7 @@
       <field name="name">Associés - Opérations sur le capital</field>
       <field name="code">456</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4512,8 +3940,7 @@
       <field name="name">Associés - Comptes d'apport en société</field>
       <field name="code">4561</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4522,8 +3949,7 @@
       <field name="name">Apports en nature</field>
       <field name="code">45611</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4561"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4532,8 +3958,7 @@
       <field name="name">Apports en numéraire</field>
       <field name="code">45615</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4561"/>
       <field name="reconcile" eval="True"/>
    </record>
@@ -4542,8 +3967,7 @@
       <field name="name">Apporteurs - Capital appelé, non versé</field>
       <field name="code">4562</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4552,8 +3976,7 @@
       <field name="name">Actionnaires - Capital souscrit et appelé, non versé</field>
       <field name="code">45621</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4562"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4562,8 +3985,7 @@
       <field name="name">Associés - Capital appelé, non versé</field>
       <field name="code">45625</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4562"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4572,8 +3994,7 @@
       <field name="name">Associés - Versements reçus sur augmentation de capital</field>
       <field name="code">4563</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4582,8 +4003,7 @@
       <field name="name">Associés - Versements anticipés</field>
       <field name="code">4564</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4592,8 +4012,7 @@
       <field name="name">Actionnaires défaillants</field>
       <field name="code">4566</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4602,8 +4021,7 @@
       <field name="name">Associés - Capital à rembourser</field>
       <field name="code">4567</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4612,8 +4030,7 @@
       <field name="name">Associés - Dividendes à payer</field>
       <field name="code">457</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4622,8 +4039,7 @@
       <field name="name">Associés - Opérations faites en commun et en GIE</field>
       <field name="code">458</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4632,8 +4048,7 @@
       <field name="name">Opérations courantes</field>
       <field name="code">4581</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4642,8 +4057,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">4588</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4652,8 +4066,7 @@
       <field name="name">Débiteurs divers et créditeurs divers</field>
       <field name="code">46</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4661,8 +4074,7 @@
       <field name="name">Créances sur cessions d'immobilisations</field>
       <field name="code">462</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4671,8 +4083,7 @@
       <field name="name">Dettes sur acquisitions de valeurs mobilières de placement</field>
       <field name="code">464</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4681,8 +4092,7 @@
       <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
       <field name="code">465</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4690,9 +4100,8 @@
     <record id="pcg_467" model="account.account.template">
       <field name="name">Autres comptes débiteurs ou créditeurs</field>
       <field name="code">467</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_46"/>
     </record>
 
@@ -4700,8 +4109,7 @@
       <field name="name">Divers - Charges à payer et produits à recevoir</field>
       <field name="code">468</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4710,8 +4118,7 @@
       <field name="name">Charges à payer</field>
       <field name="code">4686</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_468"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4720,8 +4127,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4687</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_468"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4730,8 +4136,7 @@
       <field name="name">Comptes transitoires ou d'attente</field>
       <field name="code">47</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4739,8 +4144,7 @@
       <field name="name">Comptes d'attente 1</field>
       <field name="code">471</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4749,8 +4153,7 @@
       <field name="name">Comptes d'attente 2</field>
       <field name="code">472</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4759,8 +4162,7 @@
       <field name="name">Comptes d'attente 3</field>
       <field name="code">473</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4769,8 +4171,7 @@
       <field name="name">Comptes d'attente 4</field>
       <field name="code">474</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4779,8 +4180,7 @@
       <field name="name">Comptes d'attente 5</field>
       <field name="code">475</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4789,8 +4189,7 @@
       <field name="name">Différences de conversion - ACTIF</field>
       <field name="code">476</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4799,8 +4198,7 @@
       <field name="name">Diminution des créances</field>
       <field name="code">4761</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4809,8 +4207,7 @@
       <field name="name">Augmentation des dettes</field>
       <field name="code">4762</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4819,8 +4216,7 @@
       <field name="name">Différences compensées par couverture de change</field>
       <field name="code">4768</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4829,8 +4225,7 @@
       <field name="name">Différences de conversion - PASSIF</field>
       <field name="code">477</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4839,8 +4234,7 @@
       <field name="name">Augmentation des créances</field>
       <field name="code">4771</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4849,8 +4243,7 @@
       <field name="name">Diminution des dettes</field>
       <field name="code">4772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4859,8 +4252,7 @@
       <field name="name">Différences compensées par couverture de change</field>
       <field name="code">4778</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4868,9 +4260,8 @@
     <record id="pcg_478" model="account.account.template">
       <field name="name">Autres comptes transitoires</field>
       <field name="code">478</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_47"/>
     </record>
 
@@ -4878,8 +4269,7 @@
       <field name="name">Comptes de régularisation</field>
       <field name="code">48</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4887,8 +4277,7 @@
       <field name="name">Charges à répartir sur plusieurs exercices </field>
       <field name="code">481</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4897,8 +4286,7 @@
       <field name="name">Frais d'émission des emprunts</field>
       <field name="code">4816</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_481"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4907,8 +4295,7 @@
       <field name="name">Charges constatées d'avance</field>
       <field name="code">486</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4917,8 +4304,7 @@
       <field name="name">Produits constatés d'avance</field>
       <field name="code">487</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4927,8 +4313,7 @@
       <field name="name">Comptes de répartition périodique des charges et des produits</field>
       <field name="code">488</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_48"/>
     </record>
 
@@ -4936,8 +4321,7 @@
       <field name="name">Charges</field>
       <field name="code">4886</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_488"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4946,8 +4330,7 @@
       <field name="name">Produits</field>
       <field name="code">4887</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_488"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4956,8 +4339,7 @@
       <field name="name">Quotas d'émission alloués par l'État</field>
       <field name="code">489</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4966,8 +4348,7 @@
       <field name="name">Dépréciations des comptes de tiers</field>
       <field name="code">49</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4975,8 +4356,7 @@
       <field name="name">Dépréciation des comptes de clients</field>
       <field name="code">491</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4985,8 +4365,7 @@
       <field name="name">Dépréciation des comptes du groupe et des associés</field>
       <field name="code">495</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4995,8 +4374,7 @@
       <field name="name">Comptes du groupe</field>
       <field name="code">4951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5005,8 +4383,7 @@
       <field name="name">Comptes courants des associés</field>
       <field name="code">4955</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5015,8 +4392,7 @@
       <field name="name">Opérations faites en commun et en GIE</field>
       <field name="code">4958</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5025,8 +4401,7 @@
       <field name="name">Dépréciations des comptes de débiteurs divers</field>
       <field name="code">496</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5035,8 +4410,7 @@
       <field name="name">Créances sur cessions d'immobilisations</field>
       <field name="code">4962</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5045,8 +4419,7 @@
       <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
       <field name="code">4965</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5055,8 +4428,7 @@
       <field name="name">Autres comptes débiteurs</field>
       <field name="code">4967</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5065,8 +4437,7 @@
       <field name="name">Comptes financiers</field>
       <field name="code">Classe 5</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -5074,8 +4445,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">50</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5083,8 +4453,7 @@
       <field name="name">Parts dans entreprises liées</field>
       <field name="code">501</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5092,8 +4461,7 @@
       <field name="name">Actions propres</field>
       <field name="code">502</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5101,8 +4469,7 @@
       <field name="name">Actions</field>
       <field name="code">503</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5110,8 +4477,7 @@
       <field name="name">Titres cotés</field>
       <field name="code">5031</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_503"/>
     </record>
 
@@ -5119,8 +4485,7 @@
       <field name="name">Titres non cotés</field>
       <field name="code">5035</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_503"/>
     </record>
 
@@ -5128,8 +4493,7 @@
       <field name="name">Autres titres conférant un droit de propriété</field>
       <field name="code">504</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5137,8 +4501,7 @@
       <field name="name">Obligations et bons émis par la société et rachetés par elle</field>
       <field name="code">505</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5146,8 +4509,7 @@
       <field name="name">Obligations</field>
       <field name="code">506</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5155,8 +4517,7 @@
       <field name="name">Titres cotés</field>
       <field name="code">5061</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_506"/>
     </record>
 
@@ -5164,8 +4525,7 @@
       <field name="name">Titres non cotés</field>
       <field name="code">5065</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_506"/>
     </record>
 
@@ -5173,8 +4533,7 @@
       <field name="name">Bons du Trésor et bons de caisse à court terme</field>
       <field name="code">507</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5182,8 +4541,7 @@
       <field name="name">Autres valeurs mobilières de placement et autres créances assimilées</field>
       <field name="code">508</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5191,8 +4549,7 @@
       <field name="name">Autres valeurs mobilières</field>
       <field name="code">5081</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5200,8 +4557,7 @@
       <field name="name">Bons de souscription</field>
       <field name="code">5082</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5209,8 +4565,7 @@
       <field name="name">Intérêts courus sur obligations, bons et valeurs assimilées</field>
       <field name="code">5088</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5218,8 +4573,7 @@
       <field name="name">Versements restant à effectuer sur valeurs mobilières de placement non libérées</field>
       <field name="code">509</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5227,8 +4581,7 @@
       <field name="name">Banques établissements financiers et assimilés</field>
       <field name="code">51</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5236,8 +4589,7 @@
       <field name="name">Valeurs à l'encaissement</field>
       <field name="code">511</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5245,8 +4597,7 @@
       <field name="name">Coupons échus à l'encaissement</field>
       <field name="code">5111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5254,8 +4605,7 @@
       <field name="name">Chèques à encaisser</field>
       <field name="code">5112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5263,8 +4613,7 @@
       <field name="name">Effets à l'encaissement</field>
       <field name="code">5113</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5272,8 +4621,7 @@
       <field name="name">Effets à l'escompte</field>
       <field name="code">5114</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5281,9 +4629,8 @@
       <field name="name">Banques</field>
       <field name="code">512</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Créer 1 compte par compte bancaire</field>
-
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5292,8 +4639,7 @@
       <field name="name">Comptes en monnaie nationale</field>
       <field name="code">5121</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="fr_pcg_cash"/>
     </record>
 
@@ -5302,8 +4648,7 @@
       <field name="name">Comptes en devises</field>
       <field name="code">5124</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="fr_pcg_cash"/>
     </record>
 
@@ -5311,7 +4656,7 @@
       <field name="name">Chèques postaux</field>
       <field name="code">514</field>
       <field name="type">other</field>
-          <field name="user_type" ref="account_type_cash"/>
+          <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5319,8 +4664,7 @@
       <field name="name">Caisses du Trésor et des établissements publics</field>
       <field name="code">515</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5328,8 +4672,7 @@
       <field name="name">Sociétés de bourse</field>
       <field name="code">516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5337,8 +4680,7 @@
       <field name="name">Autres organismes financiers</field>
       <field name="code">517</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5346,8 +4688,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">518</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5355,8 +4696,7 @@
       <field name="name">Intérêts courus à payer</field>
       <field name="code">5181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_518"/>
     </record>
 
@@ -5364,8 +4704,7 @@
       <field name="name">Intérêts courus à recevoir</field>
       <field name="code">5188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_518"/>
     </record>
 
@@ -5373,8 +4712,7 @@
       <field name="name">Concours bancaires courants</field>
       <field name="code">519</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5382,8 +4720,7 @@
       <field name="name">Crédit de mobilisation de créances commerciales (CMCC)</field>
       <field name="code">5191</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5391,8 +4728,7 @@
       <field name="name">Mobilisation de créances nées à l'étranger</field>
       <field name="code">5193</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5400,8 +4736,7 @@
       <field name="name">Intérêts courus sur concours bancaires courants</field>
       <field name="code">5198</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5409,8 +4744,7 @@
       <field name="name">Instruments de trésorerie</field>
       <field name="code">52</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5418,8 +4752,7 @@
       <field name="name">Caisse</field>
       <field name="code">53</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5427,8 +4760,7 @@
       <field name="name">Caisse siège social</field>
       <field name="code">531</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5436,8 +4768,7 @@
       <field name="name">Caisse en monnaie nationale</field>
       <field name="code">5311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_531"/>
     </record>
 
@@ -5445,8 +4776,7 @@
       <field name="name">Caisse en devises</field>
       <field name="code">5314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_531"/>
     </record>
 
@@ -5454,8 +4784,7 @@
       <field name="name">Caisse succursale (ou usine) A</field>
       <field name="code">532</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5463,8 +4792,7 @@
       <field name="name">Caisse succursale (ou usine) B</field>
       <field name="code">533</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5472,8 +4800,7 @@
       <field name="name">Régies d'avances et accréditifs</field>
       <field name="code">54</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5481,8 +4808,7 @@
       <field name="name">Virements internes</field>
       <field name="code">58</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5491,8 +4817,7 @@
       <field name="name">Provisions pour dépréciation des comptes financiers</field>
       <field name="code">59</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5500,8 +4825,7 @@
       <field name="name">Provisions pour dépréciation des valeurs mobilières de placement</field>
       <field name="code">590</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_59"/>
     </record>
 
@@ -5509,8 +4833,7 @@
       <field name="name">Actions</field>
       <field name="code">5903</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5518,8 +4841,7 @@
       <field name="name">Autres titres conférant un droit de propriété </field>
       <field name="code">5904</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5527,8 +4849,7 @@
       <field name="name">Obligations</field>
       <field name="code">5906</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5536,8 +4857,7 @@
       <field name="name">Autres valeurs mobilières de placement et créances assimilées (provisions)</field>
       <field name="code">5908</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5545,8 +4865,7 @@
       <field name="name">Comptes de gestion</field>
       <field name="code">Classes 6 et 7</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_0"/>
     </record>
 
@@ -5554,8 +4873,7 @@
       <field name="name">Comptes de charges</field>
       <field name="code">Classe 6</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_6_et_7"/>
     </record>
 
@@ -5563,8 +4881,7 @@
       <field name="name">Achats(sauf 603)</field>
       <field name="code">60</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -5572,9 +4889,8 @@
       <field name="name">Achats stockés - Matières premières (et fournitures)</field>
       <field name="code">601</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Destinés à la production ou revente</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5582,8 +4898,7 @@
       <field name="name">Matières (ou groupe) A</field>
       <field name="code">6011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5591,8 +4906,7 @@
       <field name="name">Matières (ou groupe) B</field>
       <field name="code">6012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5600,8 +4914,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">6017</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5609,9 +4922,8 @@
       <field name="name">Achats stockés - Autres approvisionnements</field>
       <field name="code">602</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Destinés à la production ou revente</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5619,8 +4931,7 @@
       <field name="name">Matières consommables</field>
       <field name="code">6021</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5628,8 +4939,7 @@
       <field name="name">Matières (ou groupe) C</field>
       <field name="code">60211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6021"/>
     </record>
 
@@ -5637,8 +4947,7 @@
       <field name="name">Matières (ou groupe) D</field>
       <field name="code">60212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6021"/>
     </record>
 
@@ -5646,8 +4955,7 @@
       <field name="name">Fournitures consommables</field>
       <field name="code">6022</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5655,8 +4963,7 @@
       <field name="name">Combustibles</field>
       <field name="code">60221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5664,8 +4971,7 @@
       <field name="name">Produits d'entretien</field>
       <field name="code">60222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5673,8 +4979,7 @@
       <field name="name">Fournitures d'atelier et d'usine</field>
       <field name="code">60223</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5682,8 +4987,7 @@
       <field name="name">Fournitures de magasin</field>
       <field name="code">60224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5691,8 +4995,7 @@
       <field name="name">Fournitures de bureau</field>
       <field name="code">60225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5700,8 +5003,7 @@
       <field name="name">Emballages</field>
       <field name="code">6026</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5709,8 +5011,7 @@
       <field name="name">Emballages perdus</field>
       <field name="code">60261</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5718,8 +5019,7 @@
       <field name="name">Emballages récupérables non identifiables</field>
       <field name="code">60265</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5727,8 +5027,7 @@
       <field name="name">Emballages à usage mixte</field>
       <field name="code">60267</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5737,9 +5036,8 @@
       <field name="name">Variation des stocks (approvisionnements et marchandises)</field>
       <field name="code">603</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Utilisé lors des inventaires</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5748,8 +5046,7 @@
       <field name="name">Variation des stocks de matières premières (et fournitures)</field>
       <field name="code">6031</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5757,8 +5054,7 @@
       <field name="name">Variation des stocks des autres approvisionnements</field>
       <field name="code">6032</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5766,8 +5062,7 @@
       <field name="name">Variation des stocks de marchandises</field>
       <field name="code">6037</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5776,8 +5071,7 @@
       <field name="name">Achats d'études et prestations de services</field>
       <field name="code">604</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5785,8 +5079,7 @@
       <field name="name">Achats de matériel équipements et travaux</field>
       <field name="code">605</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5794,9 +5087,8 @@
       <field name="name">Achats non stockés de matières et fournitures</field>
       <field name="code">606</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pour l'usage interne à l'entreprise</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5804,8 +5096,7 @@
       <field name="name">Fournitures non stockables (eau, énergie...) </field>
       <field name="code">6061</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5813,8 +5104,7 @@
       <field name="name">Fournitures d'entretien et de petit équipement</field>
       <field name="code">6063</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5822,8 +5112,7 @@
       <field name="name">Fournitures administratives</field>
       <field name="code">6064</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5831,8 +5120,7 @@
       <field name="name">Autres matières et fournitures</field>
       <field name="code">6068</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5840,9 +5128,8 @@
       <field name="name">Achats de marchandises</field>
       <field name="code">607</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-      <field name="note">Biens revendus tels quels (707) soit une marge</field>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
+      <field name="note">Biens revendus tels quels (707)</field>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5850,9 +5137,8 @@
       <field name="name">Marchandise (ou groupe) A</field>
       <field name="code">6071</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Pour achats France</field>
-
       <field name="parent_id" ref="fr_pcg_expense"/>
     </record>
 
@@ -5860,9 +5146,8 @@
       <field name="name">Marchandise (ou groupe) B</field>
       <field name="code">6072</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Pour déclaration TVA intracommunautaire</field>
-
       <field name="parent_id" ref="fr_pcg_expense"/>
     </record>
 
@@ -5870,8 +5155,7 @@
       <field name="name">Frais accessoires incorporés aux achats</field>
       <field name="code">608</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5879,8 +5163,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur achats</field>
       <field name="code">609</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5888,8 +5171,7 @@
       <field name="name">- de matières premières (et fournitures)</field>
       <field name="code">6091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5897,8 +5179,7 @@
       <field name="name">- d'autres approvisionnements stockés</field>
       <field name="code">6092</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5906,8 +5187,7 @@
       <field name="name">- d'études et prestations de services</field>
       <field name="code">6094</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5915,8 +5195,7 @@
       <field name="name">- de matériel, équipements et travaux</field>
       <field name="code">6095</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5924,8 +5203,7 @@
       <field name="name">- d'approvisionnements non stockés</field>
       <field name="code">6096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5933,8 +5211,7 @@
       <field name="name">- de marchandises</field>
       <field name="code">6097</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5942,8 +5219,7 @@
       <field name="name">Rabais, remises et ristournes non affectés</field>
       <field name="code">6098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5951,8 +5227,7 @@
       <field name="name">Services extérieurs</field>
       <field name="code">61</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -5960,8 +5235,7 @@
       <field name="name">Sous-traitance générale</field>
       <field name="code">611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -5969,8 +5243,7 @@
       <field name="name">Redevances de crédit-bail</field>
       <field name="code">612</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -5978,8 +5251,7 @@
       <field name="name">Crédit-bail mobilier</field>
       <field name="code">6122</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_612"/>
     </record>
 
@@ -5987,8 +5259,7 @@
       <field name="name">Crédit-bail immobilier</field>
       <field name="code">6125</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_612"/>
     </record>
 
@@ -5996,8 +5267,7 @@
       <field name="name">Locations</field>
       <field name="code">613</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6005,8 +5275,7 @@
       <field name="name">Locations immobilières</field>
       <field name="code">6132</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6014,8 +5283,7 @@
       <field name="name">Locations mobilières</field>
       <field name="code">6135</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6023,8 +5291,7 @@
       <field name="name">Malis sur emballages</field>
       <field name="code">6136</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6032,8 +5299,7 @@
       <field name="name">Charges locatives et de copropriété</field>
       <field name="code">614</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6041,8 +5307,7 @@
       <field name="name">Entretien et réparations</field>
       <field name="code">615</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6050,8 +5315,7 @@
       <field name="name">- sur biens immobiliers</field>
       <field name="code">6152</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6059,8 +5323,7 @@
       <field name="name">- sur biens mobiliers</field>
       <field name="code">6155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6068,8 +5331,7 @@
       <field name="name">Maintenance</field>
       <field name="code">6156</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6077,8 +5339,7 @@
       <field name="name">Primes d'assurance</field>
       <field name="code">616</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6086,8 +5347,7 @@
       <field name="name">Multirisques</field>
       <field name="code">6161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6095,8 +5355,7 @@
       <field name="name">Assurance obligatoire dommage construction </field>
       <field name="code">6162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6104,8 +5363,7 @@
       <field name="name">Assurance transport</field>
       <field name="code">6163</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6113,8 +5371,7 @@
       <field name="name">Assurance transport sur achats</field>
       <field name="code">61636</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6122,8 +5379,7 @@
       <field name="name">Assurance transportsur ventes</field>
       <field name="code">61637</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6131,8 +5387,7 @@
       <field name="name">Assurance transport sur autres biens</field>
       <field name="code">61638</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6140,8 +5395,7 @@
       <field name="name">Risques d'exploitation</field>
       <field name="code">6164</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6149,8 +5403,7 @@
       <field name="name">Insolvabilité clients</field>
       <field name="code">6165</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6158,8 +5411,7 @@
       <field name="name">Études et recherches</field>
       <field name="code">617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6167,8 +5419,7 @@
       <field name="name">Divers</field>
       <field name="code">618</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6176,8 +5427,7 @@
       <field name="name">Documentation générale</field>
       <field name="code">6181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6185,8 +5435,7 @@
       <field name="name">Documentation technique</field>
       <field name="code">6183</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6194,8 +5443,7 @@
       <field name="name">Frais de colloques, séminaires, conférences</field>
       <field name="code">6185</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6203,8 +5451,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur services extérieurs</field>
       <field name="code">619</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6212,8 +5459,7 @@
       <field name="name">Autres services extérieurs</field>
       <field name="code">62</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6221,8 +5467,7 @@
       <field name="name">Personnel extérieur à l'entreprise</field>
       <field name="code">621</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6230,8 +5475,7 @@
       <field name="name">Personnel intérimaire</field>
       <field name="code">6211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_621"/>
     </record>
 
@@ -6239,8 +5483,7 @@
       <field name="name">Personnel détaché ou prêté à l'entreprise</field>
       <field name="code">6214</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_621"/>
     </record>
 
@@ -6248,8 +5491,7 @@
       <field name="name">Rémunérations d'intermédiaires et honoraires </field>
       <field name="code">622</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6257,8 +5499,7 @@
       <field name="name">Commissions et courtages sur achats </field>
       <field name="code">6221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6266,8 +5507,7 @@
       <field name="name">Commissions et courtages sur ventes</field>
       <field name="code">6222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6275,8 +5515,7 @@
       <field name="name">Rémunérations des transitaires</field>
       <field name="code">6224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6284,8 +5523,7 @@
       <field name="name">Rémunérations d'affacturage</field>
       <field name="code">6225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6293,8 +5531,7 @@
       <field name="name">Honoraires</field>
       <field name="code">6226</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6302,8 +5539,7 @@
       <field name="name">Frais d'actes et de contentieux</field>
       <field name="code">6227</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6311,8 +5547,7 @@
       <field name="name">Divers</field>
       <field name="code">6228</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6320,9 +5555,8 @@
       <field name="name">Publicité, publications, relations publiques</field>
       <field name="code">623</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Dont annonces légales, greffe, cartes visites</field>
-
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6330,8 +5564,7 @@
       <field name="name">Annonces et insertions</field>
       <field name="code">6231</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6339,8 +5572,7 @@
       <field name="name">Échantillons</field>
       <field name="code">6232</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6348,8 +5580,7 @@
       <field name="name">Foires et expositions</field>
       <field name="code">6233</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6357,9 +5588,8 @@
       <field name="name">Cadeaux à la clientèle</field>
       <field name="code">6234</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Attention déclaration DAS fin d'année</field>
-
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6367,8 +5597,7 @@
       <field name="name">Primes</field>
       <field name="code">6235</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6376,8 +5605,7 @@
       <field name="name">Catalogues et imprimés</field>
       <field name="code">6236</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6385,8 +5613,7 @@
       <field name="name">Publications</field>
       <field name="code">6237</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6394,8 +5621,7 @@
       <field name="name">Divers (pourboires, dons courants...)</field>
       <field name="code">6238</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6403,8 +5629,7 @@
       <field name="name">Transports de biens et transports collectifs du personnel</field>
       <field name="code">624</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6412,8 +5637,7 @@
       <field name="name">Transports sur achats</field>
       <field name="code">6241</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6421,8 +5645,7 @@
       <field name="name">Transports sur ventes</field>
       <field name="code">6242</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6430,8 +5653,7 @@
       <field name="name">Transports entre établissements ou chantiers</field>
       <field name="code">6243</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6439,8 +5661,7 @@
       <field name="name">Transports administratifs</field>
       <field name="code">6244</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6448,8 +5669,7 @@
       <field name="name">Transports collectifs du personnel</field>
       <field name="code">6247</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6457,8 +5677,7 @@
       <field name="name">Divers</field>
       <field name="code">6248</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6466,8 +5685,7 @@
       <field name="name">Déplacements missions et réceptions</field>
       <field name="code">625</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6475,8 +5693,7 @@
       <field name="name">Voyages et déplacements</field>
       <field name="code">6251</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6484,8 +5701,7 @@
       <field name="name">Frais de déménagement</field>
       <field name="code">6255</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6493,8 +5709,7 @@
       <field name="name">Missions</field>
       <field name="code">6256</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6502,8 +5717,7 @@
       <field name="name">Réceptions</field>
       <field name="code">6257</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6511,8 +5725,7 @@
       <field name="name">Frais postaux et frais de télécommunications</field>
       <field name="code">626</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6520,9 +5733,8 @@
       <field name="name">Services bancaires et assimilés</field>
       <field name="code">627</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Frais de tenue de compte, etc</field>
-
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6530,8 +5742,7 @@
       <field name="name">Frais sur titres (achat, vente, garde)</field>
       <field name="code">6271</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6539,8 +5750,7 @@
       <field name="name">Commissions et frais sur émission d'emprunts</field>
       <field name="code">6272</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6548,8 +5758,7 @@
       <field name="name">Frais sur effets</field>
       <field name="code">6275</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6557,8 +5766,7 @@
       <field name="name">Location de coffres</field>
       <field name="code">6276</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6566,8 +5774,7 @@
       <field name="name">Autres frais et commissions sur prestations de services</field>
       <field name="code">6278</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6575,8 +5782,7 @@
       <field name="name">Divers</field>
       <field name="code">628</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6584,9 +5790,7 @@
       <field name="name">Concours divers (cotisations...)</field>
       <field name="code">6281</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-      <field name="note">Dont sites internet (hébergement, nom domaine...)</field>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_628"/>
     </record>
 
@@ -6594,8 +5798,7 @@
       <field name="name">Frais de recrutement de personnel</field>
       <field name="code">6284</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_628"/>
     </record>
 
@@ -6603,8 +5806,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur autres services extérieurs</field>
       <field name="code">629</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6612,8 +5814,7 @@
       <field name="name">Impôts, taxes et versements assimilés</field>
       <field name="code">63</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6621,8 +5822,7 @@
       <field name="name">Impôts, taxes et versements assimilés sur rémunérations (administration des impôts) </field>
       <field name="code">631</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6630,8 +5830,7 @@
       <field name="name">Taxe sur les salaires</field>
       <field name="code">6311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6639,8 +5838,7 @@
       <field name="name">Taxe d'apprentissage</field>
       <field name="code">6312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6648,8 +5846,7 @@
       <field name="name">Participation des employeurs à la formation professionnelle continue</field>
       <field name="code">6313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6657,8 +5854,7 @@
       <field name="name">Cotisation pour défaut d'investissement obligatoire dans la construction</field>
       <field name="code">6314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6666,8 +5862,7 @@
       <field name="name">Autres</field>
       <field name="code">6318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6675,8 +5870,7 @@
       <field name="name">Impôts, taxes et versements assimilés sur rémunérations (autres organismes)</field>
       <field name="code">633</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6684,8 +5878,7 @@
       <field name="name">Versement de transport</field>
       <field name="code">6331</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6693,8 +5886,7 @@
       <field name="name">Allocation logement</field>
       <field name="code">6332</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6702,8 +5894,7 @@
       <field name="name">Participation des employeurs à la formation professionnelle continue</field>
       <field name="code">6333</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6711,8 +5902,7 @@
       <field name="name">Participation des employeurs à l'effort de construction</field>
       <field name="code">6334</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6720,8 +5910,7 @@
       <field name="name">Versements libératoires ouvrant droit à l'exonération de la taxe d'apprentissage</field>
       <field name="code">6335</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6729,8 +5918,7 @@
       <field name="name">Autres</field>
       <field name="code">6338</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6738,8 +5926,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés (administration des impôts)</field>
       <field name="code">635</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6747,8 +5934,7 @@
       <field name="name">Impôts directs (sauf impôts sur les bénéfices)</field>
       <field name="code">6351</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6756,8 +5942,7 @@
       <field name="name">Taxe professionnelle</field>
       <field name="code">63511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6765,8 +5950,7 @@
       <field name="name">Taxes foncières</field>
       <field name="code">63512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6774,8 +5958,7 @@
       <field name="name">Autres impôts locaux</field>
       <field name="code">63513</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6783,8 +5966,7 @@
       <field name="name">Taxe sur les véhicules des sociétés</field>
       <field name="code">63514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6792,8 +5974,7 @@
       <field name="name">Taxes sur le chiffre d'affaires non récupérables </field>
       <field name="code">6352</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6801,8 +5982,7 @@
       <field name="name">Impôts indirects</field>
       <field name="code">6353</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6810,8 +5990,7 @@
       <field name="name">Droits d'enregistrement et de timbre</field>
       <field name="code">6354</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6819,8 +5998,7 @@
       <field name="name">Droits de mutation</field>
       <field name="code">63541</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6354"/>
     </record>
 
@@ -6828,8 +6006,7 @@
       <field name="name">Autres droits</field>
       <field name="code">6358</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6837,8 +6014,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés (autres organismes)</field>
       <field name="code">637</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6846,8 +6022,7 @@
       <field name="name">Contribution sociale de solidarité à la charge des sociétés</field>
       <field name="code">6371</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6855,8 +6030,7 @@
       <field name="name">Taxes perçues par les organismes publics internationaux</field>
       <field name="code">6372</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6864,8 +6038,7 @@
       <field name="name">Impôts et taxes exigibles à l'étranger</field>
       <field name="code">6374</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6873,8 +6046,7 @@
       <field name="name">Taxes diverses</field>
       <field name="code">6378</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6882,8 +6054,7 @@
       <field name="name">Charges de personnel</field>
       <field name="code">64</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6891,8 +6062,7 @@
       <field name="name">Rémunérations du personnel</field>
       <field name="code">641</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6900,8 +6070,7 @@
       <field name="name">Salaires et appointements</field>
       <field name="code">6411</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6909,8 +6078,7 @@
       <field name="name">Congés payés</field>
       <field name="code">6412</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6918,8 +6086,7 @@
       <field name="name">Primes et gratifications</field>
       <field name="code">6413</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6927,8 +6094,7 @@
       <field name="name">Indemnités et avantages divers</field>
       <field name="code">6414</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6936,8 +6102,7 @@
       <field name="name">Supplément familial</field>
       <field name="code">6415</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6945,8 +6110,7 @@
       <field name="name">Rémunération du travail de l'exploitant</field>
       <field name="code">644</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6954,8 +6118,7 @@
       <field name="name">Charges de Sécurité sociale et de prévoyance</field>
       <field name="code">645</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6963,8 +6126,7 @@
       <field name="name">Cotisations à l'URSSAF</field>
       <field name="code">6451</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6972,8 +6134,7 @@
       <field name="name">Cotisations aux mutuelles</field>
       <field name="code">6452</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6981,8 +6142,7 @@
       <field name="name">Cotisations aux caisses de retraites</field>
       <field name="code">6453</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6990,8 +6150,7 @@
       <field name="name">Cotisations aux ASSEDIC</field>
       <field name="code">6454</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6999,17 +6158,15 @@
       <field name="name">Cotisations aux autres organismes sociaux</field>
       <field name="code">6458</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
     <record id="pcg_646" model="account.account.template">
       <field name="name">Cotisations sociales personnelles de l'exploitant</field>
       <field name="code">646</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7017,8 +6174,7 @@
       <field name="name">Autres charges sociales</field>
       <field name="code">647</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7026,8 +6182,7 @@
       <field name="name">Prestations directes</field>
       <field name="code">6471</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7035,8 +6190,7 @@
       <field name="name">Versements aux comités d'entreprise et d'établissement</field>
       <field name="code">6472</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7044,8 +6198,7 @@
       <field name="name">Versements aux comités d'hygiène et de sécurité</field>
       <field name="code">6473</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7053,8 +6206,7 @@
       <field name="name">Versements aux autres oeuvres sociales</field>
       <field name="code">6474</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7062,8 +6214,7 @@
       <field name="name">Médecine du travail pharmacie</field>
       <field name="code">6475</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7071,8 +6222,7 @@
       <field name="name">Autres charges de personnel</field>
       <field name="code">648</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7080,8 +6230,7 @@
       <field name="name">Autres charges de gestion courante</field>
       <field name="code">65</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7089,8 +6238,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">651</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7098,8 +6246,7 @@
       <field name="name">Redevances pour concessions brevets, licences, marques, procédés, logiciels </field>
       <field name="code">6511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7107,8 +6254,7 @@
       <field name="name">Droits d'auteur et de reproduction</field>
       <field name="code">6516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7116,8 +6262,7 @@
       <field name="name">Autres droits et valeurs similaires</field>
       <field name="code">6518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7125,8 +6270,7 @@
       <field name="name">Jetons de présence</field>
       <field name="code">653</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7134,9 +6278,8 @@
       <field name="name">Pertes sur créances irrécouvrables</field>
       <field name="code">654</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Faire et conserver les relances et mises en demeures</field>
-
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7144,8 +6287,7 @@
       <field name="name">Créances de l'exercice</field>
       <field name="code">6541</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_654"/>
     </record>
 
@@ -7153,8 +6295,7 @@
       <field name="name">Créances des exercices antérieurs</field>
       <field name="code">6544</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_654"/>
     </record>
 
@@ -7162,8 +6303,7 @@
       <field name="name">Quotes-parts de résultat sur opérations faites en commun</field>
       <field name="code">655</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7171,8 +6311,7 @@
       <field name="name">Quote-part de bénéfice transférée (comptabilité du gérant)</field>
       <field name="code">6551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_655"/>
     </record>
 
@@ -7180,8 +6319,7 @@
       <field name="name">Quote-part de perte supportée (comptabilité des associés non gérants)</field>
       <field name="code">6555</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_655"/>
     </record>
 
@@ -7189,8 +6327,7 @@
       <field name="name">Charges diverses de gestion courante</field>
       <field name="code">658</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7198,9 +6335,8 @@
       <field name="name">Charges financières</field>
       <field name="code">66</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Dont les intérêts d'emprunt</field>
-
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7208,8 +6344,7 @@
       <field name="name">Charges d'intérêt</field>
       <field name="code">661</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7217,8 +6352,7 @@
       <field name="name">Intérêts des emprunts et dettes</field>
       <field name="code">6611</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7226,8 +6360,7 @@
       <field name="name">Intérêts des emprunts et dettes assimilées</field>
       <field name="code">66116</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6611"/>
     </record>
 
@@ -7235,8 +6368,7 @@
       <field name="name">Intérêts des dettes rattachées à des participations</field>
       <field name="code">66117</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6611"/>
     </record>
 
@@ -7244,8 +6376,7 @@
       <field name="name">Intérêts des comptes courants et des dépôts créditeurs</field>
       <field name="code">6615</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7253,8 +6384,7 @@
       <field name="name">Intérêts bancaires et sur opérations de financement (escompte, ...)</field>
       <field name="code">6616</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7262,8 +6392,7 @@
       <field name="name">Intérêts des obligations cautionnées</field>
       <field name="code">6617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7271,8 +6400,7 @@
       <field name="name">Intérêts des autres dettes</field>
       <field name="code">6618</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7280,8 +6408,7 @@
       <field name="name">Intérêts des dettes commerciales</field>
       <field name="code">66181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6618"/>
     </record>
 
@@ -7289,8 +6416,7 @@
       <field name="name">Intérêts des dettes diverses</field>
       <field name="code">66188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6618"/>
     </record>
 
@@ -7298,8 +6424,7 @@
       <field name="name">Pertes sur créances liées à des participations</field>
       <field name="code">664</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7307,8 +6432,7 @@
       <field name="name">Escomptes accordés</field>
       <field name="code">665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7316,8 +6440,7 @@
       <field name="name">Pertes de change</field>
       <field name="code">666</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7325,9 +6448,8 @@
       <field name="name">Charges nettes sur cessions de valeurs mobilières de placement</field>
       <field name="code">667</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">(contrepartie 767)</field>
-
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7335,8 +6457,7 @@
       <field name="name">Autres charges financières</field>
       <field name="code">668</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7344,8 +6465,7 @@
       <field name="name">Charges exceptionnelles</field>
       <field name="code">67</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7353,8 +6473,7 @@
       <field name="name">Charges exceptionnelles sur opérations de gestion</field>
       <field name="code">671</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7362,8 +6481,7 @@
       <field name="name">Pénalités sur marchés (et dédits payés sur achats et ventes)</field>
       <field name="code">6711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7371,9 +6489,8 @@
       <field name="name">Pénalités, amendes fiscales et pénales </field>
       <field name="code">6712</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">PV code de la route non déductibles</field>
-
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7381,8 +6498,7 @@
       <field name="name">Dons, libéralités</field>
       <field name="code">6713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7390,8 +6506,7 @@
       <field name="name">Créances devenues irrécouvrables dans l'exercice</field>
       <field name="code">6714</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7399,8 +6514,7 @@
       <field name="name">Subventions accordées</field>
       <field name="code">6715</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7408,8 +6522,7 @@
       <field name="name">Rappels d'impôts (autres qu'impôts sur les bénéfices)</field>
       <field name="code">6717</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7417,8 +6530,7 @@
       <field name="name">Autres charges exceptionnelles sur opération de gestion</field>
       <field name="code">6718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7426,8 +6538,7 @@
       <field name="name">Charges sur exercices antérieurs (en cours d'exercice seulement)</field>
       <field name="code">672</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7435,9 +6546,8 @@
       <field name="name">Valeurs comptables des éléments d'actif cédés</field>
       <field name="code">675</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Vente d'immobilisation = (Valeur d'origine - amortissements) (contrepartie 775)</field>
-
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7445,8 +6555,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">6751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7454,8 +6563,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">6752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7463,8 +6571,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">6756</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7472,8 +6579,7 @@
       <field name="name">Autres éléments d'actif</field>
       <field name="code">6758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7482,8 +6588,7 @@
       <field name="name">Autres charges exceptionnelles</field>
       <field name="code">678</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7491,8 +6596,7 @@
       <field name="name">Malis provenant de clauses d'indexation </field>
       <field name="code">6781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7500,8 +6604,7 @@
       <field name="name">Lots</field>
       <field name="code">6782</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7509,8 +6612,7 @@
       <field name="name">Malis provenant du rachat par l'entreprise d'actions et obligations émises par elle-même</field>
       <field name="code">6783</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7518,8 +6620,7 @@
       <field name="name">Charges exceptionnelles diverses</field>
       <field name="code">6788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7527,8 +6628,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions</field>
       <field name="code">68</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7536,8 +6636,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges d'exploitation</field>
       <field name="code">681</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7545,8 +6644,7 @@
       <field name="name">Dotations aux amortissements des immobilisations incorporelles et corporelles </field>
       <field name="code">6811</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7554,8 +6652,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">68111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6811"/>
     </record>
 
@@ -7563,8 +6660,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">68112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6811"/>
     </record>
 
@@ -7572,8 +6668,7 @@
       <field name="name">Dotations aux amortissements des charges d'exploitation à répartir</field>
       <field name="code">6812</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7581,8 +6676,7 @@
       <field name="name">Dotations aux provisions pour risques et charges d'exploitation</field>
       <field name="code">6815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7590,8 +6684,7 @@
       <field name="name">Dotations pour dépréciations des immobilisations incorporelles et corporelles</field>
       <field name="code">6816</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7599,8 +6692,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">68161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6816"/>
     </record>
 
@@ -7608,8 +6700,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">68162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6816"/>
     </record>
 
@@ -7617,8 +6708,7 @@
       <field name="name">Dotations aux provisions pour dépréciation des actifs circulants</field>
       <field name="code">6817</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7626,8 +6716,7 @@
       <field name="name">Stocks et en-cours</field>
       <field name="code">68173</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6817"/>
     </record>
 
@@ -7635,8 +6724,7 @@
       <field name="name">Créances</field>
       <field name="code">68174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6817"/>
     </record>
 
@@ -7644,8 +6732,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges financières</field>
       <field name="code">686</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7653,8 +6740,7 @@
       <field name="name">Dotations aux amortissements des primes de remboursement des obligations</field>
       <field name="code">6861</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7662,8 +6748,7 @@
       <field name="name">Dotations aux provisions pour risques et charges financiers</field>
       <field name="code">6865</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7671,8 +6756,7 @@
       <field name="name">Dotations aux dépréciation des éléments financiers</field>
       <field name="code">6866</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7680,8 +6764,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">68662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6866"/>
     </record>
 
@@ -7689,8 +6772,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">68665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6866"/>
     </record>
 
@@ -7698,8 +6780,7 @@
       <field name="name">Autres dotations</field>
       <field name="code">6868</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7707,8 +6788,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges exceptionnelles</field>
       <field name="code">687</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7716,8 +6796,7 @@
       <field name="name">Dotations aux amortissements exceptionnels des immobilisations</field>
       <field name="code">6871</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7725,8 +6804,7 @@
       <field name="name">Dotations aux provisions réglementées (immobilisations)</field>
       <field name="code">6872</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7734,8 +6812,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">68725</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6872"/>
     </record>
 
@@ -7743,8 +6820,7 @@
       <field name="name">Dotations aux provisions réglementées (stocks)</field>
       <field name="code">6873</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7752,8 +6828,7 @@
       <field name="name">Dotations aux autres provisions réglementées</field>
       <field name="code">6874</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7761,8 +6836,7 @@
       <field name="name">Dotations aux provisions exceptionnelles</field>
       <field name="code">6875</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7770,8 +6844,7 @@
       <field name="name">Dotations aux dépréciations exceptionnelles</field>
       <field name="code">6876</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7779,8 +6852,7 @@
       <field name="name">Participation des salariés - Impôts sur les bénéfices et assimilés</field>
       <field name="code">69</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7788,8 +6860,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">691</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7797,8 +6868,7 @@
       <field name="name">Impôts sur les bénéfices</field>
       <field name="code">695</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7806,8 +6876,7 @@
       <field name="name">Impôts dus en France</field>
       <field name="code">6951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7815,8 +6884,7 @@
       <field name="name">Contribution additionnelle à l'impôt sur les bénéfices</field>
       <field name="code">6952</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7824,8 +6892,7 @@
       <field name="name">Impôts dus à l'étranger</field>
       <field name="code">6954</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7833,8 +6900,7 @@
       <field name="name">Supplément d'impôt sur les sociétés lié aux distributions</field>
       <field name="code">696</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7842,8 +6908,7 @@
       <field name="name">Imposition forfaitaire annuelle des sociétés</field>
       <field name="code">697</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7851,8 +6916,7 @@
       <field name="name">Intégration fiscale</field>
       <field name="code">698</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7860,8 +6924,7 @@
       <field name="name">Intégration fiscale - Charges</field>
       <field name="code">6981</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_698"/>
     </record>
 
@@ -7869,8 +6932,7 @@
       <field name="name">Intégration fiscale - Produits</field>
       <field name="code">6989</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_698"/>
     </record>
 
@@ -7878,8 +6940,7 @@
       <field name="name">Produits, Reports en arrière des déficits</field>
       <field name="code">699</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7887,8 +6948,7 @@
       <field name="name">Comptes de produits</field>
       <field name="code">Classe 7</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_6_et_7"/>
     </record>
 
@@ -7896,8 +6956,7 @@
       <field name="name">Ventes de produits fabriqués - Prestations de service - Marchandises</field>
       <field name="code">70</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -7905,8 +6964,7 @@
       <field name="name">Ventes de produits finis</field>
       <field name="code">701</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7914,8 +6972,7 @@
       <field name="name">Produits finis (ou groupe) A</field>
       <field name="code">7011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_701"/>
     </record>
 
@@ -7924,8 +6981,7 @@
       <field name="name">Produits finis (ou groupe) B</field>
       <field name="code">7012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_701"/>
     </record>
 
@@ -7933,8 +6989,7 @@
       <field name="name">Ventes de produits intermédiaires</field>
       <field name="code">702</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7942,8 +6997,7 @@
       <field name="name">Ventes de produits résiduels</field>
       <field name="code">703</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7951,8 +7005,7 @@
       <field name="name">Travaux</field>
       <field name="code">704</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7960,8 +7013,7 @@
       <field name="name">Travaux de catégorie (ou activité) A</field>
       <field name="code">7041</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_704"/>
     </record>
 
@@ -7969,8 +7021,7 @@
       <field name="name">Travaux de catégorie (ou activité) B</field>
       <field name="code">7042</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_704"/>
     </record>
 
@@ -7978,8 +7029,7 @@
       <field name="name">Études</field>
       <field name="code">705</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7987,8 +7037,7 @@
       <field name="name">Prestations de services</field>
       <field name="code">706</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7996,9 +7045,8 @@
       <field name="name">Ventes de marchandises</field>
       <field name="code">707</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">707-607 = marge commerciale (contrepartie 607)</field>
-
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8006,8 +7054,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">7071</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8015,8 +7062,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">7072</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8024,8 +7070,7 @@
       <field name="name">Marchandises à l'exportation</field>
       <field name="code">7073</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8033,9 +7078,8 @@
       <field name="name">Produits des activités annexes</field>
       <field name="code">708</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Activité accessoire ou occasionnelle</field>
-
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8043,8 +7087,7 @@
       <field name="name">Produits des services exploités dans l'intérêt du personnel</field>
       <field name="code">7081</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8052,8 +7095,7 @@
       <field name="name">Commissions et courtages</field>
       <field name="code">7082</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8061,8 +7103,7 @@
       <field name="name">Locations diverses</field>
       <field name="code">7083</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8070,8 +7111,7 @@
       <field name="name">Mise à disposition de personnel facturée </field>
       <field name="code">7084</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8079,8 +7119,7 @@
       <field name="name">Ports et frais accessoires facturés</field>
       <field name="code">7085</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8088,8 +7127,7 @@
       <field name="name">Bonis sur reprises d'emballages consignés</field>
       <field name="code">7086</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8097,8 +7135,7 @@
       <field name="name">Bonifications obtenues des clients et primes sur ventes</field>
       <field name="code">7087</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8106,8 +7143,7 @@
       <field name="name">Autres produits d'activités annexes (cessions d'approvisionnements...)</field>
       <field name="code">7088</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8115,8 +7151,7 @@
       <field name="name">Rabais, remises et ristournes accordés par l'entreprise</field>
       <field name="code">709</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8124,8 +7159,7 @@
       <field name="name">- sur ventes de produits finis</field>
       <field name="code">7091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8133,8 +7167,7 @@
       <field name="name">- sur ventes de produits intermédiaires </field>
       <field name="code">7092</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8142,8 +7175,7 @@
       <field name="name">- sur travaux</field>
       <field name="code">7094</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8151,8 +7183,7 @@
       <field name="name">- sur études</field>
       <field name="code">7095</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8160,8 +7191,7 @@
       <field name="name">- sur prestations de services</field>
       <field name="code">7096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8169,8 +7199,7 @@
       <field name="name">- sur ventes de marchandises</field>
       <field name="code">7097</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8178,8 +7207,7 @@
       <field name="name">- sur produits des activités annexes</field>
       <field name="code">7098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8187,8 +7215,7 @@
       <field name="name">Production stockée (ou déstockage)</field>
       <field name="code">71</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8196,8 +7223,7 @@
       <field name="name">Variation des stocks (en-cours de production, produits)</field>
       <field name="code">713</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_71"/>
     </record>
 
@@ -8205,8 +7231,7 @@
       <field name="name">Variation des en-cours de production de biens</field>
       <field name="code">7133</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8214,8 +7239,7 @@
       <field name="name">Produits en cours</field>
       <field name="code">71331</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7133"/>
     </record>
 
@@ -8223,8 +7247,7 @@
       <field name="name">Travaux en cours</field>
       <field name="code">71335</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7133"/>
     </record>
 
@@ -8232,8 +7255,7 @@
       <field name="name">Variation des en-cours de production de services</field>
       <field name="code">7134</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8241,8 +7263,7 @@
       <field name="name">Études en cours</field>
       <field name="code">71341</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7134"/>
     </record>
 
@@ -8250,8 +7271,7 @@
       <field name="name">Prestations de services en cours</field>
       <field name="code">71345</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7134"/>
     </record>
 
@@ -8259,8 +7279,7 @@
       <field name="name">Variation des stocks de produits</field>
       <field name="code">7135</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8268,8 +7287,7 @@
       <field name="name">Produits intermédiaires </field>
       <field name="code">71351</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8277,8 +7295,7 @@
       <field name="name">Produits finis</field>
       <field name="code">71355</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8286,8 +7303,7 @@
       <field name="name">Produits résiduels</field>
       <field name="code">71358</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8295,8 +7311,7 @@
       <field name="name">Production immobilisée</field>
       <field name="code">72</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8304,8 +7319,7 @@
       <field name="name">Immobilisations incorporelles </field>
       <field name="code">721</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_72"/>
     </record>
 
@@ -8313,8 +7327,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">722</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_72"/>
     </record>
 
@@ -8322,8 +7335,7 @@
       <field name="name">Subventions d'exploitation</field>
       <field name="code">74</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8331,8 +7343,7 @@
       <field name="name">Autres produits de gestion courante</field>
       <field name="code">75</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8340,8 +7351,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">751</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8349,8 +7359,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels </field>
       <field name="code">7511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8358,8 +7367,7 @@
       <field name="name">Droits d'auteur et de reproduction</field>
       <field name="code">7516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8367,8 +7375,7 @@
       <field name="name">Autres droits et valeurs similaires</field>
       <field name="code">7518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8376,8 +7383,7 @@
       <field name="name">Revenus des immeubles non affectés aux activités professionnelles</field>
       <field name="code">752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8385,8 +7391,7 @@
       <field name="name">Jetons de présence et rémunérations d'administrateurs, gérants..</field>
       <field name="code">753</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8394,8 +7399,7 @@
       <field name="name">Ristournes perçues des coopératives (provenant des excédents)</field>
       <field name="code">754</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8403,8 +7407,7 @@
       <field name="name">Quotes-parts de résultats sur opérations faites en commun</field>
       <field name="code">755</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8412,8 +7415,7 @@
       <field name="name">Quote-part de perte transférée (comptabilité du gérant)</field>
       <field name="code">7551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_755"/>
     </record>
 
@@ -8421,8 +7423,7 @@
       <field name="name">Quote-part de bénéfice attribuée (comptabilité des associés non-gérants)</field>
       <field name="code">7555</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_755"/>
     </record>
 
@@ -8430,8 +7431,7 @@
       <field name="name">Produits divers de gestion courante</field>
       <field name="code">758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8439,9 +7439,8 @@
       <field name="name">Produits financiers</field>
       <field name="code">76</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Intérêts sur comptes rémunérés (SICAV....)</field>
-
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8449,8 +7448,7 @@
       <field name="name">Produits de participations</field>
       <field name="code">761</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8458,8 +7456,7 @@
       <field name="name">Revenus des titres de participation</field>
       <field name="code">7611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8467,8 +7464,7 @@
       <field name="name">Revenus sur autres formes de participation </field>
       <field name="code">7616</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8476,8 +7472,7 @@
       <field name="name">Revenus des créances rattachées à des participations</field>
       <field name="code">7617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8485,8 +7480,7 @@
       <field name="name">Produits des autres immobilisations financières</field>
       <field name="code">762</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8494,8 +7488,7 @@
       <field name="name">Revenus des titres immobilisés</field>
       <field name="code">7621</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8503,8 +7496,7 @@
       <field name="name">Revenus des prêts</field>
       <field name="code">7626</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8512,8 +7504,7 @@
       <field name="name">Revenus des créances immobilisées</field>
       <field name="code">7627</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8521,8 +7512,7 @@
       <field name="name">Revenus des autres créances</field>
       <field name="code">763</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8530,8 +7520,7 @@
       <field name="name">Revenus des créances commerciales </field>
       <field name="code">7631</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_763"/>
     </record>
 
@@ -8539,8 +7528,7 @@
       <field name="name">Revenus des créances diverses</field>
       <field name="code">7638</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_763"/>
     </record>
 
@@ -8548,8 +7536,7 @@
       <field name="name">Revenus des valeurs mobilières de placement</field>
       <field name="code">764</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8557,8 +7544,7 @@
       <field name="name">Escomptes obtenus</field>
       <field name="code">765</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8566,8 +7552,7 @@
       <field name="name">Gains de change</field>
       <field name="code">766</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8575,9 +7560,8 @@
       <field name="name">Produits nets sur cessions de valeurs mobilières de placement</field>
       <field name="code">767</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="note">(contrepartie 667)</field>
-
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8585,8 +7569,7 @@
       <field name="name">Autres produits financiers</field>
       <field name="code">768</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8594,8 +7577,7 @@
       <field name="name">Produits exceptionnels</field>
       <field name="code">77</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8603,9 +7585,8 @@
       <field name="name">Produits exceptionnels sur opérations de gestion</field>
       <field name="code">771</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Écarts d'arrondis</field>
-
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8613,8 +7594,7 @@
       <field name="name">Dédits et pénalités perçus sur achats et sur ventes</field>
       <field name="code">7711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8622,8 +7602,7 @@
       <field name="name">Libéralités reçues</field>
       <field name="code">7713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8631,8 +7610,7 @@
       <field name="name">Rentrées sur créances amorties</field>
       <field name="code">7714</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8640,8 +7618,7 @@
       <field name="name">Subventions d'équilibre</field>
       <field name="code">7715</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8649,8 +7626,7 @@
       <field name="name">Dégrèvements d'impôts autres qu'impôts sur les bénéfices</field>
       <field name="code">7717</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8658,8 +7634,7 @@
       <field name="name">Autres produits exceptionnels sur opérations de gestion</field>
       <field name="code">7718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8667,8 +7642,7 @@
       <field name="name">Produits sur exercices antérieurs (en cours d'exercice seulement)</field>
       <field name="code">772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8676,9 +7650,8 @@
       <field name="name">Produits des cessions d'éléments d'actif</field>
       <field name="code">775</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">vente d'immobilisation = prix de vente (contrepartie 675)</field>
-
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8686,8 +7659,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">7751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8695,8 +7667,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">7752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8704,8 +7675,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">7756</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8713,8 +7683,7 @@
       <field name="name">Autres éléments d'actif</field>
       <field name="code">7758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8722,8 +7691,7 @@
       <field name="name">Quote-part des subventions d'investissement virée au résultat de l'exercice</field>
       <field name="code">777</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8731,8 +7699,7 @@
       <field name="name">Autres produits exceptionnels</field>
       <field name="code">778</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8740,8 +7707,7 @@
       <field name="name">Bonis provenant de clauses d'indexation </field>
       <field name="code">7781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8749,8 +7715,7 @@
       <field name="name">Lots</field>
       <field name="code">7782</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8758,8 +7723,7 @@
       <field name="name">Bonis provenant du rachat par l'entreprise d'actions et d'obligations émises par elle-même</field>
       <field name="code">7783</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8767,8 +7731,7 @@
       <field name="name">Produits exceptionnels divers</field>
       <field name="code">7788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8776,8 +7739,7 @@
       <field name="name">Reprises sur amortissements, dépréciations et provisions</field>
       <field name="code">78</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8785,8 +7747,7 @@
       <field name="name">Reprises sur amortissements, dépréciations et provisions (à inscrire dans les produits d'exploitation)</field>
       <field name="code">781</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8794,8 +7755,7 @@
       <field name="name">Reprises sur amortissements des immobilisations incorporelles et corporelles </field>
       <field name="code">7811</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8803,8 +7763,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">78111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7811"/>
     </record>
 
@@ -8812,8 +7771,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">78112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7811"/>
     </record>
 
@@ -8821,8 +7779,7 @@
       <field name="name">Reprises sur provisions d'exploitation</field>
       <field name="code">7815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8830,8 +7787,7 @@
       <field name="name">Reprises sur dépréciations des immobilisations corporelles et incorporelles</field>
       <field name="code">7816</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8839,8 +7795,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">78161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7816"/>
     </record>
 
@@ -8848,8 +7803,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">78162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7816"/>
     </record>
 
@@ -8857,8 +7811,7 @@
       <field name="name">Reprises sur dépréciations des actifs circulants</field>
       <field name="code">7817</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8866,8 +7819,7 @@
       <field name="name">Stocks et en-cours</field>
       <field name="code">78173</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7817"/>
     </record>
 
@@ -8875,8 +7827,7 @@
       <field name="name">Créances</field>
       <field name="code">78174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7817"/>
     </record>
 
@@ -8884,8 +7835,7 @@
       <field name="name">Reprises sur dépréciations et provisions (à inscrire dans les produits financiers)</field>
       <field name="code">786</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8893,8 +7843,7 @@
       <field name="name">Reprises sur provisions financiers</field>
       <field name="code">7865</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_786"/>
     </record>
 
@@ -8902,8 +7851,7 @@
       <field name="name">Reprises sur dépréciations des éléments financiers</field>
       <field name="code">7866</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_786"/>
     </record>
 
@@ -8911,8 +7859,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">78662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7866"/>
     </record>
 
@@ -8920,8 +7867,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">78665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7866"/>
     </record>
 
@@ -8929,8 +7875,7 @@
       <field name="name">Reprises sur dépréciations et provisions (à inscrire dans les produits exceptionnels)</field>
       <field name="code">787</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8938,8 +7883,7 @@
       <field name="name">Reprises sur provisions réglementées (immobilisations)</field>
       <field name="code">7872</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8947,8 +7891,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">78725</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8956,8 +7899,7 @@
       <field name="name">Provision spéciale de réévaluation</field>
       <field name="code">78726</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8965,8 +7907,7 @@
       <field name="name">Plus-values réinvesties</field>
       <field name="code">78727</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8974,8 +7915,7 @@
       <field name="name">Reprises sur provisions réglementées (stocks) </field>
       <field name="code">7873</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8983,8 +7923,7 @@
       <field name="name">Reprises sur autres provisions réglementées </field>
       <field name="code">7874</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8992,8 +7931,7 @@
       <field name="name">Reprises sur provisions exceptionnelles</field>
       <field name="code">7875</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -9001,8 +7939,7 @@
       <field name="name">Reprises pour dépréciations exceptionnelles</field>
       <field name="code">7876</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -9010,8 +7947,7 @@
       <field name="name">Transferts de charges</field>
       <field name="code">79</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -9019,8 +7955,7 @@
       <field name="name">Transferts de charges d'exploitation</field>
       <field name="code">791</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
@@ -9028,8 +7963,7 @@
       <field name="name">Transferts de charges financières</field>
       <field name="code">796</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
@@ -9037,8 +7971,7 @@
       <field name="name">Transferts de charges exceptionnelles</field>
       <field name="code">797</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 440c182e336..f5358d9dd42 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
-                   <header>
-                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group>
                         <field name="fiscalyear_id"/>
                    </group>
+                   <footer>
+                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index d9f71c2ef3e..9d9b3b91c71 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
-                    <header>
-                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="fiscalyear_id"/>
                     </group>
+                    <footer>
+                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index e5c13e7e4c4..1f60096e815 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
-                   <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
                        <field name="period_id" widget="selection"/>
                    </group>
+                   <footer>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 3b06ea5ce32..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -134,8 +134,8 @@ class lunch_order(osv.osv):
         'product': fields.many2one('lunch.product', 'Product', required=True, \
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
-        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
+        'descript': fields.char('Comment', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 55a59f76762..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="date"/>
-                        <field name="product" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <group>
+                        <group>
+                            <field name="product" on_change="onchange_product(product)"/>
+                            <field name="descript"/>
+                            <field name="price"/>
+                            <field name="category"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="cashmove"/>
+                            <field name="date"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -105,8 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <field name="name"/>
-                    <field name="manager"/>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -145,14 +151,16 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="user_cashmove"/>
-                        <field name="amount"/>
-                        <field name="box"/>
-                        <field name="create_date"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="user_cashmove"/>
+                            <field name="amount"/>
+                            <field name="box"/>
+                            <field name="create_date"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -216,8 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <separator string="Category Related to Products" colspan="4"/>
-                    <field name="name"/>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -250,18 +259,19 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                     <group col="6">
-                          <field name="name"/>
-                          <field name="category_id"/>
-                          <field name="price" />
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                              <field name="active"/>
-                              <separator string="Description" colspan="4" />
-                              <field name="description" nolabel="1" colspan="4" />
-                          </page>
-                     </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="category_id"/>
+                                <field name="price" />
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 287d283e212..eb05c0dc304 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
-                    <header>
-                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>
                     </group>
+                    <footer>
+                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cd96b9765c9..cb10eb57fd0 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
-                    <header>
-                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
                    </group>
+                    <footer>
+                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index ade5b227cc2..282b79539f8 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
-                    <header>
-                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
                          <field name="confirm_cashbox"/>
                    </group>
+                    <footer>
+                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index f501cc58d2c..e911f24e809 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,36 +20,41 @@
 ##############################################################################
 
 {
-    'name': 'Emails Management',
+    'name': 'Social Network',
     'version': '1.0',
-    'category': 'Hidden/Dependency',
+    'category':'Social Network',
+    "sequence": 2,
     'description': """
-A generic email subsystem with message storage and queuing
-==========================================================
+A bussiness 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 
+communication history on documents.It gives the users the possibility
+to read and send messages and emails in an unified way.
 
-This email subsystem is not intended to be used as as standalone
-application, but to provide a unified email abstraction that all
-other applications can use.
+It also provides a feeds page combined to a subscription mechanism, that 
+allows to follow documents, and to be constantly updated about recent
+news.
+        
+The main features of the module are :
 
-The main features are:
-
-    * Relies on the global Outgoing Mail Servers configured in the 
-      Administration menu for delivering outgoing mail
-    * Provides an API for sending messages and archiving them,
-      grouped by conversation
-    * Any OpenERP document can act as a conversation topic, provided
-      it includes the necessary support for handling incoming emails
-      (see the ``mail.thread`` class for more details). 
-    * Includes queuing mechanism with automated configurable
-      scheduler-based processing
-    * Includes a generic email composition assistant, that can turn
+    * a clean and renewed communication history for any OpenERP
+      document that can act as a discussion topic,       
+    * a discussion mean on documents,
+    * a subscription mechanism to be updated about new messages on 
+      interesting documents,
+    * an unified feeds page to see recent messages and activity 
+      on followed documents,
+    * user communication through the feeds page,
+    * a threaded discussion design,
+    * relies on the global outgoing mail server, an integrated email
+      management system allowing to send emails with a configurable 
+      scheduler-based processing engine
+    * includes an extensible generic email composition assistant, that can turn
       into a mass-mailing assistant, and is capable of interpreting
       simple *placeholder expressions* that will be replaced with
-      dynamic data when each email is actually sent.
-      This generic assistant is easily extensible to provide advanced
-      features (see ``email_template`` for example, which adds email
-      templating features to this assistant)
-
+      dynamic data when each email is actually sent
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
@@ -69,6 +74,7 @@ The main features are:
     ],
     'installable': True,
     'auto_install': False,
+    'application':True,
     'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
@@ -94,6 +100,6 @@ The main features are:
     ],
     'demo': [
         'mail_demo.xml',
-    ],
+    ],   
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 7ca52348d99..4c8797e7f8b 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -38,7 +38,7 @@ Make your module inheriting from the ``mail.thread`` class.
     # inherit from mail.thread allows the use of OpenChatter
     _inherit = ['mail.thread']
 
-Use the thread viewer widget inside your form view by using the ThreadView widget on the message_ids field inherited from mail.thread.
+Use the thread viewer widget inside your form view by using the mail_thread widget on the message_ids field inherited from mail.thread.
 
 ::
 
@@ -50,7 +50,7 @@ Use the thread viewer widget inside your form view by using the ThreadView widge
     <field name="arch" type="xml">
       <form>
       [...]
-      <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+      <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
       </form>
     </field>
   </record>
@@ -131,7 +131,7 @@ The drawback of this method is that it is no longer possible to those subscriber
 Messages display management
 ++++++++++++++++++++++++++++
 
-By default, the ThreadView widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
+By default, the mail_thread widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
 
  - messages related to the user, as usual (messages with ``model = res.users, res_id = current_document_id``)
  - messages directly pushed to this user (containing @login)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 4b9cfd09c3d..6ad1792b3b4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -73,7 +73,7 @@
                         </group>
                     </sheet>
                     <footer class="openerp_mail_group_footer">
-                        <field name="message_ids" widget="ThreadView"
+                        <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                     </footer>
                 </form>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5668709af17..cdcaf4f464d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 0a9860dc979..15f6618c8e5 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <footer>
-                    <field name="message_ids" widget="ThreadView" 
+                    <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </footer>
                 </xpath>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 428f53d092e..918f77e0ace 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -28,7 +28,7 @@
                 </field>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </xpath>
             </data>
diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
new file mode 100644
index 00000000000..53ccc469127
Binary files /dev/null and b/addons/mail/static/src/img/icon.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da54130d093..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -91,7 +91,7 @@ openerp.mail = function(session) {
             this.params = params;
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
-            this.params.msg_more_limit = this.params.msg_more_limit || 100;
+            this.params.msg_more_limit = this.params.msg_more_limit || 290;
             this.params.limit = this.params.limit || 100;
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
@@ -304,7 +304,6 @@ openerp.mail = function(session) {
 
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
-
             var rendered = session.web.qweb.render('mail.Thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
             $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
             // expand feature
@@ -497,7 +496,7 @@ openerp.mail = function(session) {
     });
     session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
 
-    /** ThreadView widget: thread of comments */
+    /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
         template: 'mail.RecordThread',
 
@@ -541,7 +540,11 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+            if (! this.view.datarecord.id ||
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$element.find('.oe_mail_thread').hide();
+                return;
+            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget
@@ -598,7 +601,7 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
     });
-    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'mail_thread', 'openerp.mail.RecordThread');
 
     /** WallView widget: a wall of messages */
     mail.WallView = session.web.Widget.extend({
@@ -635,6 +638,7 @@ openerp.mail = function(session) {
         start: function () {
             this._super.apply(this, arguments);
             var self = this;
+            this.display_current_user();
             // add events
             this.add_event_handlers();
             // load mail.message search view
@@ -694,6 +698,14 @@ openerp.mail = function(session) {
             });
         },
 
+        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));
+        },
+        
+        thread_get_avatar: function(model, field, id) {
+            return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        },
+        
         /**
          * Initializes the wall and calls fetch_comments
          * @param {Number} limit: number of notifications to fetch
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2eb3a390933..982fb8aeb2f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -56,9 +56,7 @@
     <div t-name="mail.Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_action">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
-            </div>
+            <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index cb2ed1eec19..1b19a383c10 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -292,4 +292,43 @@ class mail_compose_message(osv.osv_memory):
             return tools.ustr(result)
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
+
+
+class mail_compose_message_extended(osv.osv_memory):
+    """ 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)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            result.update({
+                'model': model,
+                'res_id': res_id,
+                'email_from': user.user_email or tools.config.get('email_from', False),
+                'email_to': data.email_from or False,
+                'email_cc': tools.ustr(data.email_cc or ''),
+                'subject': data.name or False,
+                'body_text': '\n' + tools.ustr(user.signature or ''),
+                'subtype': 'plain',
+            })
+            if hasattr(data, 'section_id'):
+                result['reply_to'] = data.section_id and data.section_id.reply_to 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 3da63fb1adc..bcc11c4111d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
-                    <header>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -33,6 +28,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index a6294182301..417bd694624 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -439,7 +439,7 @@ class marketing_campaign_activity(osv.osv):
         'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
         'signal': fields.char('Signal', size=128,
                               help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
-        'keep_if_condition_not_met': fields.boolean("Don't delete workitems",
+        'keep_if_condition_not_met': fields.boolean("Don't Delete Workitems",
                                                     help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.")
     }
 
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 41ed78da709..6a06cb33f1d 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -9,6 +9,22 @@
     Marketing Campaign
     ======================
     -->
+    <act_window name="All Segments"
+        res_model="marketing.campaign.segment"
+        src_model="marketing.campaign"
+        view_type="form"
+        view_mode="tree,form"
+        id="act_marketing_campaing_segment_opened"
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
+    />
+
+    <!-- Campaign Followups -->
+    <act_window
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
+        id="act_marketing_campaing_followup"
+        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
+        src_model="marketing.campaign" view_mode="tree,form"
+        view_type="form" />
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -24,20 +40,30 @@
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
             <sheet string="Campaign">
+                <div class="oe_right oe_button_box" name="button_box">
+                        <button type="action"
+                        name="%(act_marketing_campaing_followup)d"
+                        string="Follow-Up" />
+                        <button type="action"
+                        name="%(act_marketing_campaing_segment_opened)d"
+                        string="Segments" />
+                </div>
+                <div class="oe_title">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name" class="oe_inline"/></h1>
+                </div>
                 <group>
-                    <group string="Campaign">
-                        <field name="name"/>
+                    <group>
                         <field name="mode"/>
+                        <field name="fixed_cost"/>
                     </group>
-                    <group string="Resource">
+                    <group>
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
-                    </group>
-                    <group string="Cost">
-                        <field name="fixed_cost"/>
-                    </group>
+                    </group>     
                 </group>
+                <separator string="Activities"/>
                 <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
             </sheet>
             </form>
@@ -143,16 +169,11 @@
             </header>
             <sheet string="Segments" >
                 <group>
-                    <group string="Segment">
+                    <group>
                         <field name="name"/>
                         <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
                         <field name="object_id" invisible="1"/>
-                    </group>
-                    <group string="Filter">
-                        <field name="ir_filter_id"/>
-                    </group>
-                    <group string="Synchronization">
-                       <field name="sync_mode" required="True"/>
+                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
                            <field name="sync_last_date" class="oe_inline"/>
@@ -160,7 +181,8 @@
                        </div>
                        <field name="date_next_sync"/>
                     </group>
-                    <group string="History">
+                    <group>
+                        <field name="ir_filter_id"/>
                         <field name="date_run" readonly="1"/>
                         <field name="date_done" readonly="1"/>
                     </group>
@@ -243,33 +265,34 @@
         <field name="arch" type="xml">
             <form string="Activities" version="7.0">
                 <group>
-                    <group string="Activity">
+                    <group>
                         <field name="name"/>
                         <field name="signal" groups="base.group_no_one"/>
                         <field name="start"/>
                         <field name="object_id" invisible="1"/>
                         <field name="campaign_id" invisible="1"/>
                     </group>
-                    <group string="Cost / Revenue">
+                    <group>
                         <field name="variable_cost"/>
                         <field name="revenue"/>
                     </group>
                 </group>
-                <group string="Condition" col="4">
-                    <field name="condition" widget="char" colspan="4"/>
-                    <field name="keep_if_condition_not_met"/>
-                </group>
-                <group col="4">
-                    <separator string="Action" colspan="4"/>
-                    <field name="type"/>
-                    <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                <group >
+                    <group>
+                        <field name="condition" widget="char"/>
+                        <field name="keep_if_condition_not_met"/>
+                    </group>
+                    <group>
+                        <field name="type"/>
+                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
                            context="{'default_model_id':object_id}" />
-                    <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
-                    <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
-                    <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
+                        <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
+                        <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                    </group>
                 </group>
-                <separator string="Transitions"/>
-                <field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}">
+                <separator string="Previous Activities"/>
+                <field name="from_ids" mode="tree" context="{'default_activity_to_id': active_id}">
                     <tree string="Incoming Transitions" editable="bottom">
                         <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                         <field name='trigger'/>
@@ -285,7 +308,8 @@
                         </group>
                     </form>
                 </field>
-                <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
+                <separator string="Next Activities"/>
+                <field name="to_ids" mode="tree" context="{'default_activity_from_id': active_id}">
                     <tree string="Outgoing Transitions" editable="bottom">
                         <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                         <field name='trigger'/>
@@ -363,12 +387,13 @@
             </header>
             <sheet>
                 <group>
-                    <group string="Campaign Step">
+                    <group>
                         <field name="campaign_id"/>
                         <field name="segment_id"/>
                         <field name="activity_id" context="{'segment_id':segment_id}"/>
                         <field name="date"/>
-                    </group><group string="Related Resource">
+                    </group>
+                    <group>
                         <field name="object_id" readonly="True"/>
                         <field name="res_name"/>
                         <field name="res_id"/>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 7c26f5486ce..e97ad7445df 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
-                    <header>
-                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
                         <field name="member_price"/>
                     </group>
+                    <footer>
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9da070bc0f2..6fe3d61a804 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -796,7 +796,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -957,9 +957,8 @@
                 </xpath>
                 <xpath expr="//field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
-                    <separator colspan="4" string="Properties" />
-                    <field colspan="4" name="property_ids" nolabel="1"/>
-                     </group>
+                        <field colspan="4" name="property_ids" widget="many2many_tags"/>
+                    </group>
                 </xpath>
                </data>
             </field>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 48938972f60..db337c9b178 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Logistics">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
-                        </group>
-                    </sheet>
+                    <group string="Manufacturing Order">
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                    </group>
+                    <group string="Logistics">
+                        <field name="module_mrp_jit"/>
+                        <field name="module_stock_no_autopicking"/>
+                    </group>
+                    <group string="Bill Of Material">
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </group>
+                    <group string="Products">
+                        <field name="module_product_manufacturer"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index cd6b8db2195..5d254f86b4e 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -80,3 +80,4 @@ access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,pro
 access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
 access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
 access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
+access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index ee7f5eeb258..87b180f0aad 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty" version="7.0">
-                    <header>
-                        <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>
                         <newline/>
                         <field name="product_qty"/>
                     </group>
+                    <footer>
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 6ba09ecbdb0..f8aaa7e3c5d 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Print Cost Structure of Product.">
                         <field name="number"/>
                     </group>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 23a51642630..72d0ccfcaa2 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -11,15 +11,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
-                    <header>
-                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Produce">
                         <field name="mode"/>
                         <field name="product_qty" colspan="2"/>
                     </group>    
+                    <footer>
+                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b40be0df0ac..439e180ca3c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select time unit" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <sheet>
                         <group>
                             <field name="time_unit"/>
                             <field name="measure_unit"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a0b318661e6..85cbaca0cbc 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -112,7 +112,7 @@
                 </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index ee0e47e1da3..b90d822121a 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
-                    <header>
-                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                     </group>
+                    <footer>
+                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>         
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18eac5ce89..ca4690df210 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
-                <header>
-                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
                 </group>
-                </form>
+                <footer>
+                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
             </field>
         </record>
 
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 7c012237dd6..e91c8158d19 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,1,1,1
-access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,0,0,0
+access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,0,0,0
+access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,1,1,1
+access_mrp_subproduct_all,mrp.subproduct,model_mrp_subproduct,base.group_user,1,0,0,0
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index ce858ab93b6..ac3e2983d30 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-08 02:57+0000\n"
+"PO-Revision-Date: 2012-07-11 05:37+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-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -765,7 +765,7 @@ msgstr "小計の合計"
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr "受注行"
+msgstr "オーダー行"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index 08133114e81..06356dc4253 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/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-07-02 15:03+0000\n"
+"PO-Revision-Date: 2012-07-12 08:29+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-07-03 05:35+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-13 04:46+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -1393,7 +1393,7 @@ msgstr "Kassabon afdrukken"
 #. module: point_of_sale
 #: field:pos.make.payment,journal:0
 msgid "Payment Mode"
-msgstr "Betalingsvorm"
+msgstr "Betaalwijze"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index a8a69b2ff69..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </header>
                     <group>
                         <field name="user_id"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index cd556fbb6de..fef823fe403 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -10,14 +10,14 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
-                    <header>
-                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />  
-                    </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>
                     </group>    
+                    <footer>
+                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />  
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index f197daeebff..09005712b78 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
+                    <footer>
                         <button name= "create_returns" string="Return Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 26de67584a6..b903cc5bf53 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,21 +17,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
-                    <header>
+                    <group>
+                        <field name="partner_id" invisible="1"/>
+                        <field name="portal_id" widget="selection"/>
+                    </group>
+                    <label for="user_ids"/>
+                    <field name="user_ids"/>
+                    <field name="message" placeholder="This text will be included in the welcome email sent to users."/>
+                    <footer>
                         <button string="Apply"
                             name="action_manage_portal_access" type="object" class="oe_highlight"  />
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group>
-                        <field name="partner_id" invisible="1"/>
-                        <field name="portal_id" on_change="onchange_portal_id(partner_id, portal_id)"/>
-                    </group>
-                    <separator string="Users"/>
-                    <field name="user_ids"/>
-                    <separator string="Message"/>
-                    <field name="message" placeholder="This text will be included in the welcome email sent to users."/>
-
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fde8b4ea2fe..3b0404d376b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -94,7 +94,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index de371db211f..5e18892f464 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <header>
-                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <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)"/>
@@ -23,6 +18,11 @@
                         <field name="date_planned"/>
                         <field name="warehouse_id"/>
                     </group>
+                    <footer>
+                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 6e6b038d9fa..ab98e598a3d 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
+                    <group>
+                        <label string="This wizard will schedule procurements."/>
+                    </group>
+                    <footer>
                         <button name="procure_calculation" string="Compute Procurements"
                             type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
-                    <group>
-                        <label string="This wizard will schedule procurements."/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 340624fc822..5a29959949e 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     </group>
                     <group col="2">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index dc25dc4c7ef..01712a0cedd 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ea29292f445..75882c4f5dd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -155,7 +155,6 @@ class product_pricelist(osv.osv):
 
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')
-        product_template_obj = self.pool.get('product.template')
         product_category_obj = self.pool.get('product.category')
         product_uom_obj = self.pool.get('product.uom')
         supplierinfo_obj = self.pool.get('product.supplierinfo')
@@ -246,7 +245,7 @@ class product_pricelist(osv.osv):
                             price = 0.0
                             if sinfo:
                                 qty_in_product_uom = qty
-                                product_default_uom = product_template_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+                                product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
                                 supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
                                 seller_uom = supplier.product_uom and supplier.product_uom.id or False
                                 if seller_uom and product_default_uom and product_default_uom != seller_uom:
diff --git a/addons/product/product.py b/addons/product/product.py
index a81074aa56e..3cbff880cf9 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -559,8 +559,8 @@ class product_product(osv.osv):
         return False
 
     def _check_ean_key(self, cr, uid, ids, context=None):
-        for product in self.browse(cr, uid, ids, context=context):
-            res = check_ean(product.ean13)
+        for product in self.read(cr, uid, ids, ['ean13'], context=context):
+            res = check_ean(product['ean13'])
         return res
 
     _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0fb0b0559f9..cdf4d48c904 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -184,7 +184,7 @@
                         </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index d1a1b4b3a11..dbc57c4f6e7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,11 +10,6 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
                         <field name="qty1"/>
@@ -23,6 +18,11 @@
                         <field name="qty4"/>
                         <field name="qty5"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 26e40b77189..f174c6af445 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
                         <field name="to_date" />
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 5d833ea6b53..48e3c4a8283 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -47,7 +47,6 @@ class sale_order_line(osv.osv):
             item_obj = self.pool.get('product.pricelist.item')
             price_type_obj = self.pool.get('product.price.type')
             product_obj = self.pool.get('product.product')
-            template_obj = self.pool.get('product.template')
             field_name = 'list_price'
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -57,9 +56,7 @@ class sale_order_line(osv.osv):
                     field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
-            product_tmpl_id = product.product_tmpl_id.id
-
-            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
             if uom and uom != product.uom_id.id:
@@ -110,7 +107,6 @@ class account_invoice_line(osv.osv):
             item_obj = self.pool.get('product.pricelist.item')
             price_type_obj = self.pool.get('product.price.type')
             product_obj = self.pool.get('product.product')
-            template_obj = self.pool.get('product.template')
             field_name = 'list_price'
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -120,9 +116,7 @@ class account_invoice_line(osv.osv):
                     field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
-            product_tmpl_id = product.product_tmpl_id.id
-
-            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
             if uom and uom != product.uom_id.id:
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index ea508ead52c..d17da5727b3 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.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: 2010-08-03 09:16+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 12:24+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:12+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 "Language: hr\n"
 
 #. module: project
@@ -108,7 +108,7 @@ msgstr "Sati za procjenu"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projekti na čekanju"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -191,7 +191,7 @@ msgstr "Tvrtka"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -206,7 +206,7 @@ msgstr ""
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "Postavite u tijeku"
+msgstr "Staviti na čekanje"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -281,7 +281,7 @@ msgstr "Zadatak"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: project
 #: view:board.board:0
@@ -641,7 +641,7 @@ msgstr "Srednji"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -705,7 +705,7 @@ msgstr ""
 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Pending"
-msgstr "U toku"
+msgstr "Na čekanju"
 
 #. module: project
 #: field:project.task.delegate,name:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..8e9ece1452f 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project/project.py b/addons/project/project.py
index 487daa834bb..aa9316aec1b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -215,7 +215,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        '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'),
@@ -236,6 +236,7 @@ class project(osv.osv):
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
+        'privacy_visibility': 'public',
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -713,14 +714,14 @@ class task(base_stage, osv.osv):
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
-        'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+        'planned_hours': fields.float('Initially Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
         'effective_hours': fields.function(_hours_get, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
-        'total_hours': fields.function(_hours_get, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
+        'total_hours': fields.function(_hours_get, string='Total', multi='hours', help="Computed as: Time Spent + Remaining Time.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
@@ -1221,7 +1222,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Management',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 Mgmt.',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_view.xml b/addons/project/project_view.xml
index cf501740456..d2edef8d7a8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -82,17 +82,12 @@
                     <h1>
                         <field name="name" string="Project Name"/>
                     </h1>
-                    <label for="parent_id" class="oe_edit_only" string="Parent Project"/>
-                    <h2>
-                        <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                    </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
-                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                         <group>
                             <table>
@@ -139,6 +134,7 @@
                                     <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'}"/>
                                 </group>
                             </group>
                         </page>
@@ -148,7 +144,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -239,7 +235,7 @@
                         <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 class="oe_dropdown_toggle oe_dropdown_kanban">
-                                    <span class="oe_e">i</span>
+                                    <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit">Edit...</a></li>
                                         <li><a type="delete">Delete</a></li>
@@ -404,11 +400,9 @@
                                     states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
-                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="cancelled" context="{'button_reactivate':True}"/>
+                                    states="cancelled,done" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending"/>
+                                    states="draft,open,pending" class="oe_highlight"/>
                             <button name="do_pending" string="Pending" type="object"
                                     states="open"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
@@ -417,7 +411,7 @@
                                     states="draft,open,pending"/>
                             <button name="stage_previous" string="Previous Stage" type="object"
                                     states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                            <button name="stage_next" string="Next Stage" type="object"
+                            <button name="stage_next" string="Next Stage" type="object" class="oe_highlight"
                                     states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         </span>
                         <field name="stage_id" widget="statusbar"/>
@@ -427,23 +421,16 @@
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id"  on_change="onchange_project(project_id)"/>
-                    </h2>
                     <group>
                         <group>
+                            <field name="project_id"  on_change="onchange_project(project_id)"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
                             <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <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="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks"
-                                invisible="1"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
@@ -457,14 +444,15 @@
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
+                            <group>
+                             <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
+                             </group>
                             </group>
                             <div class="oe_clear"/>
                         </page>
@@ -490,13 +478,16 @@
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
+                                <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"/>
                             </group>
                         </page>
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 22d43237538..3f7f3b26d96 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -83,7 +83,7 @@
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="project_report_task" />
+            parent="base.menu_project_report" />
 
 
         <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 30d8717efb6..36e025ab509 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -54,7 +54,6 @@ class report_project_task_user(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'type_id': fields.many2one('project.task.type', 'Stage', readonly=True),
     }
     _order = 'name desc, project_id'
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a5711239f87..40235ad03b7 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,8 +5,6 @@
         <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
             parent="base.menu_reporting" sequence="25"/>
-        <menuitem id="project_report_task" name="Tasks Analysis"
-            parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -23,7 +21,6 @@
                     <field name="date_end" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="type_id" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
@@ -101,7 +98,6 @@
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
-                        <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -115,7 +111,6 @@
                         <separator orientation="vertical"/>
                         <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="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
                         <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"/>
@@ -135,7 +130,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
     </data>
 </openerp>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ff1511d49f2..b6497e56d62 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,28 +12,26 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Project">
-                            <group>
-                                <field name="module_project_mrp"/>
-                                <field name="module_project_timesheet"/>
-                                <field name="module_pad"/>
-                            </group>
-                            <group>
-                                <field name="group_tasks_work_on_tasks"/>
-                                <field name="group_time_work_estimation_tasks"/>
-                                <field name="group_manage_delegation_task"/>
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                            </group>
+                    <group string="Project">
+                        <group>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
                         </group>
-                        <group string="Planning">
-                            <field name="module_project_long_term"/>
+                        <group>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
+                            <field name="group_manage_delegation_task"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                         </group>
-                        <group string="Helpdesk and Support" name="support">
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                        </group>
-                    </sheet>
+                    </group>
+                    <group string="Planning">
+                        <field name="module_project_long_term"/>
+                    </group>
+                    <group string="Helpdesk and Support" name="support">
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 8cea913984d..b6fd90c948f 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1
-access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1
+access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0
+access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1
+access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
@@ -8,7 +10,9 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
-access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1
+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,1
+access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1
 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7dd1cdb9465..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
-                    <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="project_id" on_change="onchange_project_id(project_id)"/>
@@ -30,6 +25,11 @@
                             <field name="state"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 066f15582b4..84436c045a6 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
-                    <header>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Reevaluation Task"/>
                     <group>
                         <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index aa81b9d6c43..ca6a4d5f7a4 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
-                    <header>
-                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                    <footer>
+                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index fcd18045839..6ef4c5b71d2 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 23:10+0000\n"
+"PO-Revision-Date: 2012-07-09 05:11+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-06-13 04:56+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -398,7 +398,7 @@ msgstr "プロジェクトの問題"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr "コミュニケーションと履歴"
+msgstr "通信と履歴"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -836,10 +836,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"事象が作成されると、状態はドラフトにセットされます。\n"
-"事象が進行中になると、状態は開くにセットされます。\n"
-"事業が終了すると、状態は完了にセットされます。\n"
-"事象がレビューが必要な場合、状態は保留中にセットされます。"
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index fea7a64d2b7..5f9b0a369ca 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,9 +27,6 @@ from tools.translate import _
 import binascii
 import time
 import tools
-from crm import wizard
-
-wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue')
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -50,6 +47,7 @@ class project_issue(base_stage, osv.osv):
     _description = "Project Issue"
     _order = "priority, create_date desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index cdcea2cbb62..13e60ccd7be 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -119,26 +119,35 @@
                 <sheet string="Issue">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2><field name="project_id" required="True" on_change="on_change_project(project_id)"/></h2>
                     <group>
                         <group>
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                        </group><group>
-                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                            <field name="version_id" widget="selection"/>
+                        </group>
+                        <group>
                             <field name="priority"/>
-                            <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                            <field name="state" groups="base.group_no_one"/>
+                            <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
+                            <label for="task_id"/>
+                            <div>
+                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline"/>
+                                <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
+                            </div>
                         </group>
                     </group>
-                    <field name="description" placeholder="Add a description..."/>
-
-                    <notebook groups="base.group_no_one">
-                        <page string="Extra Info">
+                    <notebook>
+                        <page string="Description">
+                            <group>
+                                <group>
+                                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                                </group>
+                                <group>
+                                    <field name="version_id" widget="selection"/>
+                                </group>
+                            </group>
+                            <field name="description" placeholder="Add a description..."/>
+                        </page>
+                        <page string="Extra Info" groups="base.group_no_one">
                             <group col="4" colspan="4">
                                 <separator string="Statistics" colspan="4" col="4"/>
                                 <field name="day_open"/>
@@ -153,11 +162,15 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
+                            <group colspan="4" col="4">
+                                <separator string="Status" colspan="4"/>
+                                <field name="state" groups="base.group_no_one" string="Status"/>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 4708a6fdcd6..789f93b5175 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -9,3 +9,5 @@ access_resource_calendar_project_manager,resource.calendar.project.manager,resou
 access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
 access_mail_message_issue_project_user,mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
 access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0
+access_project_issue_salesman,project.issue,model_project_issue,base.group_sale_salesman,1,0,0,0
+access_project_issue_manager,project.issue,model_project_issue,base.group_sale_manager,1,0,0,0
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2a98f186922..cb2d1f70c96 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -10,11 +10,14 @@
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
-                <xpath expr="//notebook" position="before">
-                    <field name="analytic_account_id"
-                        domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
-                        on_change='on_change_account_id(analytic_account_id)'/>
-                </xpath>
+                <field name="active" position="after">
+                    <newline/>
+                    <group colspan="4"> 
+                        <field name="analytic_account_id"
+                            domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                            on_change='on_change_account_id(analytic_account_id)'/>
+                    </group>
+                </field>
                 <xpath expr="//notebook/page[@string='Extra Info']" position="before">
                     <page string="Worklogs">
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a98e9088402..7d7310465d6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -155,20 +155,21 @@
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="project_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                        </h2>
                     </div>
                     <group>
-                    <label for="date_start" string="Duration"/>
-                    <div>
-                        <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
-                        </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
-                    </div>
+                        <group>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <div>
+                                    <field name="duration" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
@@ -211,10 +212,9 @@
                                 </group>
                                 <group>
                                     <field name="sequence"/>
+                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                             </group>
-                           <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
@@ -327,7 +327,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 6ca496f691d..2a00088b8f4 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -7,3 +7,6 @@ access_resource_resource_user,user.user user,resource.model_resource_resource,pr
 access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
+
+
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8439244d717..0d5c81984ba 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
-                          or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 17779ffa268..8eb9db762dd 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index e3056d29d96..47f4d277089 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/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:37+0000\n"
-"PO-Revision-Date: 2012-06-24 16:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-11 03:11+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-06-25 05:15+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -45,12 +45,12 @@ msgid ""
 "Fill in the timesheet tab of the employee form."
 msgstr ""
 "Холбогдох ажилтанд журнал тодорхойлогдоогүй байна.\n"
-"Ажилтны формын цагийн хуваарь хавтасыг бөглө."
+"Ажилтны формын цагийн хуудас хавтасыг бөглө."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr "Цагийн хуваарийн даалгавар"
+msgstr "Цагийн хуудсын даалгавар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -90,31 +90,33 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"Та төсөлд оноогдсон харилцагчийг устгах боломжгүй, тиймээс идэвхтэй "
+"тэмдэглэгээг арилгахыг зөвлөе!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Цагийн хуудас/Даалгавар цагийн тайлан сарын хэмжээнд"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -122,225 +124,227 @@ msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
 msgstr ""
+"Энд захиалагчийн төсөлтэй холбогдсон гэрээнүүдийг харах болно. Энэ нь "
+"нэхэмжлэх явцыг зөвх хянахад туслана."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Шинжилгээний данс/төсөл"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Даалгаврын цагууд"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Захиалагчийн төслууд"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Шинжилгээний мөр"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Даалгаврын нэхэмжлэл"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Даалгаврын ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Цагийн хуудсын мөрүүд"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:231
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Алдаатай үйлдэл !"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой Төсөл"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Шинэчлэх Гэрээнүүд"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Орох/Гарах үйлдлийг төслөөр харах"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Огнооны сараар бүлэглэх"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Даалгавар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Цагийн Хуудсаа Гүйцээ"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "Энэ жилийн даалгаврын цаг"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Захиалагч"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Даалгавар дахь ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Даалгаврын ажлуудын тооцоо"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Цагийн хуудас дахь цагууд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Даалгаврыг шивнэ үү"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Даалгаврын товчоо нь цагийн хуудсын мөр рүү очдог."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийг Үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "Өнгөрсөн сарын ажлын цагууд"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Төсөл"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Нэхэмжлэх өгөгдөл"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Өөрийн даалгавар дээр хичнээн цаг зарцуулснаа оруулна уу"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "Буруу Шинжилгээний Данс  !"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -349,6 +353,8 @@ msgid ""
 "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтас дээр бөглөнө үү."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:54
@@ -357,17 +363,17 @@ msgstr ""
 #: code:addons/project_timesheet/project_timesheet.py:69
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Буруу Тохиргоо !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
@@ -375,57 +381,58 @@ msgstr ""
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
 msgstr ""
+"Хаагдсан эсвэл Цуцлагдсан төлөвтэй Шинжилгээний Дансыг сонгох боломжгүй"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Сар-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Даалгавар дуусмагц харгалзах нэхэмжлэл үүсгэнэ."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Өөрийн цагийн хуудас"
 
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Харагдац төрлийн данс дээр шинжилгээний мөрийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:70
@@ -435,15 +442,18 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа болон барааны ангилалын үзүүлэлтийн данс "
+"тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтсыг бөглөнө үү."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Даалгаврын цагууд сарын хэмжээнд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Цагийн хуудсыг бөглөх"
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2e2ec7f2677..4d3d288b981 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -88,7 +88,7 @@
 
         <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
-            <field name="name">Bill Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 6bc424ce60c..7e79b3793b7 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -66,7 +66,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{'search_default_year':1,'search_default_month':1, 'search_default_group_user_id':1}</field>
         </record>
-        <menuitem id="menu_timesheet_task_user" parent="hr_timesheet.menu_hr_reporting_timesheet"
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting_timesheet"
                     action="action_report_timesheet_task_user" sequence="1"/>
 
     </data>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 85ccf63e19f..24143531f53 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,3 +2,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_report_timesheet_task_user_manager,report.timesheet.task.user.manager,model_report_timesheet_task_user,project.group_project_manager,1,1,1,1
 access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
 access_hr_timesheet_sheet_sheet_user,hr.timesheet.sheet.sheet.user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
+access_sale_order_manager,sale.order,sale.model_sale_order,project.group_project_manager,1,0,0,0
+access_sale_order_user,sale.order,sale.model_sale_order,project.group_project_user,1,0,0,0
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d5a9b93f9ea..0be6b8ddf8c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -257,7 +257,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                   <field name="message_ids" widget="ThreadView"/>
+                   <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 06b06c7bae4..1e8588bf618 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Invoicing">
-                            <field name="default_invoice_method"/>
-                            <field name="decimal_precision"/>
+                    <group string="Invoicing">
+                        <field name="default_invoice_method"/>
+                        <field name="decimal_precision"/>
+                    </group>
+                    <group string="Purchase Order">
+                        <group>
+                            <field name="group_purchase_pricelist"/>
+                            <field name="group_uom"/>
+                            <field name="group_purchase_delivery_address"/>
                         </group>
-                        <group string="Purchase Order">
-                            <group>
-                                <field name="group_purchase_pricelist"/>
-                                <field name="group_uom"/>
-                                <field name="group_purchase_delivery_address"/>
-                            </group>
-                            <group>
-                                <field name="module_purchase_double_validation"/>
-                                <field name="module_purchase_requisition"/>
-                                <field name="module_warning"/>
-                                <field name="module_purchase_analytic_plans"/>
-                            </group>
+                        <group>
+                            <field name="module_purchase_double_validation"/>
+                            <field name="module_purchase_requisition"/>
+                            <field name="module_warning"/>
+                            <field name="module_purchase_analytic_plans"/>
                         </group>
-                    </sheet>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index b19a62bf5d1..c45b8a9b070 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -64,3 +64,4 @@ access_account_account_purchase_manager,account.account purchase manager,account
 access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
 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
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 9ece8f0eb04..c15c8e4fe09 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
-                    <header>
-                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
                     </group>
+                    <footer>
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index d82d6f7fb2f..17b1f7eea5f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
-                    <header>
-                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
                         <label string="
@@ -25,6 +20,11 @@ Lines will only be merged if: &#10;
 " colspan="4"/>
                     </group>
                     
+                    <footer>
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2cfde675b77..d8c2d0124b6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -105,7 +105,7 @@
                 </notebook>
             </sheet>
             <footer>
-                  <field name="message_ids" widget="ThreadView"/>
+                  <field name="message_ids" widget="mail_thread"/>
             </footer> 
             </form>
         </field>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index ed6de182f99..aab257827c2 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
-                    <header>
-                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="partner_id"/>
                     </group>
+                    <footer>
+                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index ce410da232e..3d4b5bce6bb 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
-                    <header>
-                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="print_button"/>
                         <field name="open_action"/>
                     </group>
+                    <footer>
+                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index c399e0333b0..5fed5b96218 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -262,8 +262,8 @@ class resource_calendar_attendance(osv.osv):
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
         'date_from' : fields.date('Starting Date'),
-        'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from", select=True),
-        'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
+        'hour_from' : fields.float('Work from', required=True, help="Start and End time of working.", select=True),
+        'hour_to' : fields.float("Work to", required=True),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
     
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ebcd9c8a25a..1408b70fca7 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -120,11 +120,12 @@
             <field name="model">resource.calendar.attendance</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Working Time">
+                <tree string="Working Time" editable="top">
                     <field name="name"/>
                     <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time" />
-                    <field name="hour_to" widget="float_time" />
+                    <field name="hour_from" widget="float_time"/>
+                    <field name="hour_to" widget="float_time"/>
+                    <field name="date_from"/>
                 </tree>
             </field>
         </record>
@@ -135,11 +136,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <field name="date_from"/>
-                    <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
+                    <group> 
+                        <field name="name"/>
+                        <field name="date_from"/>
+                        <field name="dayofweek"/>
+                        <label for="hour_from" string="Hours"/>
+                        <div>
+                            <field name="hour_from" widget="float_time" class="oe_inline"/> - 
+                            <field name="hour_to" widget="float_time" class="oe_inline"/>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
@@ -179,16 +185,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Resource" version="7.0">
-                   <group col="4">
-                       <field name="name" colspan="4"/>
-                       <field name="active"/>
-                       <newline/>
-                       <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
-                       <field name="resource_type" />
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       <newline/>
-                       <field name="calendar_id" string="Working Period"/>
-                       <field name="time_efficiency"/>
+                   <group>
+                      <group>
+                        <field name="name"/>
+                        <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="active"/>
+                       </group>
+                       <group>
+                        <field name="resource_type" />
+                        <field name="calendar_id"/>
+                        <field name="time_efficiency"/>
+                       </group>
                     </group>
                 </form>
             </field>
@@ -204,7 +212,7 @@
                     <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
-                    <field name="calendar_id" string="Working Period"/>
+                    <field name="calendar_id"/>
                     <field name="time_efficiency"/>
                 </tree>
             </field>
@@ -225,25 +233,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
-                    <sheet>
+                    <group>
+                        <group>
+                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+                            <field name="name" string="Reason"/>
+                        </group>
+                        <group>
+                            <field name="calendar_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </group>
                     <group>
                        <group>
-                           <field name="resource_id" on_change="onchange_resource(resource_id)"/>
-                           <field name="name" string="Reason"/>
+                         <label for="date_from" string="Duration"/> 
+                         <div>
+                           <field name="date_from" class="oe_inline"/> - 
+                           <field name="date_to" class="oe_inline"/>
+                         </div>
                        </group>
-                       <group>
-                           <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period"/>
-                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       </group>
-                       <group>
-                           <field name="date_to"/>
-                       </group>
-                   </group>
-                   </sheet>
+                    </group>
                 </form>
             </field>
         </record>
+        
         <record id="resource_calendar_leave_tree" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.tree</field>
             <field name="model">resource.calendar.leaves</field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0a3ebbe72ac..611389d3d68 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -845,7 +845,8 @@ class sale_order(osv.osv):
             'procure_method': line.type,
             'move_id': move_id,
             'company_id': order.company_id.id,
-            'note': line.notes
+            'note': line.notes,
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])]
         }
 
     def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 46cf4905ff7..f586305573b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -175,7 +175,6 @@
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
 
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
@@ -235,9 +234,8 @@
                                             <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
+                                            <field name="property_ids" widget="many2many_tags"/>
                                         </group>
-                                        <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids" colspan="4" nolabel="1"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
                                         <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>
@@ -321,7 +319,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -370,7 +368,7 @@
             <field name="context">{"search_default_sales":1}</field>
             <field name="help">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.</field>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -413,7 +411,7 @@
 
         <menuitem id="menu_sale_quotations"
         action="action_order_tree5" parent="base.menu_sales"
-        sequence="3"/>
+        sequence="4"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 721d706a5fb..617678eccbe 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -57,4 +57,6 @@ access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,pr
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
-access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
\ No newline at end of file
+access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
+access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
+access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 90dee9e022a..2c6e158a939 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-08 09:02+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-06 21:31+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-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -105,13 +105,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 "オポチュニティの'%s' は、見積りへ変わりました。"
+msgstr "オポチュニティの'%s' は、見積に変換されました。"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 835e5aa80cc..ef7546107c2 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
-                <header>
-                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
+                <footer>
+                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index a0f117b61e5..4f0f0f8072c 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
+access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 58734caa25b..ad4df1a5193 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
-                    <header>
-                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
                     <group>
@@ -21,6 +16,11 @@
                             string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
                         <field name="domain"/>
                     </group>
+                    <footer>
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -31,11 +31,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
@@ -60,6 +55,11 @@
                             <field name="access_mode"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -70,10 +70,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
-                    <header>
-                        <field name="user_type" invisible="1"/>
-                        <field name="access_mode" invisible="1"/>
-                    </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}"
                         string="An email notification with instructions has been sent to the following people:">
                         <field name="result_line_ids" nolabel="1" mode="tree">
@@ -100,6 +96,10 @@
                                 attrs="{'invisible':[('access_mode','=','readonly')]}"/>
                         </group>
                     </group>
+                    <footer>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </footer>
 
                 </form>
             </field>
diff --git a/addons/stock/i18n/es_DO.po b/addons/stock/i18n/es_DO.po
new file mode 100644
index 00000000000..bd0338efbaf
--- /dev/null
+++ b/addons/stock/i18n/es_DO.po
@@ -0,0 +1,3984 @@
+# Spanish (Dominican Republic) 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-07-03 19:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Dominican Republic) <es_DO@li.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-07-04 04:38+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. 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, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
+msgid "Product Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. 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
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
+#: field:stock.split.into,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr "Ordenes de entrega a facturar"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr "Ordenes de Entrega Asignadas"
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1149
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2119
+#, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "No invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr ""
+
+#. 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
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
+msgid "Available"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
+msgid "Location Type"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,type:0 help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2125
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
+#, python-format
+msgid "Reception"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Production Lot Revisions"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.location,complete_name:0 field:stock.location,name:0
+msgid "Location Name"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr ""
+
+#. 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 "
+"suppliers. 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 ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Move Information"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:417
+#, python-format
+msgid "Future Receptions"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Now"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Production lot is used to put a serial number on the production"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:433
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+#: 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 ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Pickings already processed"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Inventory Properties"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1349
+#, python-format
+msgid "is waiting."
+msgstr ""
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:147
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1332
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 view:stock.move:0
+msgid "Supplier"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Expected Shipping Date"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. 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.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Ready"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
+msgid "Waiting"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Split"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:92
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2312
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2337
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2358
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:429
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
+#. 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, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1157
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: field:product.product,location_id:0 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.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,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 ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Later"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.warehouse,partner_address_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2122
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:419
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.incoterms,name:0 field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
+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 ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
+msgid "Cost"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1341
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/product.py:175
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:89
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:439
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:435
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: 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
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: 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
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: 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 ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:121
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2445
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr ""
+
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1743
+#, python-format
+msgid ""
+"You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0 field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1082
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1334
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr ""
+
+#. module: stock
+#: view:product.category:0
+msgid "Accounting Stock Properties"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1083
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_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.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,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
+#: field:stock.return.picking.memory,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1742
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "New Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1698
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:445
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr ""
+
+#. module: stock
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. 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.split.into:0
+msgid "Ok"
+msgstr ""
+
+#. 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, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories?"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1348
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+#: 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.picking:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
+msgid "Merge Inventories"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.next_id_61
+msgid "Reporting"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1343
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to Leave in the Current Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:427
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1346
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: code:addons/stock/product.py:441
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:423
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. 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 ""
+
+#. 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
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+msgid "Production Lot"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. 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 ""
+
+#. 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, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
+msgid "Production"
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
+msgid "Upstream traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:447
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
+#. 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
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
+
+#. 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 ""
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index cd0cc1d2155..524432fd1ce 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-29 23:16+0000\n"
+"PO-Revision-Date: 2012-07-11 05:35+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-07-01 04:39+0000\n"
-"X-Generator: Launchpad (build 15520)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 62fdbb24ca2..e4164ef9e1f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -243,13 +243,16 @@ class product_product(osv.osv):
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
         
-        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
-        uoms_o = {}
         # this will be a dictionary of the product UoM by product id
         product2uom = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-            uoms_o[product.uom_id.id] = product.uom_id
+        uom_ids = []
+        for product in self.read(cr, uid, ids, ['uom_id'], context=context):
+            product2uom[product['id']] = product['uom_id'][0]
+            uom_ids.append(product['uom_id'][0])
+        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
+        uoms_o = {}
+        for uom in self.pool.get('product.uom').browse(cr, uid, uom_ids, context=context):
+            uoms_o[uom.id] = uom
 
         results = []
         results2 = []
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 64c151af33c..f6638f22002 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,38 +13,36 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    <group string="Traceability">
+                        <field name="group_stock_production_lot"/>
+                        <field name="group_stock_tracking_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    </group>
+                    <group string="Logistics">
+                        <group>
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_invoice_directly"/>
                         </group>
-                        <group string="Logistics">
-                            <group>
-                                <field name="group_stock_multiple_locations"/>
-                                <field name="module_stock_invoice_directly"/>
-                            </group>
-                            <group>
-                                <field name="module_stock_location"/>
-                                <field name="decimal_precision"/>
-                            </group>
+                        <group>
+                            <field name="module_stock_location"/>
+                            <field name="decimal_precision"/>
                         </group>
-                        <group string="Products">
-                            <group>
-                                <field name="group_stock_packaging"/>
-                                <field name="group_uom"/>
-                                <field name="group_uos"/>
-                            </group>
-                            <group>
-                                <field name="group_stock_inventory_valuation"/>
-                                <field name="group_product_variant"/>
-                            </group>
+                    </group>
+                    <group string="Products">
+                        <group>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
+                        <group>
+                            <field name="group_stock_inventory_valuation"/>
+                            <field name="group_product_variant"/>
                         </group>
-                    </sheet>
+                    </group>
+                    <group string="Partners">
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 593dc7eb9f3..dd3e791d41a 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,10 +22,10 @@ access_stock_production_lot_user,stock.production.lot user,model_stock_productio
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1
-access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0
-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1
-access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
+access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
+access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b9a55841c0a..55be1fdc267 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -978,7 +978,7 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <footer>
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </footer>
                     </xpath>
                 </data>
@@ -1090,9 +1090,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_bottom">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
+                        <footer>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                        </footer>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 9171cbc595e..9a00a6d62ce 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -103,20 +103,14 @@ class stock_change_product_qty(osv.osv_memory):
             self.change_product_qty_send_note(cr, uid, [data.id], context)
         return {}
 
-    def change_product_qty_send_note (self, cr, uid, ids, context=None):
+    def change_product_qty_send_note(self, cr, uid, ids, context=None):
         prod_obj = self.pool.get('product.product')
         location_obj = self.pool.get('stock.location')
-        prod_temp_obj = self.pool.get('product.template')
-        uom_obj = self.pool.get('product.uom')
 
         for data in self.browse(cr, uid, ids, context=context):
-            for location in location_obj.browse(cr, uid, [data.location_id.id], context=context):
-                location_name = location.name
-            for prod in prod_obj.browse(cr, uid, [data.product_id.id], context=context):
-                for prod_temp in prod_temp_obj.browse(cr, uid, [prod.product_tmpl_id.id], context=context):
-                    for uom in uom_obj.browse(cr, uid, [prod_temp.uom_id.id], context=context):
-                        message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity,uom.name,location_name)
-                        prod_obj.message_append_note(cr, uid, [prod.id], body=message, 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)
 
 stock_change_product_qty()
 
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index dc00fdbe736..e360f5aa025 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
-                    <header>
-                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" />
                         <field name="prodlot_id" />
                     </group>
+                    <footer>
+                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 968a268a5ef..6062c946d07 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
-                  <header>
-                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Change Price"/>
                   <group>
                       <field name="new_price" string="Cost Price"/>
                   </group>
+                  <footer>
+                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ea07955eff2..75a7b13233b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
                       <field name="location_id"/>
                       <field name="recursive"/>
                       <field name="set_stock_zero"/>
                   </group>
+                  <footer>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index d8a808ed5db..5072007f210 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
@@ -45,6 +40,11 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 0dcca2de211..0386e429ee6 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
-                    <header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                    <footer>
                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Merge Inventories" />
-                    <label string="Do you want to merge theses inventories?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 46c55311045..ca294f8ec79 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -36,7 +36,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             context = {}
 
         model = context.get('active_model')
-        if not model or model != 'stock.picking':
+        if not model or 'stock.picking' not in model:
             return []
 
         model_pool = self.pool.get(model)
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 088498292ae..20f05f394fd 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
-                  <header>
-                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel"/>
-                  </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
                       <field name="group"/>
                       <field name="invoice_date" />
                   </group>
+                  <footer>
+                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel"/>
+                  </footer>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index b1f77576392..f0a52933c8a 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
                         <field name="from_date"/>
                         <field name="to_date"/>
                     </group>
                     <label string="(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)"/>
+                    <footer>
+                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 9655edf49b8..5ecfc9a85a1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <header>
-                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Consume Products">
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
@@ -23,6 +18,11 @@
                         </div>
                         <field name="location_id"/>
                     </group>
+                    <footer>
+                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -42,11 +42,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <header>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
@@ -57,6 +52,11 @@
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -76,9 +76,6 @@
                 <field name="type">form</field>
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
-                    </header>
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -113,6 +110,9 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                    </footer>
                 </form>
                 </field>
             </record>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 497467025b5..3e0699ec3d8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -21,13 +21,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
+                    <footer>
                         <button name="do_partial" string="_Validate" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Products"/>
-                    <field name="move_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c8da4459efa..fdbcabb9ed7 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -16,11 +16,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -36,6 +31,11 @@
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
+                    <footer>
+                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 06e318c295e..5cdad44f681 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -59,16 +59,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
-                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="Provide the quantities of the returned products."/>
                     <group>
                         <field name="product_return_moves"/>
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 573014b7cac..52b182a3f27 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
-                <header>
-                    <button name="split" string="Ok" type="object" class="oe_highlight" />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
                     <field name="quantity"/>
                 </group>
+                <footer>
+                    <button name="split" string="Ok" type="object" class="oe_highlight" />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index 25acc17968d..4e21f56fa79 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-03 03:46+0000\n"
+"PO-Revision-Date: 2012-07-04 23:38+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-07-03 05:36+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -69,7 +69,7 @@ msgstr "計算される前に期間内で計画された出荷です。現在の
 msgid ""
 "Warehouse which forecasts will concern. If during stock planning you will "
 "need sales forecast for all warehouses choose any warehouse now."
-msgstr "予測値が関連する倉庫。在庫計画の期間中に全ての倉庫の販売予測を必要とするなら、今、倉庫を選択して下さい。"
+msgstr "予測値が関係する倉庫です。在庫計画の期間に全ての倉庫の受注予測を必要とするなら、今、倉庫を選択して下さい。"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_left:0
@@ -116,7 +116,7 @@ msgstr "会社"
 msgid ""
 "All sales forecasts for selected Warehouse of selected Product during "
 "selected Period."
-msgstr "選択された期間の間で、選択された製品の倉庫を選択するための全ての販売予測"
+msgstr "選択した期間中に選択した製品の選択した倉庫のための全ての受注予測です。"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -172,7 +172,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,outgoing_before:0
 msgid "Planned Out Before"
-msgstr "以前計画された出荷"
+msgstr "先行計画出荷"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,forecasted_products:0
@@ -211,7 +211,7 @@ msgstr "選択された分類の中に製品がありません。"
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Stock and Sales Forecast"
-msgstr "在庫と販売予測"
+msgstr "在庫と受注予測"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
@@ -244,7 +244,7 @@ msgstr "計算する前に期間内で確認された入庫（既に入庫分を
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Search  Sales Forecast"
-msgstr "販売予測の検索"
+msgstr "受注予測の検索"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_user:0
@@ -261,7 +261,7 @@ msgstr "この計画行の調達、または内部供給の履歴"
 msgid ""
 "All sales forecasts for whole company (for all Warehouses) of selected "
 "Product during selected Period."
-msgstr "選択した期間中に選択した商品の会社全体（全ての倉庫）ための全ての販売予測です。"
+msgstr "選択した期間中に選択した製品の会社全体（全ての倉庫）ための全ての受注予測です。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_user:0
@@ -313,17 +313,17 @@ msgstr "過去 / 将来"
 #: field:stock.planning,state:0
 #: field:stock.sale.forecast,state:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category of products which created forecasts will concern."
-msgstr ""
+msgstr "作成された予測が関係するであろう製品の製品分類です。"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
 msgid "stock period"
-msgstr ""
+msgstr "在庫期間"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
@@ -336,7 +336,7 @@ msgstr ""
 #: field:stock.sale.forecast,warehouse_id:0
 #: field:stock.sale.forecast.createlines,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: stock_planning
 #: help:stock.planning,stock_simulation:0
@@ -348,21 +348,26 @@ msgid ""
 "Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
 "In."
 msgstr ""
+"選択された期間終了時の在庫シミュレーション\n"
+"　現在の期間のため：\n"
+"初期在庫 - 既出庫 + 既入庫 - 期待出庫 + 入庫残\n"
+"　その先の期間のため：\n"
+"初期在庫 - 先行計画出庫 + 先行入庫 - 計画出庫 + 計画入庫"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,analyze_company:0
 msgid "Check this box to see the sales for whole company."
-msgstr ""
+msgstr "会社の全体のための受注を見るためにこのボックスをチェックして下さい。"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "部署毎："
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
 msgid "Incoming Before"
-msgstr ""
+msgstr "先行入庫"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -384,6 +389,17 @@ msgid ""
 "  \n"
 " Stock Simulation: %s    Minimum stock: %s"
 msgstr ""
+" MPSによりユーザのために作成された調達：%s　作成日：%s　\n"
+" 期間：%s　\n"
+" 状態に応じて：　\n"
+" 倉庫予測：%s　\n"
+" 初期在庫：%s　\n"
+" 計画出庫：%s　計画入庫：%s　\n"
+" 既出庫：%s　既入庫：%s　\n"
+" 確認済出庫：%s　確認済入庫：%s　\n"
+" 先行計画出庫：%s　先行確認済入庫：%s　\n"
+" 期待出庫：%s　入庫残：%s　\n"
+" 在庫シミュレーション：%s　最小在庫：%s"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:626
@@ -394,55 +410,55 @@ msgstr ""
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
 msgid "This User"
-msgstr ""
+msgstr "このユーザ"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
-msgstr ""
+msgstr "予測"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Supply from Another Warehouse"
-msgstr ""
+msgstr "他の倉庫からの供給"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculate Planning"
-msgstr ""
+msgstr "計画の計算"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:146
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
 msgid "Stock quantity one day before current period."
-msgstr ""
+msgstr "現在の期間前の1日の在庫数量"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Procurement history"
-msgstr ""
+msgstr "調達履歴"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
 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 ""
+msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使うことができます。"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr ""
+msgstr "週毎の期間を作成"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
@@ -451,56 +467,57 @@ msgid ""
 "account periods. You can use wizard for creating periods and review them "
 "here."
 msgstr ""
+"在庫期間は在庫計画のために使用されます。在庫期間はアカウント期間から独立しています。ここからウィザードを使用して期間の作成やレビューができます。"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculated Period Simulation"
-msgstr ""
+msgstr "計算済期間シミュレーション"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "このユーザの期間4"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Stock and Sales Period"
-msgstr ""
+msgstr "在庫と受注の期間"
 
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "会社の予測"
 
 #. module: stock_planning
 #: help:stock.planning,minimum_op:0
 msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
+msgstr "最小数量はこの倉庫のために最小在庫ルールで設定します。"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "ユーザ毎："
 
 #. module: stock_planning
 #: help:stock.planning.createlines,warehouse_id:0
 msgid "Warehouse which planning will concern."
-msgstr ""
+msgstr "計画が関連する倉庫"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "作成者 / 検証者"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
 msgid "Warehouse Forecast"
-msgstr ""
+msgstr "倉庫予測"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:674
@@ -508,106 +525,106 @@ msgstr ""
 msgid ""
 "You must specify a Source Warehouse different than calculated (destination) "
 "Warehouse !"
-msgstr ""
+msgstr "計算された（到着先）倉庫と異なる、元の倉庫を指定する必要があります。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:146
 #, python-format
 msgid "Cannot delete a validated sales forecast!"
-msgstr ""
+msgstr "検証済受注予測は削除できません。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "この会社の期間5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "製品単位"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Company Period1"
-msgstr ""
+msgstr "この会社の期間1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "この会社の期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+msgstr "この会社の期間3"
 
 #. module: stock_planning
 #: field:stock.period,date_start:0
 #: field:stock.period.createlines,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
 msgid "This User Period2"
-msgstr ""
+msgstr "このユーザの期間2"
 
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "検証済予測"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
 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 ""
+msgstr "計画はこの項目により選択した製品分類の製品のために作成されます。全ての製品予測をチェックした場合、この項目は無視されます。"
 
 #. module: stock_planning
 #: field:stock.planning,planned_outgoing:0
 msgid "Planned Out"
-msgstr ""
+msgstr "計画出庫"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Forecast Quantity"
-msgstr ""
+msgstr "予測数量"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "予測"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "閉じた"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "倉庫 "
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_uom:0
 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 ""
+msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使用することができます。"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Planning and Situation for Calculated Period"
-msgstr ""
+msgstr "計算された期間のための計画と状況"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -616,54 +633,56 @@ 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 ""
+"選択した製品の選択した期間中の選択した倉庫からの計画出荷数量を入力します。出荷確認や受注予測ではこの値を見て計画します。この値は確認出荷以上である必要があ"
+"ります。"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current Periods"
-msgstr ""
+msgstr "現在期間"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Internal Supply"
-msgstr ""
+msgstr "内部供給"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:724
 #, python-format
 msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
+msgstr "%s 集荷リスト %s (%s, %s) %s %s \n"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
 msgid "Create Sales Forecasts"
-msgstr ""
+msgstr "受注予測の作成"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "期間4"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "期間名"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "期間3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "期間1"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
@@ -672,65 +691,67 @@ 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 ""
+"このウィザードは所定の選択された期間と倉庫のためにMPS計画行の作成を手助けします。そしてひとつひとつそれを作る必要はありません。それらがこの選択のために"
+"既に存在するなら、ウィザードは重複する行を作成しません。"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
 msgid "Confirmed Out"
-msgstr ""
+msgstr "確認済出庫"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
 #: view:stock.planning.createlines:0
 msgid "Create Stock Planning Lines"
-msgstr ""
+msgstr "在庫計画行の作成"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr ""
+msgstr "一般情報"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
 msgid "Sales Forecast"
-msgstr ""
+msgstr "受注予測"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
 msgid "This Warehouse Period1"
-msgstr ""
+msgstr "この倉庫の期間1"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales History"
-msgstr ""
+msgstr "受注履歴"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr ""
+msgstr "元の倉庫"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
 msgid "Forecast Product quantity."
-msgstr ""
+msgstr "製品数量の予測"
 
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
-msgstr ""
+msgstr "在庫供給場所"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
 msgid "Ending date for planning period."
-msgstr ""
+msgstr "計画期間の終了日"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,forecasted_products:0
 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 ""
+msgstr "選択した倉庫と期間の全ての製品が任意の予測を持つための計画を作成するにはこのボックスをチェックします。製品分類項目は無視されます。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:632
@@ -738,19 +759,19 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:702
 #, python-format
 msgid "MPS(%s) %s"
-msgstr ""
+msgstr "MPS（%s）%s"
 
 #. module: stock_planning
 #: field:stock.planning,already_in:0
 msgid "Already In"
-msgstr ""
+msgstr "既入庫"
 
 #. module: stock_planning
 #: field:stock.planning,product_uom_categ:0
 #: field:stock.planning,product_uos_categ:0
 #: field:stock.sale.forecast,product_uom_categ:0
 msgid "Product UoM Category"
-msgstr ""
+msgstr "製品単位分類"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
@@ -760,6 +781,8 @@ msgid ""
 "manual procurement with this forecast when some periods are exceptional for "
 "usual minimum stock rules."
 msgstr ""
+"この受注予測数量は在庫計画者が調達を手動で行う、あるいは自動調達を補完するための表示です。幾つかの期間が通常の最小在庫ルールの例外である場合、この予測とと"
+"もに手動の調達を使うことができます。"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
@@ -775,6 +798,10 @@ msgid ""
 "can trigger the procurement of what is missing to reach your desired "
 "quantities"
 msgstr ""
+"マスタ調達スケジュールは倉庫の補充のための主な操縦者になることができ、または自動MRPスケジューリング（最小在庫ルール他）を補完します。\n"
+"各MPS行は現在と未来の在庫レベルを基本として、計画された在庫移動と同様、与えられた倉庫の中の与えられた在庫期間のために、与えられた製品の入庫と出庫の前も"
+"って計算された概観を与えます。予測数量は手動で変更することができます。そしてシミュレート結果の在庫数量に満足したなら、希望の数量に到達しないものの調達のき"
+"っかけとすることができます。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:685
@@ -793,6 +820,17 @@ msgid ""
 " Expected Out: %s   Incoming Left: %s                                     \n"
 " Stock Simulation: %s   Minimum stock: %s "
 msgstr ""
+"MPSからユーザにより作成された集荷：%s　作成日：%s　\n"
+" 期間：%s　\n"
+" 状態に応じて：　\n"
+" 倉庫予測：%s　\n"
+" 初期在庫：%s　\n"
+" 計画出庫：%s　計画入庫：%s　\n"
+" 既出庫：%s　既入庫：%s　\n"
+" 確認済出庫：%s　確認済入庫：%s　\n"
+" 先行計画出庫：%s　先行確認済入庫：%s　\n"
+" 期待出庫：%s　入庫残：%s　\n"
+" 在庫シミュレーション：%s　最小在庫：%s "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -800,48 +838,48 @@ msgstr ""
 #: field:stock.sale.forecast,period_id:0
 #: field:stock.sale.forecast.createlines,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "期間"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uos_categ:0
 msgid "Product UoS Category"
-msgstr ""
+msgstr "製品販売単位分類"
 
 #. module: stock_planning
 #: field:stock.planning,active_uom:0
 #: field:stock.sale.forecast,active_uom:0
 msgid "Active UoM"
-msgstr ""
+msgstr "アクティブな単位"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
-msgstr ""
+msgstr "在庫計画の検索"
 
 #. module: stock_planning
 #: field:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy Last Forecast"
-msgstr ""
+msgstr "最終予測のコピー"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_id:0
 msgid "Shows which product this forecast concerns."
-msgstr ""
+msgstr "この予測に関連する製品の表示"
 
 #. module: stock_planning
 #: selection:stock.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: stock_planning
 #: field:stock.period.createlines,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "期間"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
 msgid "Create Stock Periods"
-msgstr ""
+msgstr "在庫期間の作成"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -849,59 +887,59 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "検証済"
 
 #. module: stock_planning
 #: view:stock.period:0
 #: selection:stock.period,state:0
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
+msgstr "最終在庫と受注予測から数量をコピー"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_dept:0
 msgid "This Dept Period1"
-msgstr ""
+msgstr "この部門の期間1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_dept:0
 msgid "This Dept Period3"
-msgstr ""
+msgstr "この部門の期間3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_dept:0
 msgid "This Dept Period2"
-msgstr ""
+msgstr "この部門の期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_dept:0
 msgid "This Dept Period5"
-msgstr ""
+msgstr "この部門の期間5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
 msgid "This Dept Period4"
-msgstr ""
+msgstr "この部門の期間4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
 msgid "This Warehouse Period2"
-msgstr ""
+msgstr "この倉庫の期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
 msgid "This Warehouse Period3"
-msgstr ""
+msgstr "この倉庫の期間3"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -910,38 +948,39 @@ msgid ""
 "supply will be made from Output location of Supply Warehouse. Used in "
 "'Supply from Another Warehouse' with Supply Warehouse."
 msgstr ""
+"供給倉庫の在庫場所から供給する場合はチェックします。チェックしない場合は供給倉庫の出力場所から供給されます。供給倉庫の他の倉庫場所から供給で使用されます。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr ""
+msgstr "担当"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Default UOM"
-msgstr ""
+msgstr "デフォルト単位"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
 msgid "This Warehouse Period4"
-msgstr ""
+msgstr "この倉庫の期間4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
 msgid "This Warehouse Period5"
-msgstr ""
+msgstr "この倉庫の期間5"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current"
-msgstr ""
+msgstr "現在"
 
 #. module: stock_planning
 #: help:stock.planning,supply_warehouse_id:0
 msgid ""
 "Warehouse used as source in supply pick move created by 'Supply from Another "
 "Warehouse'."
-msgstr ""
+msgstr "倉庫は、他の倉庫からの供給によって作成された、供給集荷移動の元として使用されます。"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
@@ -953,18 +992,18 @@ msgstr ""
 msgid ""
 "Shows which warehouse this forecast concerns. If during stock planning you "
 "will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
+msgstr "この予測がどの倉庫に関連するかを表示します。在庫計画の期間に全ての倉庫の受注予測が必要な場合、今、倉庫を選択して下さい。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:661
 #, python-format
 msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
+msgstr "%s 調達 (%s, %s) %s %s \n"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyze_company:0
 msgid "Per Company"
-msgstr ""
+msgstr "会社毎"
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -972,42 +1011,42 @@ msgid ""
 "Enter quantity which (by your plan) should come in. Change this value and "
 "observe Stock simulation. This value should be equal or greater than "
 "Confirmed In."
-msgstr ""
+msgstr "入庫すべき（計画による）数量を入力します。この値を変更し、在庫シミュレーションを観察します。この値は確認済入庫以上である必要があります。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
 msgid "This Company Period4"
-msgstr ""
+msgstr "この会社の期間4"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,period_id:0
 msgid "Period which planning will concern."
-msgstr ""
+msgstr "計画が関連する期間"
 
 #. module: stock_planning
 #: field:stock.planning,already_out:0
 msgid "Already Out"
-msgstr ""
+msgstr "既出庫"
 
 #. module: stock_planning
 #: help:stock.planning,product_id:0
 msgid "Product which this planning is created for."
-msgstr ""
+msgstr "この計画が作成される対象の製品"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Warehouse :"
-msgstr ""
+msgstr "倉庫毎："
 
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr ""
+msgstr "調達履歴"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
 msgid "Starting date for planning period."
-msgstr ""
+msgstr "開始期間の開始日"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
@@ -1017,48 +1056,48 @@ msgstr ""
 #: view:stock.period:0
 #: view:stock.period.createlines:0
 msgid "Stock Periods"
-msgstr ""
+msgstr "在庫期間"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Stock"
-msgstr ""
+msgstr "在庫"
 
 #. module: stock_planning
 #: help:stock.planning,incoming:0
 msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
+msgstr "計算された期間の全ての確認済入庫移動の数量"
 
 #. module: stock_planning
 #: field:stock.period,date_stop:0
 #: field:stock.period.createlines,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "No Requisition"
-msgstr ""
+msgstr "命令書なし"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,period_id:0
 msgid "Shows which period this forecast concerns."
-msgstr ""
+msgstr "この予測が関連する期間を表示"
 
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "単位"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed Periods"
-msgstr ""
+msgstr "閉鎖済期間"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1066,26 +1105,26 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: field:stock.sale.forecast,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
 #: view:stock.sale.forecast:0
 msgid "Sales Forecasts"
-msgstr ""
+msgstr "受注予測"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,product_categ_id:0
 #: field:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "製品分類"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:672
 #, python-format
 msgid "You must specify a Source Warehouse !"
-msgstr ""
+msgstr "元の倉庫を指定する必要があります。"
 
 #. module: stock_planning
 #: field:stock.planning,procure_to_stock:0
@@ -1102,7 +1141,7 @@ msgstr "承認"
 msgid ""
 "Period for this planning. Requisition will be created for beginning of the "
 "period."
-msgstr "この計画の期間。申請は期間の開始時に作成されます。"
+msgstr "この計画の期間。命令書は期間の開始時に作成されます。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:631
@@ -1145,7 +1184,7 @@ msgstr "誰がこの予測を作成したのか、検証したのかを示しま
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_team_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "販売チーム"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0
@@ -1154,6 +1193,8 @@ msgid ""
 "between Planned In and Confirmed In. For current period Already In is also "
 "calculated. This value is used to create procurement for lacking quantity."
 msgstr ""
+"計画された入庫数量のために残された数量。これは計画入庫と確認済入庫の間の計算された差です。現在の期間のために、既入庫も計算されます。この値は不足数量のため"
+"に調達を生成するのに使用されます。"
 
 #. module: stock_planning
 #: help:stock.planning,outgoing_left:0
@@ -1161,12 +1202,12 @@ msgid ""
 "Quantity expected to go out in selected period besides Confirmed Out. As a "
 "difference between Planned Out and Confirmed Out. For current period Already "
 "Out is also calculated"
-msgstr ""
+msgstr "確認済出庫とは別に選択された期間に出庫すると期待される数量。計画出庫と確認済出庫の差です。現在期間の既出庫もまた計算されます。"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr ""
+msgstr "受注履歴の計算"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
@@ -1175,3 +1216,5 @@ 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 ""
+"このウィザードは一度に複数の予測行を作成するのを手助けします。それが作成された後、あなたは予測数量を埋める必要があります。同じ選択に対して同じものが存在す"
+"る場合、ウィザードは行を重複させません。"
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index db78799f000..e65f378a638 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -9,7 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
-                    <header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
+                    <footer>
                         <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
                         or
                         <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
@@ -17,11 +21,7 @@
                         <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="4">
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
index a6e12ad4bc7..3d43241341d 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines.py
+++ b/addons/stock_planning/wizard/stock_planning_createlines.py
@@ -56,7 +56,6 @@ class stock_planning_createlines(osv.osv_memory):
         planning_obj = self.pool.get('stock.planning')
         mod_obj = self.pool.get('ir.model.data')
         prod_categ_obj = self.pool.get('product.category')
-        template_obj = self.pool.get('product.template')
         planning_lines = []
         for f in self.browse(cr, uid, ids, context=context):
             if f.forecasted_products:
@@ -67,8 +66,7 @@ class stock_planning_createlines(osv.osv_memory):
             else:
                 categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or []
                 prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
-                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
-                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+                products_id1 = product_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
             if len(products_id1)==0:
                 raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
 
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index e51ab4a3ba0..458994621c1 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
-                    <header>
-                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
@@ -20,6 +15,11 @@
                         <field name="forecasted_products"/>
                         <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py
index 9f73cf257eb..c72ac0599ea 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast.py
+++ b/addons/stock_planning/wizard/stock_planning_forecast.py
@@ -49,13 +49,11 @@ class stock_sale_forecast_createlines(osv.osv_memory):
         forecast_obj = self.pool.get('stock.sale.forecast')
         mod_obj = self.pool.get('ir.model.data')
         prod_categ_obj = self.pool.get('product.category')
-        template_obj = self.pool.get('product.template')
         forecast_lines = []
         for f in self.browse(cr, uid, ids, context=context):
             categ_ids =  f.product_categ_id.id and [f.product_categ_id.id] or []
             prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
-            templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
-            products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
+            products_ids = product_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
             if len(products_ids) == 0:
                 raise osv.except_osv(_('Error !'), _('No products in selected category !'))
             copy = f.copy_forecast
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 3c31404a070..0f3018350c0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
-                    <header>
-                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -21,6 +16,11 @@
                         <field name="copy_forecast"/>
                         <field name="product_categ_id" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
new file mode 100644
index 00000000000..66630dfe697
--- /dev/null
+++ b/addons/survey/i18n/ja.po
@@ -0,0 +1,1712 @@
+# 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-07-06 03:16+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-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr "オプションの印刷"
+
+#. module: survey
+#: code:addons/survey/survey.py:417
+#, python-format
+msgid ""
+"Minimum Required Answer you                                     entered is "
+"greater than the number of answer.                                      "
+"Please use a number that is smaller than %d."
+msgstr "あなたが入力した最小必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "あなたのメッセージ"
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr "テキストの検証"
+
+#. module: survey
+#: code:addons/survey/survey.py:429
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"           Please use a number that is smaller than %d."
+msgstr "あなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr "招待ユーザ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr "文字"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr "調査"
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr "回答タイプは非表示ですか？"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr "結果："
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr "調査要求"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr "範囲"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr "表の回答"
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "開始日"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "履歴行"
+
+#. module: survey
+#: code:addons/survey/survey.py:443
+#, python-format
+msgid ""
+"You must enter one or more menu                                 choices in "
+"column heading (white spaces not allowed)"
+msgstr "列見出しの中に１つ以上のメニュー選択を入力する必要があります（空白状態は許されません）。"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr "メニュー選択は非表示ですか？"
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr "本文"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "コメント項目の許可"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+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 "最大の日付"
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr "メニュー選択は非表示ですか？"
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr "完了"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr "一致"
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr "開始日"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr "コメント項目の追加"
+
+#. module: survey
+#: code:addons/survey/survey.py:396
+#, python-format
+msgid ""
+"#Required Answer you entered                                     is greater "
+"than the number of answer.                                     Please use a "
+"number that is smaller than %d."
+msgstr "回答の数より入力した必要回答数が大きくなっています。%d より小さな数を使って下さい。"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr "合計回答"
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr "行番号"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr "調査の質問"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr "選択の行列（1行に付き1回答）"
+
+#. module: survey
+#: code:addons/survey/survey.py:470
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr "回答数よりも最大値のために入力した最大必要回答数が大きくなっています。%d よりも小さな数を使用して下さい。"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "調査の質問"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr "質問タイプが評価尺度の場合に使用"
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr "ページ番号を含む"
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "ページタイトル"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr "調査の定義"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "調査の履歴"
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr "調査の検索"
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr " 列見出し"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr "調査の回答"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:87
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "終了した調査の合計"
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr "（質問タイプがドロップダウンメニューの行列の時のみ使用）"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr "調査統計値"
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr "評価尺度"
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr "コメント項目のタイプ"
+
+#. module: survey
+#: code:addons/survey/survey.py:370
+#: code:addons/survey/survey.py:382
+#: code:addons/survey/survey.py:396
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:411
+#: code:addons/survey/survey.py:417
+#: code:addons/survey/survey.py:423
+#: code:addons/survey/survey.py:429
+#: code:addons/survey/survey.py:433
+#: code:addons/survey/survey.py:439
+#: code:addons/survey/survey.py:443
+#: code:addons/survey/survey.py:453
+#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:468
+#: code:addons/survey/survey.py:470
+#: code:addons/survey/survey.py:472
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:630
+#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:686
+#: code:addons/survey/wizard/survey_answer.py:725
+#: code:addons/survey/wizard/survey_answer.py:745
+#: code:addons/survey/wizard/survey_answer.py:774
+#: code:addons/survey/wizard/survey_answer.py:779
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:798
+#: code:addons/survey/wizard/survey_answer.py:807
+#: code:addons/survey/wizard/survey_answer.py:812
+#: code:addons/survey/wizard/survey_answer.py:886
+#: code:addons/survey/wizard/survey_answer.py:922
+#: code:addons/survey/wizard/survey_answer.py:940
+#: code:addons/survey/wizard/survey_answer.py:968
+#: code:addons/survey/wizard/survey_answer.py:971
+#: code:addons/survey/wizard/survey_answer.py:974
+#: code:addons/survey/wizard/survey_answer.py:986
+#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:996
+#: code:addons/survey/wizard/survey_selection.py:80
+#: code:addons/survey/wizard/survey_selection.py:83
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr "テキストの１行"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send Reminder for Existing User"
+msgstr "既存ユーザに注意喚起を送信"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr "複数の選択肢（複数回答）"
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr "調査の編集"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr "調査の回答行"
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr "メニュー選択"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr "最大"
+
+#. module: survey
+#: view:survey:0
+msgid "My Survey(s)"
+msgstr "私の調査"
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr "テキストの検証"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr "テキスト"
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr "レター（8.5\" x 11\"）"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr "10進数値の最大値"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr "送信者"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr "コメントテキストを検証しない"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr "整数が必須"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr "質問"
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr "調査ページの検索"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "番号"
+
+#. module: survey
+#: code:addons/survey/survey.py:439
+#, python-format
+msgid ""
+"You must enter one or more menu choices                                 in "
+"column heading"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です。"
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+"異なる目的の調査を作成することができます：採用面接、従業員の期間毎の評価、マーケティングキャンペーンなど。調査は複数のタイプの質問を含むページで作成されま"
+"す：テキスト、複数選択など。調査はWYSIWYGインタフェースで手動または調査の編集をクリックすることで編集可能です。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr "計画段階の評価"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr "間"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: survey
+#: view:survey:0
+msgid "New"
+msgstr "新規"
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr "回答選択にコメント項目を作成"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr "調査の回答"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr "未完了"
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr "調査の印刷"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr "パートナの選択"
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr "質問タイプ"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:126
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr "%s 回以上はこの調査に回答できません。"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr "回答"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:119
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr "調査は開かれていないため、回答できません。"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "リンク"
+
+#. 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 "調査タイプ"
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr "ページ番号"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr "説明文"
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr "最小必要回答数"
+
+#. module: survey
+#: code:addons/survey/survey.py:479
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です（空白は許されません）。"
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr "エラーメッセージ"
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です。"
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr "締切日"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr "日付が必須"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "列見出し"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr "質問の回答が必要"
+
+#. 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 "調査要求"
+
+#. 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 "1つ以上の列見出しの入力が必要です。"
+
+#. 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 "整数値を入力して下さい。"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr "テキストの段落"
+
+#. module: survey
+#: code:addons/survey/survey.py:423
+#, python-format
+msgid ""
+"Maximum Required Answer you                                     entered for "
+"your maximum is greater than the number of answer.                           "
+"          Please use a number that is smaller than %d."
+msgstr "最大値のためにあなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr "質問に回答されない場合に、このエラーメッセージを表示します。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "_Ok"
+msgstr "OK"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr "回答のブラウズ"
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr "コメント"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr "調査の回答"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr "選択"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr "調査の回答"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr "コメント項目"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "手動"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "_Send"
+msgstr "送信"
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr "調査を担当するユーザ"
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr "ページ"
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr "行列でコメント列に追加"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr "回答番号"
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr "改ページなしで印刷"
+
+#. 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 "コメントが無効なフォーマットの場合、このエラーメッセージを表示します。"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:83
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr "あなたはこれ以上多くの応答を与えることができません。これ以上のサポートが必要であれば、この調査の作者に連絡をして下さい。"
+
+#. 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 "質問"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr "1ユーザにつき1回答のみとする場合は、1を設定します。"
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr "私の"
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr "最大必要回答数"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "ページ番号"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:87
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr "質問ウィザードのための調査を見つけることができません。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr "かつ"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr "調査印刷統計値"
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr "ログ"
+
+#. 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 "選択肢を正しく追加していない場合、このエラーメッセージが表示されます。"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "調査閉鎖日"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "調査開設日"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr "評価尺度は非表示ですか？"
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "開始"
+
+#. module: survey
+#: code:addons/survey/survey.py:472
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr "最大値"
+
+#. module: survey
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "閉鎖"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr "ドロップダウンメニューの行列"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr "回答"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr "回答上限最大値"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr "招待の送信"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "回答の保存"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr "日付と時間"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr "状態"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr "調査の印刷"
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr "回答のEメール通知"
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr "値の選択"
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr "開始済"
+
+#. 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 "回答の印刷"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr "複数のテキストボックス"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr "横向き"
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr "行数"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "調査の詳細"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr "異なるタイプの複数のテキストボックス"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr "メニュー選択（行毎に別の選択）"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr "回答タイプ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr "検証"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr "回答待ち"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr "10進数値が必須"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "グループ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr "日付"
+
+#. module: survey
+#: view:survey:0
+msgid "All New Survey"
+msgstr "新規調査全て"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "ページ転送"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr "スキップ済"
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr "用紙サイズ"
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr "列"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr "調査回答行"
+
+#. 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 "この調査には %s 回を超えての応答はできません。"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr "調査"
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr "評価尺度は非表示ですか？"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr "整数"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr "数値のテキストボックス"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "履歴"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr "遅延"
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr "向き"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "順序"
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr "最小値"
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr "要求される回答数"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr "項目ラベル"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "その他"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr "テスト調査"
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr "列毎に1個の回答のみを許可（強制ランキング）"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr "最小10進数"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "開く"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "開始した調査合計"
+
+#. module: survey
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr "入力した要求回答数が回答の数より大きいです。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr "調査が1回のみ回答可能な場合、1を設定します。"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr "完了 "
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr "調査質問の列見出し"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "平均数"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr "選択の行列（1行に付き複数回答）"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr "調査の回答を提供"
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. 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 "この項目が空の場合、選択された調査の回答の全てが印刷されます。"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr "回答済"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:425
+#, python-format
+msgid "Complete Survey Answer"
+msgstr "調査の回答の完了"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr "コメント / エッセイボックス"
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr "回答のタイプ"
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr "回答者の回答必須"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr "招待の送信"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:779
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr "複数回の同じ回答は選択できません。"
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr "質問の検索"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "調査タイトル"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr "単数テキストボックス"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "調査の選択"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr "最低"
+
+#. 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 ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr "縦向き"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr "長さ指定が必須"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "調査ページ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr "必要回答数"
+
+#. module: survey
+#: code:addons/survey/survey.py:468
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: code:addons/survey/survey.py:453
+#, python-format
+msgid "You must enter one or more answer."
+msgstr "１個以上の回答の入力が必要です。"
+
+#. module: survey
+#: view:survey:0
+msgid "All Open Survey"
+msgstr "開いている調査全て"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr "調査の回答"
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and Related Answer"
+msgstr "調査と関係する回答を選択"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr "調査の回答"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr "ページ"
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered is                                     greater "
+"than the number of answer.                                    Please use a "
+"number that is smaller than %d."
+msgstr "入力した要求回答数は回答の数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:971
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr "複数回の同じ回答は選択できません。"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr "リーガル（8.5\" x 14\"）"
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "質問数"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr "エラーメッセージ"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send Mail for New User"
+msgstr "新規ユーザのためのメール送信"
+
+#. module: survey
+#: code:addons/survey/survey.py:382
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr "1つ以上の回答を入力する必要があります。"
+
+#. module: survey
+#: code:addons/survey/survey.py:411
+#, python-format
+msgid ""
+"Minimum Required Answer                                     you entered is "
+"greater than the number of answer.                                    Please "
+"use a number that is smaller than %d."
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr "メニュー選択"
+
+#. module: survey
+#: field:survey,id:0
+msgid "ID"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:433
+#, python-format
+msgid ""
+"Maximum Required Answer is greater                                     than "
+"Minimum Required Answer"
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr "ユーザの作成"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr "全て"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr "Eメールアドレスが必須"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr "複数の選択肢（回答は１つのみ）"
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr "回答タイプは非表示ですか？"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr "メニュー選択（行毎に別の選択）"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr "実数"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr "単数テキストボックス"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s 調査は開いた状態ではありません。"
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr "日時"
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr "カラム名"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr "調査ページ"
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr "全選択の合計"
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr "表"
+
+#. module: survey
+#: code:addons/survey/survey.py:630
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr "リソースの複製はできません。"
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr "最小の日付"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr "ユーザ毎の最大回答数"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "ページ位置"
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
-    font-size: 12px;
-    border-style:dotted;
-    border-radius: 15px;
-    text-align: left;
-    height:145px;
-    width:220px;
-}
-
-.oe_survey_title{
-    font-size: 15px;
-    height: auto;
-    font-size: 16px;
-    font-weight:bold;
-    width: 205px;
-}
-
 .oe_survey_responsible{
     height: auto;
     width: 200px;
@@ -26,12 +9,6 @@
     width: 200px;
     font-size: 14px;
 }
-
-.oe_survey_fill{
-	align:right;
-	padding: 1px 165px;
-}
-
 .oe_survey_rate{
     font-size: 14px;
 }
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'color': fields.integer('Color Index'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
@@ -177,7 +178,7 @@ class survey_page(osv.osv):
     _columns = {
         'title': fields.char('Page Title', size=128, required=1),
         'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
         'sequence': fields.integer('Page Nr'),
         'note': fields.text('Description'),
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 01e7de66a3e..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,189 +26,206 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                    <group col="6" colspan="6">
-                    <field name="title"/>
-                        <field name="responsible_id"/>
-                        <field name="id" invisible="1"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-                    </group>
-                    <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
-                                <form string="Survey Page">
-                                    <field name="title"/>
-                                    <field name="sequence" groups="base.group_no_one"/>
-                                    <separator string="Description" colspan="4"/>
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                    <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
-                                        <form string="Survey Question" >
-                                            <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4"/>
-                                            <field name="sequence"/>
-                                            <field name="tot_resp"/>
-                                            <field name="type" on_change="on_change_type(type)"/>
-                                            <field name="in_visible_rating_weight" invisible="1"/>
-                                            <field name="in_visible_menu_choice" invisible="1"/>
-                                            <field name="in_visible_answer_type" invisible="1"/>
-                                            <notebook colspan="4">
-                                                <page string="Options">
-                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                                      <separator string="Answer" colspan="4"/>
-                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                                       </group>
-                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                                               <field name="no_of_rows"/>
-                                                            </group>
-                                                       </group>
+                    <div class="oe_button_box oe_right">
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                    </div>
+                    <label for="title" class="oe_edit_only"/>
+                    <h1>
+                        <field name="title" select="1" class="oe_inline"/>
+                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
+                        <field name="type" class="oe_inline"/>
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="id" invisible="1"/>
+                            <field name="responsible_id" class="oe_inline"/>
+                            <field name="send_response"/>
+                        </group>
+                        <group>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        </group>
+                     </group>
+                     <notebook>
+                        <page string="Survey Details">
+                            <field name="note" colspan="4" placeholder="Survey description..."/>
+                            <label for="page_ids"/>
+                            <field name="page_ids" colspan="4" mode="tree">
+                                <form string="Survey Page" version="7.0">
+                                    <sheet>
+                                    <label for="title" class="oe_edit_only"/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
+                                    <group>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
+                                    </group>
+                                    <newline/>
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
+                                        <field name="question_ids" nolabel="1">
+                                            <form string="Survey Question">
+                                                <group>
+                                                    <group>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                                        <separator string="Comment Field" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_comment_require"/>
-                                                        </group>
-                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                                            <group col="4" colspan="4">
-                                                                <field name="comment_field_type" colspan="1"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                    <field colspan="2" name="comment_label" />
+                                                </group>
+                                                <newline/>
+                                                <group>
+                                                <field name="in_visible_rating_weight" invisible="1"/>
+                                                <field name="in_visible_menu_choice" invisible="1"/>
+                                                <field name="in_visible_answer_type" invisible="1"/>
+                                                <notebook colspan="4">
+                                                    <page string="Options">
+                                                        <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer">
+                                                           <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                               <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                           </group>
+                                                           <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                               <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                                   <field name="no_of_rows"/>
                                                                 </group>
-                                                            </group>
-                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                <field name="comment_valid_type" colspan="2"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                                    <field name="comment_minimum_no" string="Between"/>
-                                                                    <field name="comment_maximum_no" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                                    <field name="comment_minimum_float" string="Between"/>
-                                                                    <field name="comment_maximum_float" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                                    <field name="comment_minimum_date" string="Between"/>
-                                                                    <field name="comment_maximum_date" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                                                </group>
-                                                            </group>
+                                                           </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                                        <field name="comment_column"/>
-                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                                            <field name="column_name" colspan="2"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                                        <separator string="Validation" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_validation_require"/>
-                                                        </group>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                                            <field name="validation_type" colspan="2"/>
-                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                                <field name="validation_minimum_no" string="Between"/>
-                                                                <field name="validation_maximum_no" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                                <field name="validation_minimum_float" string="Between"/>
-                                                                <field name="validation_maximum_float" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                                <field name="validation_minimum_date" string="Between"/>
-                                                                <field name="validation_maximum_date" string="and"/>
-                                                            </group>
-                                                        </group>
-                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                        <separator string="Required Answer" colspan="4"/>
                                                         <newline/>
-                                                        <field name="is_require_answer"/>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                                <field name="required_type"/>
-                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                                    <field name="req_ans" />
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                                    <field name="minimum_req_ans"/>
-                                                                    <field name="maximum_req_ans"/>
-                                                                </group>
+                                                        <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                            <separator string="Comment Field" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_comment_require"/>
                                                             </group>
-                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                                <label string="When the question is not answered, display this error message:"/>
-                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                                <group colspan="2" >
-                                                                    <field name="numeric_required_sum"/>
+                                                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                                <group col="4" colspan="4">
+                                                                    <field name="comment_field_type" colspan="1"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                        <field colspan="2" name="comment_label" />
+                                                                    </group>
+                                                                </group>
+                                                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field name="comment_valid_type" colspan="2"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                        <field name="comment_minimum_no" string="Between"/>
+                                                                        <field name="comment_maximum_no" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                        <field name="comment_minimum_float" string="Between"/>
+                                                                        <field name="comment_maximum_float" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                        <field name="comment_minimum_date" string="Between"/>
+                                                                        <field name="comment_maximum_date" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                    </group>
                                                                 </group>
-                                                                <newline/>
-                                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                                <field name="rating_allow_one_column_require"/>
                                                             </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                                        <separator string="Descriptive Text" colspan="4"/>
-                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                                    </group>
-                                                </page>
-                                            </notebook>
-                                            </group>
-                                        </form>
-                                        <tree string="Survey Question">
-                                            <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4"/>
-                                            <field name="answer_choice_ids"/>
-                                        </tree>
-                                    </field>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Other">
-                            <group colspan="6" col='4'>
-                                <field name="max_response_limit"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="type"/>
-                                <field name="send_response"/>
-                            </group>
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                            <field name="comment_column"/>
+                                                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                                <field name="column_name" colspan="2"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                            <separator string="Validation" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_validation_require"/>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                                <field name="validation_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                    <field name="validation_minimum_no" string="Between"/>
+                                                                    <field name="validation_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="validation_minimum_float" string="Between"/>
+                                                                    <field name="validation_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                    <field name="validation_minimum_date" string="Between"/>
+                                                                    <field name="validation_maximum_date" string="and"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                            <separator string="Required Answer" colspan="4"/>
+                                                            <newline/>
+                                                            <field name="is_require_answer"/>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                    <field name="required_type"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                        <field name="req_ans" />
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                        <field name="minimum_req_ans"/>
+                                                                        <field name="maximum_req_ans"/>
+                                                                    </group>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                    <label string="When the question is not answered, display this error message:"/>
+                                                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                    <group colspan="2" >
+                                                                        <field name="numeric_required_sum"/>
+                                                                    </group>
+                                                                    <newline/>
+                                                                    <label string="When the choices do not add up correctly, display this error message"/>
+                                                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                    <field name="rating_allow_one_column_require"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                            <separator string="Descriptive Text" colspan="4"/>
+                                                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                        </group>
+                                                    </page>
+                                                </notebook>
+                                                </group>
+                                            </form>
+                                            <tree string="Survey Question">
+                                                <field name="sequence" string="Seq"/>
+                                                <field name="question"/>
+                                                <field name="answer_choice_ids"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    </sheet>
+                                    </form>
+                                </field>
                         </page>
                         <page string="Invited User">
-                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                            <field name="invited_user_ids" readonly="1"/>
                         </page>
                         <page string="History">
-                            <field name="date_open"/>
-                            <field name="date_close"/>
-                            <field name="tot_start_survey"/>
-                            <field name="tot_comp_survey"/>
-                            <field name="history" colspan="4" nolabel="1">
+                            <group>
+                                <group>
+                                    <field name="date_open"/>
+                                    <field name="date_close"/>
+                                </group>
+                                <group>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
+                                </group>
+                            </group>
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -217,8 +234,8 @@
                                     <field name="date"/>
                                     <field name="user_id"/>
                                 </form>
-                               </field>
-                           </page>
+                           </field>
+                        </page>
                     </notebook>
                 </sheet>
                 </form>
@@ -286,32 +303,37 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                          <div class="oe_module_survey">
-                            <a class="oe_module_icon">
-                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
-                               <div class="oe_survey_responsible">
-                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                               </div><br/>
-                               <div class="oe_survey_start_date">
-                                  Open From:
-                                   <t t-if="record.date_open.raw_value">
-                                       <t t-esc="record.date_open.raw_value.getDate()"/>
-                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
-                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                   </t>
-                               </div><br/>
-                               <div class="oe_survey_rate">
-                                   Rate:
-    							<div class="oe_survey_fill" >
-                                   <button type="object" name="fill_survey" class="">
-                                       <span>Fill</span>
-                                   </button>
-                               </div>                                   
-                               </div>
-                            </a>
-                          </div>  
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                                <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>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"><field name="title"/></t></h3>
+                                    <div class="oe_survey_responsible">
+                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                                   </div><br/>
+                                   <div class="oe_survey_start_date">
+                                       <t t-if="record.date_open.raw_value">
+                                           Opened at
+                                           <t t-esc="record.date_open.raw_value.getDate()"/>
+                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                       </t>
+                                   </div><br/>
+                                   <div class="oe_survey_rate">
+                                       Rate:
+                                        <a name="fill_survey" type="object">Fill</a>
+                                   </div>
+                                </div>
+                            </div>
                         </t>
                     </templates>
                 </kanban>
@@ -344,149 +366,163 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4"/>
-                        <field name="survey_id"/>
-                        <field name="sequence"/>
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="question_ids" colspan="4" nolabel="1">
-                        <form string="Survey Question">
-                            <field name="question" colspan="4"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
-                            <field name="tot_resp"/>
-                            <field name="type" on_change="on_change_type(type)"/>
-                            <field name="in_visible_rating_weight" invisible="1"/>
-                            <field name="in_visible_menu_choice" invisible="1"/>
-                            <field name="in_visible_answer_type" invisible="1"/>
-                            <notebook colspan="4">
-                                <page string="Options">
-                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                      <separator string="Answer" colspan="4"/>
-                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                       </group>
-                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                               <field name="no_of_rows"/>
-                                            </group>
-                                       </group>
+                        </group>
+                        <group colspan="4">
+                            <field name="note" nolabel="1" placeholder="Description on the survey page..."/>
+                        </group>
+                        <group col="4">
+                            <label for="question_ids"/>
+                            <newline/>
+                            <field name="question_ids" nolabel="1">
+                            <form string="Survey Question">
+                                <group>
+                                    <group>
+                                        <field name="question" select="1"/>
+                                        <field name="type" on_change="on_change_type(type)"/>
+                                    </group>
+                                    <group>
+                                        <field name="sequence" invisible="1"/>
+                                        <field name="tot_resp" invisible="1"/>
+                                        <field name="in_visible_rating_weight" invisible="1"/>
+                                        <field name="in_visible_menu_choice" invisible="1"/>
+                                        <field name="in_visible_answer_type" invisible="1"/>
                                     </group>
                                     <newline/>
-                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                        <separator string="Comment Field" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_comment_require"/>
-                                        </group>
-                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                            <group col="4" colspan="4">
-                                                <field name="comment_field_type" colspan="1"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                    <field colspan="2" name="comment_label" />
+                                    <notebook colspan="4">
+                                        <page string="Options">
+                                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer" col="4">
+                                               <group attrs="{'invisible':[('type','=','table')]}">
+                                                   <field name="answer_choice_ids" nolabel="1" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                               </group>
+                                               <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                   <field name="column_heading_ids" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                    <group attrs="{'invisible':[('type','!=','table')]}">
+                                                       <field name="no_of_rows"/>
+                                                    </group>
+                                               </group>
+                                            </group>
+                                            <newline/>
+                                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}" string="Comment Field" col="4">
+                                                <group>
+                                                    <field name="is_comment_require"/>
+                                                </group>
+                                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                    <group>
+                                                        <field name="comment_field_type" colspan="1"/>
+                                                        <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="comment_label" />
+                                                        </group>
+                                                    </group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                             </group>
-                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field name="comment_valid_type" colspan="2"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                    <field name="comment_minimum_no" string="Between"/>
-                                                    <field name="comment_maximum_no" string="and"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                <field name="comment_column"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                    <field name="column_name" colspan="2"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                    <field name="comment_minimum_float" string="Between"/>
-                                                    <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                <separator string="Validation" colspan="4"/>
+                                                <group colspan="4">
+                                                    <field name="is_validation_require"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                    <field name="comment_minimum_date" string="Between"/>
-                                                    <field name="comment_maximum_date" string="and"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                    <field name="validation_type" colspan="2"/>
+                                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                        <field name="validation_minimum_no" string="Between"/>
+                                                        <field name="validation_maximum_no" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                        <field name="validation_minimum_float" string="Between"/>
+                                                        <field name="validation_maximum_float" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                        <field name="validation_minimum_date" string="Between"/>
+                                                        <field name="validation_maximum_date" string="and"/>
+                                                    </group>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
                                                     <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                                 </group>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                        <field name="comment_column"/>
-                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                            <field name="column_name" colspan="2"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                        <separator string="Validation" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_validation_require"/>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                            <field name="validation_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                <field name="validation_minimum_no" string="Between"/>
-                                                <field name="validation_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                <field name="validation_minimum_float" string="Between"/>
-                                                <field name="validation_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                <field name="validation_minimum_date" string="Between"/>
-                                                <field name="validation_maximum_date" string="and"/>
-                                            </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                        <separator string="Required Answer" colspan="4"/>
-                                        <newline/>
-                                        <field name="is_require_answer"/>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                <field name="required_type"/>
-                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                    <field name="req_ans" />
-                                                </group>
-                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                    <field name="minimum_req_ans"/>
-                                                    <field name="maximum_req_ans"/>
-                                                </group>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                <label string="When the question is not answered, display this error message:"/>
-                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                <group colspan="2" >
-                                                    <field name="numeric_required_sum"/>
-                                                </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <separator string="Required Answer" colspan="4"/>
                                                 <newline/>
-                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                <field name="is_require_answer"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <label string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2">
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                <field name="rating_allow_one_column_require"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                <separator string="Descriptive Text" colspan="4"/>
+                                                <field name="descriptive_text" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                        <separator string="Descriptive Text" colspan="4"/>
-                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                </page>
-                            </notebook>
-    
-                        </form>
-                        <tree string="Survey Question">
-                            <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4"/>
-                            <field name="answer_choice_ids"/>
-                        </tree>
-                        </field>
+                                        </page>
+                                    </notebook>
+                                </group>
+                            </form>
+                            <tree string="Survey Question">
+                                <field name="sequence" string="Seq"/>
+                                <field name="question"/>
+                                <field name="answer_choice_ids"/>
+                            </tree>
+                            </field>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 29cdd4ad5fb..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -18,7 +18,6 @@
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
-                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group string="Select Survey">
+                    <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
-                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
                 </form>
             </field>
         </record>
diff --git a/addons/web_livechat/LICENSE b/addons/web_livechat/LICENSE
deleted file mode 100644
index ff64be448e9..00000000000
--- a/addons/web_livechat/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenERP, Open Source Management Solution
-Copyright © 2010-2011 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 Lice
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
deleted file mode 100644
index 860b7b162a9..00000000000
--- a/addons/web_livechat/__openerp__.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2011 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/>.
-#
-##############################################################################
-{
-    'name': 'Live Chat Support',
-    'version': '2.0',
-    'category': 'Tools',
-    'description': """
-Enable live chat support for those who have a maintenance contract.
-===================================================================
-
-Add "Support" button in header from where you can access OpenERP Support.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'depends': ['base'],
-    'update_xml': [],
-    'js' : [
-        'static/src/js/web_livechat.js',
-    ],
-    'css' : [
-        'static/src/css/lc.css',
-    ],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '0013762192410413',
-    'images': ['static/src/img/web_livechat_support.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/i18n/ar.po b/addons/web_livechat/i18n/ar.po
deleted file mode 100644
index c4c5a7343b2..00000000000
--- a/addons/web_livechat/i18n/ar.po
+++ /dev/null
@@ -1,34 +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 01:37+0100\n"
-"PO-Revision-Date: 2012-01-07 23:53+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "ذلك العقد قد تمّ تسجيله في النظام سابقاً."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "التحدث مع الدعم الفني"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "تمكين الدعم الفني المباشر للحاصلين علي عقد دعم فني"
diff --git a/addons/web_livechat/i18n/bg.po b/addons/web_livechat/i18n/bg.po
deleted file mode 100644
index 16d76a8898c..00000000000
--- a/addons/web_livechat/i18n/bg.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 01:37+0100\n"
-"PO-Revision-Date: 2011-03-01 14:52+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Поддръжка чат на живо"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Разрешете live chat поддръжка ако имате договор за поддръжка"
diff --git a/addons/web_livechat/i18n/ca.po b/addons/web_livechat/i18n/ca.po
deleted file mode 100644
index 6a48c986a27..00000000000
--- a/addons/web_livechat/i18n/ca.po
+++ /dev/null
@@ -1,35 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-03-05 23:39+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Aquest contracte ja està registrat al sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantia.contracte"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Xat d'assistència"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permet suport per xat per a aquells que ja tenen contracte de manteniment"
diff --git a/addons/web_livechat/i18n/cs.po b/addons/web_livechat/i18n/cs.po
deleted file mode 100644
index bb1aa79d289..00000000000
--- a/addons/web_livechat/i18n/cs.po
+++ /dev/null
@@ -1,28 +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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-06 04:48+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-04-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Tato smlouva je již v systému registrována."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
diff --git a/addons/web_livechat/i18n/da.po b/addons/web_livechat/i18n/da.po
deleted file mode 100644
index 59c10e9eac8..00000000000
--- a/addons/web_livechat/i18n/da.po
+++ /dev/null
@@ -1,28 +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 01:37+0100\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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/de.po b/addons/web_livechat/i18n/de.po
deleted file mode 100644
index 2d2def6b604..00000000000
--- a/addons/web_livechat/i18n/de.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# German 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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 20:28+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Der Wartungsvertrag wurde bereits im System registriert."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Unterstützung"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Live Chat für Vetragsinhaber aktivieren"
diff --git a/addons/web_livechat/i18n/es.po b/addons/web_livechat/i18n/es.po
deleted file mode 100644
index 2df51c832a1..00000000000
--- a/addons/web_livechat/i18n/es.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish 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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ese contrato ya está registrado en el sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
-#~ "mantenimiento"
diff --git a/addons/web_livechat/i18n/es_CR.po b/addons/web_livechat/i18n/es_CR.po
deleted file mode 100644
index c0bba0bc3f3..00000000000
--- a/addons/web_livechat/i18n/es_CR.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Spanish 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: \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-18 23:24+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-02-19 05:43+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-"Language: es\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ese contrato ya está registrado en el sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
-#~ "mantenimiento"
diff --git a/addons/web_livechat/i18n/es_MX.po b/addons/web_livechat/i18n/es_MX.po
deleted file mode 100644
index 1ae99905314..00000000000
--- a/addons/web_livechat/i18n/es_MX.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Spanish 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid ""
-"Your publisher warranty contract is already subscribed in the system !"
-msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
-
-#. module: web_livechat
-#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
-msgid "Live Chat Support"
-msgstr "Chat de asistencia"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#. module: web_livechat
-#: model:ir.module.module,description:web_livechat.module_meta_information
-msgid "Enable live chat support for whom have a maintenance contract"
-msgstr ""
-"Permite soporte por chat para aquellos que ya tienen contrato de "
-"mantenimiento"
diff --git a/addons/web_livechat/i18n/es_VE.po b/addons/web_livechat/i18n/es_VE.po
deleted file mode 100644
index 1ae99905314..00000000000
--- a/addons/web_livechat/i18n/es_VE.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Spanish 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid ""
-"Your publisher warranty contract is already subscribed in the system !"
-msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
-
-#. module: web_livechat
-#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
-msgid "Live Chat Support"
-msgstr "Chat de asistencia"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#. module: web_livechat
-#: model:ir.module.module,description:web_livechat.module_meta_information
-msgid "Enable live chat support for whom have a maintenance contract"
-msgstr ""
-"Permite soporte por chat para aquellos que ya tienen contrato de "
-"mantenimiento"
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
deleted file mode 100644
index 10b984f68ab..00000000000
--- a/addons/web_livechat/i18n/fi.po
+++ /dev/null
@@ -1,34 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-06-08 10:30+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Sopimus on jo rekisteröity järjestelmään."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chatin tuki"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Aloita chatti tuki ylläpitosopimuksen toimittajan kanssa"
diff --git a/addons/web_livechat/i18n/fr.po b/addons/web_livechat/i18n/fr.po
deleted file mode 100644
index 7a1a07f8bcf..00000000000
--- a/addons/web_livechat/i18n/fr.po
+++ /dev/null
@@ -1,36 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-26 09:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ce contrat est déjà enregistré dans le système."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Support par messagerie instantanée"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Valider le support par messagerie instantanée pour les détenteurs d'un "
-#~ "contrat de maintenance"
diff --git a/addons/web_livechat/i18n/gl.po b/addons/web_livechat/i18n/gl.po
deleted file mode 100644
index f78ff364431..00000000000
--- a/addons/web_livechat/i18n/gl.po
+++ /dev/null
@@ -1,35 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-03-05 01:41+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "O contrato xa está rexistrado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permitir soporte por chat para aqueles que xa teñan contrato de mantemento"
diff --git a/addons/web_livechat/i18n/hr.po b/addons/web_livechat/i18n/hr.po
deleted file mode 100644
index 17a5919153b..00000000000
--- a/addons/web_livechat/i18n/hr.po
+++ /dev/null
@@ -1,34 +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 01:37+0100\n"
-"PO-Revision-Date: 2012-01-28 21:59+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Navedeni ugovor je već registriran u sustavu."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogući podršku za Live Chat za one koji imaju ugovor o održavanju"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Podrška za Live Chat"
diff --git a/addons/web_livechat/i18n/it.po b/addons/web_livechat/i18n/it.po
deleted file mode 100644
index 30f68ea8157..00000000000
--- a/addons/web_livechat/i18n/it.po
+++ /dev/null
@@ -1,35 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Supporto live chat"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Abilita il supporto live chat per chi ha un contratto di manutenzione"
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
deleted file mode 100644
index 1c50534b3ab..00000000000
--- a/addons/web_livechat/i18n/ja.po
+++ /dev/null
@@ -1,28 +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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-16 21: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-06-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "この契約は既にシステムに登録されています。"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/mn.po
similarity index 71%
rename from addons/web_livechat/i18n/sv.po
rename to addons/web_livechat/i18n/mn.po
index dd3ae799443..9ab220033ae 100644
--- a/addons/web_livechat/i18n/sv.po
+++ b/addons/web_livechat/i18n/mn.po
@@ -1,4 +1,4 @@
-# Swedish translation for openobject-addons
+# 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.
@@ -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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-04 15:38+0000\n"
+"PO-Revision-Date: 2012-07-08 18:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\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-06-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
 msgid "That contract is already registered in the system."
-msgstr "Det kontraktet har redan registrerats i systemet."
+msgstr "Энэ гэрээг системд өмнө нь бүртгэгдсэн байна."
 
 #. module: web_livechat
 #: model:ir.model,name:web_livechat.model_publisher_warranty_contract
diff --git a/addons/web_livechat/i18n/nl.po b/addons/web_livechat/i18n/nl.po
deleted file mode 100644
index db490d3768d..00000000000
--- a/addons/web_livechat/i18n/nl.po
+++ /dev/null
@@ -1,35 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 10:22+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Dat contract is al geregisteerd in het systeem."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Support"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Live chat support aanzetten voor diegenen die een onderhoudscontract hebben"
diff --git a/addons/web_livechat/i18n/oc.po b/addons/web_livechat/i18n/oc.po
deleted file mode 100644
index 00b746269f3..00000000000
--- a/addons/web_livechat/i18n/oc.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Occitan (post 1500) 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 01:37+0100\n"
-"PO-Revision-Date: 2011-11-20 09:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@li.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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Aqueste contracte es ja enregistrat dins lo sistèma."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Supòrt per messatjariá instantanèa"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Validar lo supòrt per messatjariá instantanèa pels detentors d'un contracte "
-#~ "de mantenença"
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
deleted file mode 100644
index d34c84f502b..00000000000
--- a/addons/web_livechat/i18n/pt.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Portuguese 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 01:37+0100\n"
-"PO-Revision-Date: 2011-07-31 22:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "O contrato já está registado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "Copy text \t publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Suporte por mensagens instantâneas (chat)"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Ativar suporte através de mensagens instantâneas para quem tenha contrato de "
-#~ "suporte"
diff --git a/addons/web_livechat/i18n/pt_BR.po b/addons/web_livechat/i18n/pt_BR.po
deleted file mode 100644
index d914a85facd..00000000000
--- a/addons/web_livechat/i18n/pt_BR.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Brazilian Portuguese 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 01:37+0100\n"
-"PO-Revision-Date: 2012-01-18 02:51+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Esse contato já está registrado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Ativa o suporte com conversa ao vivo para quem tem um contrato de manutenção"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Suporte com Conversa ao Vivo"
diff --git a/addons/web_livechat/i18n/ro.po b/addons/web_livechat/i18n/ro.po
deleted file mode 100644
index 02d8930f340..00000000000
--- a/addons/web_livechat/i18n/ro.po
+++ /dev/null
@@ -1,36 +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 01:37+0100\n"
-"PO-Revision-Date: 2012-01-08 19:46+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Acel contract este deja inregistrat in sistem."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract (contract. garantie_editor)"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Asistentă tehnică pentru Discutiile online"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Activează asistenta tehnică pentru discutiile online pentru cei care au un "
-#~ "contract de mentenantă."
diff --git a/addons/web_livechat/i18n/ru.po b/addons/web_livechat/i18n/ru.po
deleted file mode 100644
index 893a8328967..00000000000
--- a/addons/web_livechat/i18n/ru.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 01:37+0100\n"
-"PO-Revision-Date: 2011-03-09 17:08+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Договор уже зарегистрирован в системе."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Техподдержка в режиме живого общения"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Включить поддержку живого общения для тех, у кого есть договор на "
-#~ "обслуживание"
diff --git a/addons/web_livechat/i18n/sk.po b/addons/web_livechat/i18n/sk.po
deleted file mode 100644
index 5705a692a99..00000000000
--- a/addons/web_livechat/i18n/sk.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Slovak 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 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 13:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak <sk@li.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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Podpora"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Povoliť live chat podporu pre toho kto má servisnú zmluvu"
diff --git a/addons/web_livechat/i18n/sl.po b/addons/web_livechat/i18n/sl.po
deleted file mode 100644
index e772d67b8db..00000000000
--- a/addons/web_livechat/i18n/sl.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Slovenian 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 01:37+0100\n"
-"PO-Revision-Date: 2011-05-22 17:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ta pogodba je v sistemu že vnešena"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Pomoč v živo"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogoči pomoč v živo za uporabnike z vzdrževalno pogodbo"
diff --git a/addons/web_livechat/i18n/sr@latin.po b/addons/web_livechat/i18n/sr@latin.po
deleted file mode 100644
index 7baff43edea..00000000000
--- a/addons/web_livechat/i18n/sr@latin.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Serbian Latin 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 01:37+0100\n"
-"PO-Revision-Date: 2011-10-17 13:43+0000\n"
-"Last-Translator: Milan Milosevic <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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogući podršku ćaskanja uživo za one koji imaju ugovor o održavanju"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Podrška ćaskanja uživo"
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
deleted file mode 100644
index f9747e9d858..00000000000
--- a/addons/web_livechat/i18n/tr.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 01:37+0100\n"
-"PO-Revision-Date: 2011-04-26 14:31+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Bu sözleşme sistemde zaten kayıtlı !"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Canlı Sohbet Desteği"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Bakım sözleşmesi olanlar için canlı sohbet desteğini açar"
diff --git a/addons/web_livechat/i18n/web_livechat.pot b/addons/web_livechat/i18n/web_livechat.pot
deleted file mode 100644
index 1feb83270c6..00000000000
--- a/addons/web_livechat/i18n/web_livechat.pot
+++ /dev/null
@@ -1,46 +0,0 @@
-# #-#-#-#-#  web_livechat.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* web_livechat
-#
-# #-#-#-#-#  web_livechat.pot.web (PROJECT VERSION)  #-#-#-#-#
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  web_livechat.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
-"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"
-"#-#-#-#-#  web_livechat.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
deleted file mode 100644
index e8ce70adad1..00000000000
--- a/addons/web_livechat/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +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 01:37+0100\n"
-"PO-Revision-Date: 2011-04-08 07:20+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-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "该合同已登记到系统中。"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "支持在线交流"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "其中一个维护合同支持在线交流"
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
deleted file mode 100644
index 0328e4181a7..00000000000
--- a/addons/web_livechat/publisher_warranty.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2011 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
-from tools import cache
-
-def _gen_cache_clear(method):
-    def func(self, cr, *args, **kwargs):
-        s = super(publisher_warranty_contract, self)
-        r = getattr(s, method)(cr, *args, **kwargs)
-        self.is_livechat_enable.clear_cache(self)
-        return r
-    return func
-
-class publisher_warranty_contract(osv.osv):
-    _inherit = 'publisher_warranty.contract'
-
-    create = _gen_cache_clear('create')
-    write = _gen_cache_clear('write')
-    unlink = _gen_cache_clear('unlink')
-
-    @cache(skiparg=3, timeout=300)
-    def is_livechat_enable(self, cr, uid):
-        domain = [('state', '=', 'valid'), ('check_support', '=', True)]
-        return self.search_count(cr, uid, domain) != 0
-
-publisher_warranty_contract()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/static/src/css/lc.css b/addons/web_livechat/static/src/css/lc.css
deleted file mode 100644
index 7f1876a2793..00000000000
--- a/addons/web_livechat/static/src/css/lc.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.livechat span.online {
-    text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
-}
-.livechat img {
-    vertical-align: middle;
-    margin-right: 0.5em;
-}
diff --git a/addons/web_livechat/static/src/img/available.png b/addons/web_livechat/static/src/img/available.png
deleted file mode 100644
index e9eea88ae5f..00000000000
Binary files a/addons/web_livechat/static/src/img/available.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/img/away.png b/addons/web_livechat/static/src/img/away.png
deleted file mode 100644
index f0a0847059f..00000000000
Binary files a/addons/web_livechat/static/src/img/away.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/img/busy.png b/addons/web_livechat/static/src/img/busy.png
deleted file mode 100644
index ddb24377f0f..00000000000
Binary files a/addons/web_livechat/static/src/img/busy.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
deleted file mode 100644
index 540af94310f..00000000000
--- a/addons/web_livechat/static/src/js/web_livechat.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011-2012 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/>.
-#
-############################################################################*/
-
-var __lc_buttons = [];
-
-openerp.web_livechat = function (openerp) {
-
-openerp.web_livechat.Livechat = openerp.web.Widget.extend({
-    template: 'Systray.LiveChat',
-
-    start: function() {
-        this._super();
-        if (!this.session)
-            return;
-        var self = this;
-        var pwc = new openerp.web.Model("publisher_warranty.contract");
-        pwc.get_func('is_livechat_enable')().then(function(res) {
-            if(res) {
-                self.$element.click(self.do_load_livechat);
-            } else {
-                self.$element.click(self.do_open_url);
-            }
-        });
-    },
-
-    do_open_url: function(evt) {
-        evt.preventDefault();
-        openerp.webclient.action_manager.do_action({type: 'ir.actions.act.url', url: 'http://www.openerp.com/support-or-publisher-warranty-contract', target: 'new'});
-    },
-
-    do_load_livechat: function(evt) {
-        var self = this;
-        if (evt) {
-            evt.preventDefault();
-        }
-
-        this.$element.unbind('click', this.do_load_livechat);
-
-        var lc_id = _.uniqueId('livechat_');
-        this.$element.attr('id', lc_id);
-
-        var pwc = new openerp.web.Model("publisher_warranty.contract");
-
-        pwc.get_func('is_livechat_enable')().then(function(res) {
-            if(!res) {
-                return;
-            }
-
-            // connect to LiveChat
-            __lc_load();
-
-            __lc_buttons.push({
-                elementId: lc_id, //'livechat_status',
-                language: 'en',
-                skill: '2',
-                type: 'text',
-                labels: {
-                    online: '<img src="/web_livechat/static/src/img/available.png"/>',
-                    offline: '<img src="/web_livechat/static/src/img/away.png"/>',
-                }
-            });
-        });
-    }
-});
-
-openerp.web.UserMenu.include({
-    do_update: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-        this.update_promise.then(function() {
-            if (self.livechat) {
-                self.livechat.destroy();
-            }
-            self.livechat = new openerp.web_livechat.Livechat(self);
-            self.livechat.appendTo(openerp.webclient.$element.find('.oe_systray'));
-        });
-    }
-});
-
-if (openerp.webclient) {
-    // tracking code from LiveChat
-    var license = '1035052',
-        params = '',
-        lang = 'en',
-        skill = '0';
-    __lc_load = function (p) {
-      if (typeof __lc_loaded != 'function')
-        if (p) { 
-          var d = document,
-            l = d.createElement('script'),
-            s = d.getElementsByTagName('script')[0],
-            a = unescape('%26'),
-            h = ('https:' == d.location.protocol ? 'https://' : 'http://');
-          l.type = 'text/javascript';
-          l.async = true;
-          l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
-          if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
-            l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
-            l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params));
-            s.parentNode.insertBefore(l, s);
-          } else 
-            setTimeout(__lc_load, 1000);
-          if(typeof __lc_serv != 'string'){
-            s.parentNode.insertBefore(l, s);
-          }
-        } else __lc_load(Math.ceil(Math.random()*5));
-    }
-}
-
-};
diff --git a/addons/web_livechat/static/src/xml/web_livechat.xml b/addons/web_livechat/static/src/xml/web_livechat.xml
deleted file mode 100644
index 0f1bf073bc2..00000000000
--- a/addons/web_livechat/static/src/xml/web_livechat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-<t t-name="Systray.LiveChat">
-    <div class="oe_systray_livechat" title="Support">
-        <a href="#"><img src="/web_livechat/static/src/img/busy.png"/></a>
-    </div>
-</t>
-</templates>
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
index e39f7870249..8424e146d06 100644
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -1,6 +1,6 @@
 /* Shortcuts*/
-.oe_systray_shortcuts {
-    margin: 3px;
+.oe_systray_shortcuts .oe_star_off {
+    color: #eee;
 }
 .oe_shortcuts_toggle {
     height: 20px;
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index ce4d61e66bd..0b9701f9f1a 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -3,8 +3,8 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_dropdown_toggle">
-        <a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
+    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
+        <span class="oe_e oe_star_off">7</span>
         <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
     </div>
 </t>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 45c4ba6a487..213ca9dd2e2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Menu Information">
                         <field name="menu_name" />
                         <field name="menu_parent_id" />
                     </group>
+                    <footer>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index c818721c09c..90139c3afac 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -10,13 +10,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
+                    <separator string="Menu Information"/>
+                    <label string="Want to create a Index on Selected Pages ? "/>
+                    <footer>
                         <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Menu Information"/>
-                    <label string="Want to create a Index on Selected Pages ? "/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index c5b3583b1e5..4729586c858 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -10,11 +10,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Notes"/>
                     <field name="file_path" width="300"/>
+                    <footer>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 9be2d4d22aa..49f333e453f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Page" version="7.0">
-                    <header>
+                    <label string="Want to open a wiki page? "/>
+                    <footer>
                         <button name="open_wiki_page" string="Open Wiki Page" type="object"  class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Want to open a wiki page? "/>
+                    </footer>
              </form>
             </field>
         </record>