diff --git a/addons/account/account.py b/addons/account/account.py
index f0c16d8586c..caf1d68c45d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -24,11 +24,12 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
-import netsvc
+import logging
 import pooler
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 def check_cycle(self, cr, uid, ids, context=None):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -212,7 +213,6 @@ class account_account(osv.osv):
     _name = "account.account"
     _description = "Account"
     _parent_store = True
-    logger = netsvc.Logger()
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
@@ -295,8 +295,7 @@ class account_account(osv.osv):
             if aml_query.strip():
                 wheres.append(aml_query.strip())
             filters = " AND ".join(wheres)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Filters: %s'%filters)
+            _logger.debug('Filters: %s',(filters))
             # IN might not work ideally in case there are too many
             # children_and_consolidated, in that case join on a
             # values() e.g.:
@@ -312,8 +311,7 @@ class account_account(osv.osv):
                        " GROUP BY l.account_id")
             params = (tuple(children_and_consolidated),) + query_params
             cr.execute(request, params)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Status: %s'%cr.statusmessage)
+            _logger.debug('Status: %s',(cr.statusmessage))
 
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
@@ -2095,9 +2093,7 @@ class account_tax(osv.osv):
         }
 
     def compute(self, cr, uid, taxes, price_unit, quantity,  product=None, partner=None):
-        logger = netsvc.Logger()
-        logger.notifyChannel("warning", netsvc.LOG_WARNING,
-            "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+        _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):
@@ -2969,10 +2965,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
+        'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
-        'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
         "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(%)'),
@@ -3009,13 +3005,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
         if 'company_id' in fields:
             res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
-        if 'seq_journal' in fields:
-            res.update({'seq_journal': True})
 
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
             if 'chart_template_id' in fields:
-                res.update({'chart_template_id': ids[0]})
+                res.update({'only_one_chart_template': len(ids) == 1, 'chart_template_id': ids[0]})
             if 'sale_tax' in fields:
                 sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
                                               , "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c12fe321edf..e2d67e7fb55 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -6,36 +6,34 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
-            <data>
-                <form position="attributes">
+                <form position="attributes" version="7.0">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <xpath expr="//separator[@string='title']" position="after">
-                    <group colspan="4" width="600">
-                            <field name="charts"/>
-                            <group colspan="4" groups="account.group_account_user">
-                                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="has_default_company" invisible="1" />
-                                <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                                <field name="date_start" on_change="on_change_start_date(date_start)"/>
-                                <field name="date_stop"/>
-                                <field name="period" colspan="4"/>
-                            </group>
-                        </group>
-                    </xpath>
-                <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Chart of Accounts</attribute>
-                    <label string="The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."/>
+                <button name="action_skip" position="replace"/>
+                <button name="action_next" position="attributes">
+                    <attribute name="string">Continue</attribute>
+                </button>
+                <separator string="title" position="replace">
+                    <group string="Select an Accounting Setup">
+                        <label colspan="2" string="This will automatically configure your taxes and accounts."/>
+                        <field name="charts"/>
+                    </group>
+                    <group string="Configure your Fiscal Year" groups="account.group_account_user">
+                        <field name="has_default_company" invisible="1" />
+                        <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        <label for="date_start" string="Date Range"/>
+                        <div>
+                            <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
+                            <field name="date_stop" class="oe_inline"/>
+                        </div>
+                        <field name="period"/>
+                    </group>
                 </separator>
-                </data>
             </field>
         </record>
 
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Install your Chart of Accounts</field>
+            <field name="name">Configure your Chart of Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer</field>
             <field name="view_id" ref="view_account_configuration_installer"/>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index fe8ed307aa6..a10cba705e4 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -39,7 +39,7 @@
                     <field name="quantity"/>
                     <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -56,13 +56,13 @@
                         <field name="name"/>
                         <label string="Quantity" for="quantity" align="1.0"/>
                         <div>
-                            <field name="quantity" class="oe_form_inline"/>
-                            <field name="uos_id" class="oe_form_inline"
+                            <field name="quantity" class="oe_inline"/>
+                            <field name="uos_id" class="oe_inline"
                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         </div>
                         <field name="price_unit"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="discount"/>
+                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
+                        <field name="discount" groups="sale.group_discount_per_so_line"/>
                         <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
                         <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -98,7 +98,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
-                        <field name="account_id"/>
+                        <field name="account_id" groups="account.group_account_user"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -148,7 +148,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -190,7 +191,7 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
@@ -218,10 +219,10 @@
                                     </field>
                                     <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </div>
-                                <group class="oe_form_subtotal_footer">
+                                <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
-                                    <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
                                     <field name="residual" style="margin-top: 10px"/>
                                     <field name="reconciled" invisible="1"/>
@@ -274,9 +275,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
@@ -290,9 +292,9 @@
                         <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
                         <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                         <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
-                        <field name="number" readonly="1" class="oe_form_inline"/>
+                        <field name="number" readonly="1" class="oe_inline"/>
                     </h1>
-                    <label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
+                    <label string="Concerns" for="name" class="oe_edit_only"/>
                     <h2>
                         <field name="name" placeholder="Project XYZ"/>
                     </h2>
@@ -321,7 +323,7 @@
 
                             <label for="currency_id"/>
                             <div>
-                                <field name="currency_id" class="oe_form_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
                                 <button name="%(action_account_change_currency)d" type="action"
                                   icon="terp-stock_effects-object-colorize"
                                   attrs="{'invisible':[('state','!=','draft')]}"
@@ -339,7 +341,7 @@
                                     <field name="tax_line" nolabel="1">
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
-                                            <field name="account_id" groups="account.group_account_invoice"/>
+                                            <field name="account_id" groups="account.group_account_user"/>
                                             <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)"/>
                                             <field invisible="True" name="base_amount"/>
@@ -352,12 +354,12 @@
                                         type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
                                         help="This action will erase taxes"/>
                                 </div>
-                                <group class="oe_form_subtotal_footer">
+                                <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
-                                    <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
-                                    <field name="residual" style="margin-top: 10px"/>
+                                    <field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
                                     <field name="reconciled" invisible="1"/>
                                 </group>
                             </group>
@@ -373,8 +375,7 @@
                                 <field name="origin" placeholder="SO0032"/>
                                 <field name="move_id" groups="account.group_account_user"/>
                             </group>
-                            <separator string="Additional Information"/>
-                            <field name="comment"/>
+                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
@@ -406,23 +407,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group>
+                    <group>
+                        <field name="number"
+                            string="Invoice"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <field name="number"
-                            string="Reference"
-                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="user_id" widget="selection" string="Salesperson"/>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id" string="Period"/>
                     </group>
@@ -485,7 +484,12 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
+            <field name="help">
+                Click here to create a new Invoice.
+                &lt;p&gt;
+                An invoice can be generated automatically from a sale order or a delivery order.
+                The invoice can be send by email.
+            </field>
         </record>
 
 
@@ -513,7 +517,12 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <field name="help">
+                Click here to create Supplier invoice.
+                &lt;p&gt;
+                You can control the invoice from your supplier according to what you purchased or received.
+                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            </field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -526,7 +535,12 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new customer refund.
+                &lt;p&gt;
+                A refund is a document that credits an invoice completely or partially.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -552,7 +566,12 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new supplier refund.
+                &lt;p&gt;
+                Track refunds you receive from your suppliers.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 58830a19693..1244f9b9834 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="14"
+        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 892747c849f..95b53b51339 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -997,6 +997,11 @@ class account_move_line(osv.osv):
         for journal in journals:
             all_journal.append(journal.id)
             for field in journal.view_id.columns_id:
+                # sometimes, it's possible that a defined column is not loaded (the module containing 
+                # this field is not loaded) when we make an update.
+                if field.name not in self._columns:
+                    continue
+
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
                     fld.append((field.field, field.sequence))
@@ -1020,7 +1025,7 @@ class account_move_line(osv.osv):
         }
 
         document = etree.Element('tree', string=title, editable="top",
-                                 refresh="5", on_write="on_create_write",
+                                 on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
         fields_get = self.fields_get(cr, uid, flds, context)
         for field, _seq in fld:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 274a8993dc4..ab46f7519f8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
                         <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="state"/>
                     </group>
                     <newline/>
@@ -141,10 +141,9 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                     </group>
                 </search>
             </field>
@@ -170,7 +169,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
+                    <label for="name" class="oe_edit_only" string="Account Name and Code:"/>
                     <h1>
                         <field name="name"/> - 
                         <field name="code"/>
@@ -217,11 +216,11 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="user_type"/>
                     </group>
                     <newline/>
@@ -379,7 +378,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
-                    <field name="name"/>
+                    <field name="name" string="Journal View"/>
                 </search>
             </field>
         </record>
@@ -440,13 +439,13 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
+                    <separator orientation="vertical"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="user_id"/>
                     </group>
                     <newline/>
@@ -465,10 +464,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
-                    <div class="oe_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="type" class="oe_form_readonly_hidden"/>
+                        <label for="type" class="oe_edit_only"/>
                         <h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2>
                     </div>
                     <notebook>
@@ -521,12 +520,14 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                         <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
                     </group>
                     <newline/>
@@ -564,11 +565,13 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="date"/>
                         <field name="period_id"/>
                         <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
                     </group>
@@ -693,8 +696,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Type">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Type"/>
                 </search>
             </field>
         </record>
@@ -794,8 +796,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Tax Code">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
                     <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
@@ -881,8 +882,7 @@
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <group>
-                        <field name="name"/>
-                        <field name="description"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>
@@ -1147,6 +1147,8 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1158,15 +1160,11 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
+                        <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                        <separator orientation="vertical"/>
                         <field name="move_id" string="Number (Move)"/>
-                        <field name="date"/>
                         <field name="account_id"/>
-                        <field name="partner_id">
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="partner_id"/>
                         <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
                         <field name="period_id" context="{'period_id':self}"/>
                     </group>
@@ -1392,18 +1390,16 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="partner_id"/>
-                        <field name="date"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>
@@ -1622,17 +1618,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                  <group>
-                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
-                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
-                    <separator orientation="vertical"/>
-                      <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group>
+                        <field name="name" string="Journal Entry Model"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                        <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1715,7 +1712,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -1801,12 +1798,14 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group>
+                        <field name="name" string="Account Subscription"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="model_id"/>
-                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -1829,27 +1828,28 @@
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
                     </header>
-
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="model_id"/>
-                            <field name="ref"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="ref"/>
+                            </group>
+                            <newline/>
+    
+                            <group string="Starts on">
+                                <field name="date_start"/>
+                                <field name="period_total"/>
+                            </group>
+    
+                            <group string="Valid Up to">
+                                <field name="period_nbr"/>
+                                <field name="period_type"/>
+                            </group>
                         </group>
-                        <newline/>
-
-                        <group string="Starts on">
-                            <field name="date_start"/>
-                            <field name="period_total"/>
-                        </group>
-
-                        <group string="Valid Up to">
-                            <field name="period_nbr"/>
-                            <field name="period_type"/>
-                        </group>
-                    </group>
-                    <separator string="Subscription Lines"/>
-                    <field name="lines_id" widget="one2many_list"/>
+                        <separator string="Subscription Lines"/>
+                        <field name="lines_id" widget="one2many_list"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -2071,14 +2071,14 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                        <separator orientation="vertical"/>
                         <field name="parent_id"/>
-                        <field name="type"/>
                         <field name="user_type"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -2139,13 +2139,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                      <group>
-                          <field name="name"/>
+                    <group>
+                        <field name="name" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
-                      </group>
-                      <newline/>
-                      <group expand="0" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
@@ -2154,7 +2155,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
-                      </group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -2261,11 +2262,11 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="description"/>
                         <field name="chart_template_id"/>
                     </group>
                 </search>
@@ -2304,8 +2305,7 @@
             <field name="arch" type="xml">
                 <search string="Search tax template">
                     <group>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
                         <field name="parent_id"/>
                     </group>
                     <newline/>
@@ -2347,48 +2347,61 @@
         <!--  Wizard for Multi Charts of Accounts -->
 
         <record id="view_wizard_multi_chart" model="ir.ui.view">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="name">Set Your Accounting Options</field>
             <field name="model">wizard.multi.charts.accounts</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-              <data>
                 <form position="attributes" version="7.0">
-                  <attribute name="string">Accounting Application Configuration</attribute>
+                    <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
+                <button name="action_skip" position="replace"/>
                 <group string="res_config_contents" position="replace">
-                	<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150"/>
-                	<separator string="Generate Your Chart of Accounts from a Chart Template"/>
-                    <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                    <field name="code_digits" groups="account.group_account_user"/>
-                    <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                    <field name="seq_journal"/>
-                    <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                    <field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                    <newline/>
-                    <field name ="sale_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                    <field name ="purchase_tax_rate" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
-                    <field name ="complete_tax_set" invisible="1"/>
-                    <newline/> <!-- extended view because the web UI is not good for one2many -->
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
-                        <form string="Bank Information">
-                            <field name="acc_name"/>
-                            <field name="account_type"/>
-                            <field name="currency_id" widget="selection"/>
-                        </form>
-                        <tree editable="bottom" string="Bank Information">
-                            <field name="acc_name"/>
-                            <field name="account_type"/>
-                            <field name="currency_id" widget="selection"/>
-                        </tree>
-                    </field>
+                    <field name="only_one_chart_template" invisible="1"/>
+                    <field name="complete_tax_set" invisible="1"/>
+                    <p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
+                    <div groups="base.group_multi_company">
+                        <label for="company_id"/>
+                        <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                    </div>
+                    <group string="Set Your Accounting Options">
+                        <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
+                            <label for="chart_template_id"/>
+                            <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                        </div>
+                        <newline/>
+                        <group groups="account.group_account_user">
+                            <field name="code_digits"/>
+                        </group>
+                        <group>
+                            <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
+                            <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
+                                <field name="sale_tax_rate" class="oe_inline" on_change="onchange_tax_rate(sale_tax_rate)"/> %%
+                            </div>
+                            <field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <label for="purchase_tax_rate" string="Purchase Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
+                            <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
+                                <field name="purchase_tax_rate" class="oe_inline"/> %%
+                            </div>
+                        </group>
+                    </group>
+                    <div groups="account.group_account_user">
+                        <label for="bank_accounts_id" string="Bank Information"/>
+                        <field name="bank_accounts_id">
+                            <tree editable="bottom">
+                                <field name="acc_name"/>
+                                <field name="account_type"/>
+                                <field name="currency_id" widget="selection"/>
+                            </tree>
+                        </field>
+                    </div>
                 </group>
-              </data>
             </field>
         </record>
 
         <record id="action_wizard_multi_chart" model="ir.actions.act_window">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="name">Set Your Accounting Options</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.multi.charts.accounts</field>
             <field name="view_id" ref="view_wizard_multi_chart"/>
@@ -2443,7 +2456,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
-                    <field name="name"/>
+                    <field name="name" string="Fiscal Position Template"/>
                 </search>
             </field>
         </record>
@@ -2733,9 +2746,10 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <group>
-                        <field name="name"/>
-                        <field name="type"/>
+                        <field name="name" string="Account Report"/>
+                        <separator orientation="vertical"/>
                         <field name="account_report_id"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 0f01be87a26..913e43e5982 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -1,38 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="action_aged_receivable" model="ir.actions.act_window">
-            <field name="name">Receivable Accounts</field>
-            <field name="res_model">report.account.receivable</field>
+
+        <record id="action_company_analysis_tree" model="ir.actions.act_window">
+            <field name="name">Company Analysis</field>
+            <field name="res_model">account.entries.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_account_entries_report_tree"/>
+            <field name="domain">[('year','=',time.strftime('%Y'))]</field>
+        </record>
+
+        <record id="action_treasory_graph" model="ir.actions.act_window">
+            <field name="name">Treasury</field>
+            <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','receivable')]</field>
+            <field name="domain">[('type','=','liquidity')]</field>
+            <field name="context">{'default_type': 'liquidity'}</field>
+            <field name="view_id" ref="account.view_treasory_graph"/>
         </record>
-        <record id="action_aged_income" model="ir.actions.act_window">
-            <field name="name">Income Accounts</field>
-            <field name="res_model">report.account.receivable</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','income')]</field>
-        </record>
-      <record id="action_company_analysis_tree" model="ir.actions.act_window">
-          <field name="name">Company Analysis</field>
-          <field name="res_model">account.entries.report</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">tree,graph</field>
-          <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
-          <field name="view_id" ref="account.view_account_entries_report_tree"/>
-          <field name="domain">[('year','=',time.strftime('%Y'))]</field>
-      </record>
-      <record id="action_treasory_graph" model="ir.actions.act_window">
-          <field name="name">Treasury</field>
-          <field name="res_model">account.account</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>
-          <field name="domain">[('type','=','liquidity')]</field>
-          <field name="context">{'default_type': 'liquidity'}</field>
-          <field name="view_id" ref="account.view_treasory_graph"/>
-      </record>
+
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -45,7 +34,7 @@
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                         <column>
-                            <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
+                            <action name="%(action_treasory_graph)d" string="Treasury"/>
                         </column>
                     </board>
                 </form>
@@ -53,7 +42,7 @@
         </record>
 
         <record id="open_board_account" model="ir.actions.act_window">
-            <field name="name">Accounting Dashboard</field>
+            <field name="name">Accounting</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -61,8 +50,12 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
-        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
+        <menuitem id="menu_board_account"
+                  action="open_board_account" 
+                  icon="terp-graph"  
+                  parent="base.menu_reporting_dashboard" 
+                  groups="group_account_user,group_account_manager" 
+                  sequence="45"/>
 
     </data>
 </openerp>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 12fd558a31f..e8899d0348a 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -555,19 +555,6 @@
             <field eval="1" name="number_increment"/>
         </record>
 
-        <!-- 
-        Sequence for analytic account 
-        -->
-        <record id="seq_type_analytic_account" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
-        <record id="seq_analytic_account" model="ir.sequence">
-            <field name="name">Analytic account sequence</field>
-            <field name="code">account.analytic.account</field>
-            <field eval="3" name="padding"/>
-            <field eval="2708" name="number_next"/>
-        </record>
 
         <!--
         Invoice requests (deprecated)
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 7c3d2a88037..756866a3a50 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -548,7 +548,7 @@
         </record>
 
         <record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="name">Set Your Accounting Options</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="category_id" ref="account.category_accounting_configuration"/>
             <field name="type">automatic</field>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 781ead6b30e..b092b3a2f8c 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -168,11 +168,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -626,18 +621,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
@@ -1557,11 +1540,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."
@@ -2544,13 +2522,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -2913,7 +2884,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -5908,11 +5879,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6411,11 +6377,6 @@ msgid "You can specify year, month and date in the name of the model using the f
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6608,7 +6569,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index d8ebd69ca25..1b7cde8d05f 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgstr "مصدر الحساب"
 msgid "All Analytic Entries"
 msgstr "كل القيود التحليلية"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "الفواتير التي تم أنشاءها خلال 15 يوما الماضية"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -688,18 +683,6 @@ msgstr "فترة السجل"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "حسابات مدينة"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1678,11 +1661,6 @@ msgstr "مسلسلات اليومية منفصلة"
 msgid "Responsible"
 msgstr "مسئول"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "المبيعات حسب نوع الحساب"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2764,13 +2742,6 @@ msgstr "الإعدادات المالية للشركة الجديدة"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "المبيعات بعرض الحسابات"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3166,8 +3137,8 @@ msgstr "قوالب شجرة الحسابات"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "إنشاء شجرة حسابات من قالب"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6373,11 +6344,6 @@ msgstr "أدخل تاريخ البدء !"
 msgid "Supplier Refund"
 msgstr "رد للمورد"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "اللوحة الرئيسية"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6942,11 +6908,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "حسابات الدخل"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7175,7 +7136,7 @@ msgstr "قالب حساب رئيسي"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10815,6 +10776,9 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "المدخلات المحاسبية -"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "الفواتير التي تم أنشاءها خلال 15 يوما الماضية"
+
 #~ msgid "Negative"
 #~ msgstr "سالب"
 
@@ -10913,6 +10877,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "علم علي هذه لو أن هذا المستخدم لتسوية قيود هذا الحساب."
 
+#~ msgid "Sales by Account"
+#~ msgstr "المبيعات بعرض الحسابات"
+
 #~ msgid "Reference Number"
 #~ msgstr "رقم المرجع"
 
@@ -10949,6 +10916,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "ذهاب للشريك التالي"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "المبيعات حسب نوع الحساب"
+
 #, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "يجب إعطاء حساب لقيود الإعدام !"
@@ -10969,6 +10939,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "خطأ! لا يمكنك إنشاء فئات متداخلة."
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "إنشاء شجرة حسابات من قالب"
+
 #, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "لا يمكن حذف فاتورة إذا كانت مفتوحة أو مدفوعة!"
@@ -11095,6 +11068,10 @@ msgstr ""
 #~ msgid "Aged Receivables"
 #~ msgstr "الديون المشكوك في تحصيلها"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "حسابات مدينة"
+
 #~ msgid "Net Profit"
 #~ msgstr "صافي الربح"
 
@@ -11223,6 +11200,9 @@ msgstr ""
 #~ msgid "7"
 #~ msgstr "٧"
 
+#~ msgid "Dashboard"
+#~ msgstr "اللوحة الرئيسية"
+
 #, python-format
 #~ msgid "Unable to find a valid period !"
 #~ msgstr "غير قادر على العثور على فترة صالحة!"
@@ -11277,6 +11257,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "تقرير حساب الأرباح و الخسائر"
 
+#~ msgid "Income Accounts"
+#~ msgstr "حسابات الدخل"
+
 #~ msgid "Period length (days)"
 #~ msgstr "مدة الفتر (أيام)"
 
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 353dce5ed90..fea3ae7a3fa 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgstr "Счетоводен източник"
 msgid "All Analytic Entries"
 msgstr "Всички аналитични записи"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Фактури създадени през последните 15 дни"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -698,18 +693,6 @@ msgstr "Период на дневник"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Приходни сметки"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1704,11 +1687,6 @@ msgstr "Разделени журнални последователности"
 msgid "Responsible"
 msgstr "Отговорник"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Продажби по вид сметка"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2771,13 +2749,6 @@ msgstr "Финансови настройки на нова фирма"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Продажби по сметка"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3170,8 +3141,8 @@ msgstr "Диаграми с шаблони на сметки"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Генериране графика на сметките от шаблон за графики"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6322,11 +6293,6 @@ msgstr "Въведете начална дата!"
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Табло"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6883,11 +6849,6 @@ msgstr ""
 "\n"
 "Напр. Мой модел от %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Приходни сметки"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7102,7 +7063,7 @@ msgstr "Шаблон на родителска сметка"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11192,6 +11153,9 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Баланса на отчета не е правилен !\n"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Генериране графика на сметките от шаблон за графики"
+
 #, python-format
 #~ msgid ""
 #~ "You can not do this modification on a confirmed entry ! Please note that you "
@@ -11308,6 +11272,10 @@ msgstr ""
 #~ "Различна база на данък !\n"
 #~ "Натиснета на Изчисляване за обновяване на базата на данъка"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Приходни сметки"
+
 #, python-format
 #~ msgid ""
 #~ "Selected Move lines does not have any account move enties in draft state"
@@ -11430,6 +11398,9 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Изчисляващ код за данъци, включени в цените"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Фактури създадени през последните 15 дни"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11485,6 +11456,9 @@ msgstr ""
 #~ msgid "Your Reference"
 #~ msgstr "Ваша референция"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажби по вид сметка"
+
 #, python-format
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Сметката не е посочена за равняване!"
@@ -11512,6 +11486,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Грешка! Не може да създавате рекурсивни категории"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Продажби по сметка"
+
 #~ msgid "Total :"
 #~ msgstr "Общо :"
 
@@ -11567,6 +11544,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Вид обезщетение"
 
+#~ msgid "Dashboard"
+#~ msgstr "Табло"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  оценка: процент"
 
@@ -11574,6 +11554,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Текущата валута не е настроена правилно!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Приходни сметки"
+
 #~ msgid "Display accounts"
 #~ msgstr "Показване на сметки"
 
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index fa9212010e6..2a909753cba 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "Mammenn ar gont"
 msgid "All Analytic Entries"
 msgstr "An holl enmontoù analitek"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index c4d9a7f6644..0081ad0211d 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgstr "Izvor Računa"
 msgid "All Analytic Entries"
 msgstr "Sve analitičke stavke"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fakture unesene u zadnjih 15 dana"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -669,18 +664,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Potražni računi"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1642,11 +1625,6 @@ msgstr "Razdvojeni redoslijedi naloga za knjiženje"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2701,13 +2679,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3097,8 +3068,8 @@ msgstr "Predlošci računskog plana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generiraj kontni plan iz predloška"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6238,11 +6209,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Povrat dobavljaču"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6786,11 +6752,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta prihoda"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7005,7 +6966,7 @@ msgstr "Predložak roditeljskog računa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10770,6 +10731,9 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Prikaži račune "
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generiraj kontni plan iz predloška"
+
 #~ msgid "Print General Journal"
 #~ msgstr "Ispis općeg dnevnika knjiženja"
 
@@ -11174,6 +11138,10 @@ msgstr ""
 #~ msgid "Control Invoice"
 #~ msgstr "Kontroliraj fakturu"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Potražni računi"
+
 #~ msgid "Date payment"
 #~ msgstr "Datum plaćanja"
 
@@ -11677,9 +11645,15 @@ msgstr ""
 #~ msgid "The sequence used for invoice numbers in this journal."
 #~ msgstr "Sekvence korištene za brojeve faktura u ovoj knjizi."
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta prihoda"
+
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fakture unesene u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrstama"
 
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 653c0e4ffea..05206357deb 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgstr "Origen compte"
 msgid "All Analytic Entries"
 msgstr "Tots els assentaments analítics"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Factures creades en els últims 15 dies"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -698,18 +693,6 @@ msgstr ""
 "Per conciliar els seients, la companyia hauria de ser la mateixa per a tots "
 "els assentaments"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Comptes a cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1695,11 +1678,6 @@ msgstr "Seqüències de diaris separades"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendes per tipus de compte"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2803,13 +2781,6 @@ msgstr "Configuració financera per una nova companyia"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendes per compte"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3212,8 +3183,8 @@ msgstr "Plantilles pel pla comptable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Genera pla comptable a partir d'una plantilla de pla comptable"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6448,11 +6419,6 @@ msgstr "Introduïu una data d'inici!"
 msgid "Supplier Refund"
 msgstr "Factura rectificativa (abonament) de proveïdor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Taulell"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7034,11 +7000,6 @@ msgstr ""
 "%(date)s: Data actual\n"
 "Exemple: El meu model a %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Comptes d'ingressos"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7273,7 +7234,7 @@ msgstr "Plantilla compte pare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11207,6 +11168,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Assent. factura"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Genera pla comptable a partir d'una plantilla de pla comptable"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Declaracions oficials"
 
@@ -11803,6 +11767,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Cost i retorn del compte per diari (aquest mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Comptes a cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Obre per trencar conciliació"
 
@@ -12505,6 +12473,12 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "No podeu eliminar un compte que conté assentaments comptables. "
 
+#~ msgid "Income Accounts"
+#~ msgstr "Comptes d'ingressos"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Factures creades en els últims 15 dies"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Comptes per tipus"
 
@@ -12571,6 +12545,9 @@ msgstr ""
 #~ "Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
 #~ "que \"0\")!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendes per tipus de compte"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! No podeu definir exercicis fiscals que es superposin"
 
@@ -12603,6 +12580,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Test codi impost"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendes per compte"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12720,6 +12700,9 @@ msgstr ""
 #~ "No s'ha trobat un pla comptable per a aquesta companyia. Creeu un pla "
 #~ "comptable."
 
+#~ msgid "Dashboard"
+#~ msgstr "Taulell"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valoració: percentatge"
 
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 8acc3434d97..3d04d7a944d 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
+"PO-Revision-Date: 2012-06-20 16:14+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\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 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -183,11 +183,6 @@ msgstr "Zdroj účtu"
 msgid "All Analytic Entries"
 msgstr "Všechny analytické záznamy"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktury vytvořené v posledních 15 dnech"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -693,18 +688,6 @@ msgstr "Období knihy"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Při likvidaci záznamů by u všech měla být stejná firma"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Pohledávky"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1679,11 +1662,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "Odopovědné"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodeje dle typu účtu"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2752,13 +2730,6 @@ msgstr "Nové finanční nastavení společnosti"
 msgid "Configure Your Chart of Accounts"
 msgstr "Nastavit vaši účtovou osnovu"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodeje dle účtu"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3145,8 +3116,8 @@ msgstr "Šablony účtové osnovy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generovat účtovou osnovu z šablony osnovy"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6302,11 +6273,6 @@ msgstr "Zadejte počáteční datum !"
 msgid "Supplier Refund"
 msgstr "Dobropis dodavatele"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Nástěnka"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6855,11 +6821,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Příjmové účty"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7076,7 +7037,7 @@ msgstr "Nadřazená šablona účtu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instalovat vaši účtovou osnovu"
 
 #. module: account
@@ -10834,6 +10795,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Jít na dalšího partnera"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodeje dle typu účtu"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Včetně počátečních zůstatků"
 
@@ -10879,6 +10843,9 @@ msgstr ""
 #~ "Nemůžete změnit společnost tohoto deníku, protože vztažené záznamy existují "
 #~ "v řádcích položek"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodeje dle účtu"
+
 #~ msgid "Reference Number"
 #~ msgstr "Referenční číslo"
 
@@ -10983,6 +10950,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Typ úhrady"
 
+#~ msgid "Dashboard"
+#~ msgstr "Nástěnka"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Výkaz účtu zisku a ztrát"
 
@@ -10990,6 +10960,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Aktuální měna není správně nastavena !"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Příjmové účty"
+
 #~ msgid "9"
 #~ msgstr "9"
 
@@ -11095,6 +11068,9 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "Nemůžete odebrat účet, který má účetní položky!. "
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generovat účtovou osnovu z šablony osnovy"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Nastavení osnovy účetnictví"
 
@@ -11116,6 +11092,9 @@ msgstr ""
 #~ "Výkaz zisku a ztráty Vám dá přehled o zisku či ztrátě společnosti v jediném "
 #~ "dokumentu"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktury vytvořené v posledních 15 dnech"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -11154,6 +11133,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "konečný zůstatek zadaný ověřovatelem pokladny"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Pohledávky"
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Nesprávný zůstatek výpisu!\n"
@@ -11364,6 +11347,9 @@ msgstr ""
 #~ msgid "Sale Tax(%)"
 #~ msgstr "Prodejní daň(%)"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalovat vaši účtovou osnovu"
+
 #~ msgid ""
 #~ "Bank Account Number, Company bank account if Invoice is customer or supplier "
 #~ "refund, otherwise Partner bank account number."
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index def9c58b89b..6592fbeb4ed 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "Kontokilde"
 msgid "All Analytic Entries"
 msgstr "Alle analytiske poster"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -666,18 +661,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1639,11 +1622,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2694,13 +2672,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3091,7 +3062,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6220,11 +6191,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6764,11 +6730,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6983,7 +6944,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 84060bf9d08..3394913008b 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-06-25 09:07+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <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-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgstr "Buchungsgrundlage"
 msgid "All Analytic Entries"
 msgstr "Alle Analytischen Buchungen"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Rechnungen der letzten 15 Tage"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -715,18 +710,6 @@ msgstr ""
 "Für den Ausgleich von Offenen Posten sollte das Unternehmen bei allen "
 "Buchungen identisch sein"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitorenkonten"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1735,11 +1718,6 @@ msgstr "Unterschiedliche Journal Sequenzen"
 msgid "Responsible"
 msgstr "Mitarbeiter"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkäufe nach Kontotypen"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2864,13 +2842,6 @@ msgstr "Neue Firma Buchhaltung Anlegen"
 msgid "Configure Your Chart of Accounts"
 msgstr "Konfigurieren Sie Ihren Kontenplan"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkäufe nach Konten"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3280,8 +3251,8 @@ msgstr "Kontenplan Vorlagen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Erzeuge Kontenplan von Template"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -5466,7 +5437,7 @@ msgstr "Standardauswertung Finanzen"
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr "Buchungstext"
+msgstr "Kommunikation"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -6582,11 +6553,6 @@ msgstr "Geben Sie ein Startdatum ein !"
 msgid "Supplier Refund"
 msgstr "Lieferanten Gutschrift"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Pinnwand"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7178,11 +7144,6 @@ msgstr ""
 "\n"
 "z.B.  Meine Buchungsvorlage am %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Ertragskonten"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7428,7 +7389,7 @@ msgstr "Basiskonto Vorlage"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Installieren Sie Ihren Kontenplan"
 
 #. module: account
@@ -8904,7 +8865,7 @@ msgstr "Offene Rechnungen"
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr "Die Zahlungskondotionen des Lieferanten haben keine Zeilen!"
+msgstr "Die Zahlungskonditionen des Lieferanten haben keine Zeilen!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -11505,6 +11466,9 @@ msgstr ""
 #~ msgid "Print General Journal"
 #~ msgstr "Salden nach Perioden und Journal"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Erzeuge Kontenplan von Template"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Summen & Salden"
 
@@ -12612,12 +12576,18 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Beleg OP-Ausgleich"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Ertragskonten"
+
 #~ msgid "Total :"
 #~ msgstr "Summe :"
 
 #~ msgid "Year :"
 #~ msgstr "Jahr"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Rechnungen der letzten 15 Tage"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konten nach Typ"
 
@@ -12710,6 +12680,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Gehe zu nächstem Partner"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkäufe nach Kontotypen"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben"
 
@@ -12761,6 +12734,9 @@ msgstr ""
 #~ "Sie können das zugewiesene Unternehmen bei einem Journal nicht ändern, da es "
 #~ "bereits abhängige Daten in vorhandenen Journalen gibt."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkäufe nach Konten"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12946,6 +12922,9 @@ msgstr ""
 #~ "Es konnte kein Kontenplan für dieses Unternehmen gefunden werden. Bitte "
 #~ "definieren Sie ein Konto."
 
+#~ msgid "Dashboard"
+#~ msgstr "Pinnwand"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Auswertung Gewinn und Verlust"
 
@@ -13211,6 +13190,10 @@ msgstr ""
 #~ "Sie können kein Konto löschen, ohne dabei auch vorher die jeweiligen "
 #~ "Buchungszeilen zu löschen, wenn dieses vor dem neuen Sinnvoll ist. "
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitorenkonten"
+
 #~ msgid "Tax codes"
 #~ msgstr "Umsatzsteuererklärung"
 
@@ -13368,5 +13351,8 @@ msgstr ""
 #~ "Bitte definieren Sie eine Sequenz für die automatische Nummernvergabe bei "
 #~ "der Journaldefinition oder vergeben Sie eine Nummer per Hand."
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Installieren Sie Ihren Kontenplan"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Beschreibung auf Rechnungen"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 0488df531c8..20d991c7404 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgstr "Πηγή Λογαριασμού"
 msgid "All Analytic Entries"
 msgstr "Όλες οι εγγραφές αναλυτικής"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -700,18 +695,6 @@ msgstr "Ημερολογιακή Περίοδος"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Λογαριασμοί Εισπρακτέοι"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1676,11 +1659,6 @@ msgstr "Διαχωρισμένες Ιεραρχήσεις Ημερολογίου
 msgid "Responsible"
 msgstr "Υπεύθυνος"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Πωλήσεις Τύπο Λογαριασμού"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2739,13 +2717,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3137,8 +3108,8 @@ msgstr "Πρότυπα Λογιστικών Σχεδίων"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Δημιουργία Λογιστικού Σχεδίου από Πρότυπο"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6289,11 +6260,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Επιστροφή Χρημάτων από Προμηθευτή"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6837,11 +6803,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Λογαριασμοί Εσόδων"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7056,7 +7017,7 @@ msgstr "Πρότυπο Μητρικού Λογαριασμού"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11122,6 +11083,9 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Το υπόλοιπο του παραστατικού είναι εσφαλμένο\n"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Δημιουργία Λογιστικού Σχεδίου από Πρότυπο"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Νομικές Δηλώσεις"
 
@@ -11563,6 +11527,10 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Τροποποίηση Τιμολογίου"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Λογαριασμοί Εισπρακτέοι"
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
@@ -12037,12 +12005,18 @@ msgstr ""
 #~ "Αν είναι λογαριασμός φόρου εδώ θα περιέχει το ποσό μετά τον φόρο, αν είναι "
 #~ "λογαριασμός βάσης του φόρου θα περιέχει το αφορολόγητο ποσό."
 
+#~ msgid "Income Accounts"
+#~ msgstr "Λογαριασμοί Εσόδων"
+
 #~ msgid "Total :"
 #~ msgstr "Σύνολο:"
 
 #~ msgid "Year :"
 #~ msgstr "Έτος :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Λογαριασμοί με βάση τον τύπο"
 
@@ -12083,6 +12057,9 @@ msgstr ""
 #~ msgid "Anglo-Saxon Accounting"
 #~ msgstr "Αγγλο- Σαχονικό Σύστημα Λογιστικής"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Πωλήσεις Τύπο Λογαριασμού"
+
 #~ msgid "Voucher Management"
 #~ msgstr "Διαχείριση παραστατικών"
 
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index aef14048d89..124c69b0cda 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgstr "Account Source"
 msgid "All Analytic Entries"
 msgstr "All Analytic Entries"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Invoices Created Within Past 15 Days"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -693,18 +688,6 @@ msgstr "Journal Period"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Accounts Receivable"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1666,11 +1649,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2720,13 +2698,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3116,8 +3087,8 @@ msgstr "Chart of Accounts Templates"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6261,11 +6232,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6807,11 +6773,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7026,7 +6987,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10530,6 +10491,9 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negative"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Invoices Created Within Past 15 Days"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -10561,6 +10525,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "closing balance entered by the cashbox verifier"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Accounts Receivable"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
@@ -10957,6 +10925,9 @@ msgstr ""
 #~ msgid "Print General Journal"
 #~ msgstr "Print General Journal"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generate Chart of Accounts from a Chart Template"
+
 #~ msgid "Journal d'ouverture"
 #~ msgstr "Journal d'ouverture"
 
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index aa76d327688..cfc2573763b 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2689,13 +2667,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3078,7 +3049,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6207,11 +6178,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6751,11 +6717,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6970,7 +6931,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 0fe3df3cb8e..4332daeac45 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
+"PO-Revision-Date: 2012-06-20 16:18+0000\n"
 "Last-Translator: mikel <mikel.martin@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-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgstr "Origen cuenta"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -712,18 +707,6 @@ msgstr ""
 "Para conciliar los asientos, la compañía debería ser la misma para todos los "
 "asientos"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1726,11 +1709,6 @@ msgstr "Secuencias de diarios separadas"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2854,13 +2832,6 @@ msgstr "Configuración financiera para nueva compañía"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3267,8 +3238,8 @@ msgstr "Plantillas para el plan contable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6549,11 +6520,6 @@ msgstr "¡Introduzca una fecha inicial!"
 msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7142,11 +7108,6 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7386,7 +7347,7 @@ msgstr "Plantilla cuenta padre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instalar su árbol de cuentas"
 
 #. module: account
@@ -11505,6 +11466,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Asiento factura"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generar plan contable a partir de una plantilla de plan contable"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Declaraciones oficiales"
 
@@ -12084,6 +12048,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Costo y retorno de la cuenta por diario (este mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas a cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Abrir para romper conciliación"
 
@@ -12629,12 +12597,18 @@ msgstr ""
 #~ msgid "Generate entries before:"
 #~ msgstr "Generar asientos hasta:"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
 #~ msgid "Year :"
 #~ msgstr "Ejercicio :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Cuentas por tipo"
 
@@ -12841,6 +12815,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Ir a la siguiente empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Cuenta de reservas y pérdidas/ganancias"
 
@@ -12862,6 +12839,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Diario"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12990,6 +12970,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Contabilidad. Informe de pérdida y ganancias"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
 #, python-format
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr ""
@@ -13379,5 +13362,8 @@ msgstr ""
 #~ msgid "Balance:"
 #~ msgstr "Balance:"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalar su árbol de cuentas"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Descripción en facturas"
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index a019ce34f9a..da52cd29225 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -177,11 +177,6 @@ msgstr "Cuenta origen"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -667,18 +662,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1641,11 +1624,6 @@ msgstr "Secuancias de diarios separados"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2700,13 +2678,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3098,8 +3069,8 @@ msgstr "Plantillas del plan de cuentas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar Plan de Cuentas desde una plantilla"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6248,11 +6219,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Reembolso de proveedor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6798,11 +6764,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7019,7 +6980,7 @@ msgstr "Plantilla cuenta padre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10777,6 +10738,9 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "El balance del extracto es incorrecto!\n"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generar Plan de Cuentas desde una plantilla"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Declaraciones Legales"
 
@@ -11360,6 +11324,10 @@ msgstr ""
 #~ msgid "By Date"
 #~ msgstr "Por fecha"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas a cobrar"
+
 #~ msgid "Date payment"
 #~ msgstr "Fecha de pago"
 
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 22275fab8aa..015b28492e3 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgstr "Cuenta de origen"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -682,18 +677,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -791,7 +774,7 @@ msgstr ""
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr ""
+msgstr "¡Faltan impuestos!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -904,7 +887,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "Tabla de impuestos"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -1207,7 +1190,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Impuestos usados en las compras"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1336,7 +1319,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Impuestos"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:69
@@ -1435,7 +1418,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Buscar impuestos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1460,7 +1443,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Calcular impuestos"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1655,11 +1638,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -1670,7 +1648,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturación"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
@@ -2461,7 +2439,7 @@ msgstr ""
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Impuestos proveedor"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2499,6 +2477,8 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"La posición fiscal calculará los impuestos y las cuentas contables "
+"utilizados para esta empresa."
 
 #. module: account
 #: view:account.print.journal:0
@@ -2705,13 +2685,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -2911,6 +2884,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Indica si el importe del impuesto deberá incluirse en el importe base antes "
+"de calcular los siguientes impuestos."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3094,7 +3069,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -3297,7 +3272,7 @@ msgstr ""
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Impuestos de compras"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -4141,7 +4116,7 @@ msgstr ""
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Impuestos por defecto"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -4405,7 +4380,7 @@ msgstr ""
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Selecciona plan de impuestos."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4535,7 +4510,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5277,7 +5252,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "Esta acción borrará impuestos"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5351,7 +5326,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Texto normal"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5441,7 +5416,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Datos facturación"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5899,7 +5874,7 @@ msgstr ""
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Impuestos de cliente"
 
 #. module: account
 #: help:account.model,name:0
@@ -5920,7 +5895,7 @@ msgstr ""
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Configuración informes"
 
 #. module: account
 #: field:account.tax,type:0
@@ -5980,6 +5955,7 @@ msgstr ""
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
 msgstr ""
+"Lista de todos los impuestos que deben ser instalados por el asistente"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -6124,6 +6100,8 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indica si el importe del impuesto debe ser incluido en el importe base para "
+"el cálculo de los siguientes impuestos."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6221,11 +6199,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6765,11 +6738,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6984,7 +6952,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -7126,12 +7094,12 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Información del banco"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Informes"
 
 #. module: account
 #: code:addons/account/account_move_line.py:759
@@ -7256,7 +7224,7 @@ msgstr ""
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_email_templates
@@ -7778,6 +7746,13 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"La estructura normal de cuentas está definida por los requerimientos legales "
+"del país. La estructura de árbol de cuentas analíticas reflejan sus propias "
+"necesidades de negocio en términos de informes costo/beneficio. Son "
+"usualmente estructurados en función de contratos, proyectos, productos o "
+"departamentos. La mayoría de las operaciones de OpenERP (facturas, "
+"imputaciones de horas, gastos, etc) generan entradas analíticas en la cuenta "
+"relacionada."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7982,7 +7957,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Informes genéricos"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -8195,6 +8170,13 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Este botón solo aparece cuando el estado de la factura es 'pagado' "
+"(mostrando que ha sido totalmente conciliado) y el campo booleano "
+"autocalculado 'pagado/conciliado' es falso (representa que ya no es el "
+"caso). En otras palabra, la conciliación de la factura ha sido rota y ya no "
+"está en estado 'pagado'. Debería presionar este botón para volver a abrir la "
+"factura y le permitirá continuar su proceso normal después de haber resuelto "
+"la excepción eventual que lo puede haber producido."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8431,7 +8413,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Facturación y pagos"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -10454,5 +10436,8 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Defina una secuencia en el diario de la factura"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "abrierto para reconciliacion"
diff --git a/addons/account/i18n/es_CR.po b/addons/account/i18n/es_CR.po
index 40bb717e630..dcca71a0020 100644
--- a/addons/account/i18n/es_CR.po
+++ b/addons/account/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: account
@@ -187,11 +187,6 @@ msgstr "Origen cuenta"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -713,18 +708,6 @@ msgstr ""
 "Para conciliar los asientos, la compañía debería ser la misma para todos los "
 "asientos"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por Cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1727,11 +1710,6 @@ msgstr "Secuencias de diarios separadas"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2855,13 +2833,6 @@ msgstr "Configuración financiera para nueva compañía"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3268,8 +3239,8 @@ msgstr "Plantillas para el plan contable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6554,11 +6525,6 @@ msgstr "¡Introduzca una fecha inicial!"
 msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7147,11 +7113,6 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7391,8 +7352,8 @@ msgstr "Plantilla cuenta padre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
-msgstr "Instalar su árbol de cuentas"
+msgid "Configure your Chart of Accounts"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -11186,15 +11147,27 @@ msgstr ""
 "El monto residual de una línea de asiento por cobrar o por pagar expresado "
 "en su moneda (puede ser diferente de la moneda de la compañía)."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "Abrir para romper conciliación"
 
 #~ msgid "Go to next partner"
 #~ msgstr "Ir a la siguiente empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid "Tax codes"
 #~ msgstr "Códigos de impuestos"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generar plan contable a partir de una plantilla de plan contable"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Cuentas por tipo"
 
@@ -11213,6 +11186,12 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Crear una cuenta basada en esta plantilla"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Open for bank reconciliation"
 #~ msgstr "Abrir para la conciliación bancaria"
 
@@ -13391,5 +13370,12 @@ msgstr ""
 #~ msgid "Balance:"
 #~ msgstr "Balance:"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalar su árbol de cuentas"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Descripción en facturas"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por Cobrar"
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 5e98caba2df..58e1b207809 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -17,8 +17,8 @@ msgstr ""
 "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 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -189,11 +189,6 @@ msgstr "Origen cuenta"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -709,18 +704,6 @@ msgstr ""
 "Para conciliar las entradas de la compañia debe ser las mismas para todos "
 "los asientos"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por Cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1724,11 +1707,6 @@ msgstr "Secuencias de diarios separadas"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sales by Account Type"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2847,13 +2825,6 @@ msgstr "Configuración Contable de Nueva Empresa"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por Cuenta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3257,8 +3228,8 @@ msgstr "Plantillas para el plan contable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6530,11 +6501,6 @@ msgstr "Enter a Start date !"
 msgid "Supplier Refund"
 msgstr "Nota de Credito"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7123,11 +7089,6 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7366,8 +7327,8 @@ msgstr "Plantilla de cuenta padre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
-msgstr "Instalar su Plan de Cuentas"
+msgid "Configure your Chart of Accounts"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -11346,6 +11307,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Asiento factura"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generar plan contable a partir de una plantilla de plan contable"
+
 #~ msgid "Positive"
 #~ msgstr "Positivo"
 
@@ -12161,6 +12125,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Cuentas de costos y ganancias por diario (este mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por Cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Abrir para desconciliacion"
 
@@ -12382,6 +12350,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Revisar si usuario esta permitido para conciliar entradas en esta cuenta"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
@@ -12407,6 +12378,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Núm. Referencia"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "No hay diario definido para el cierre de ejercicio fiscal"
@@ -12512,6 +12486,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Siguiente Empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sales by Account Type"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! You cannot define overlapping fiscal years"
 
@@ -12572,6 +12549,9 @@ msgstr ""
 #~ "You cannot modify company of this journal as its related record exist in "
 #~ "Entry Lines"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por Cuenta"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -12764,6 +12744,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Account Profit And Loss Report"
 
@@ -13221,5 +13204,8 @@ msgstr ""
 #~ msgid "Liabilities"
 #~ msgstr "Pasivos"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalar su Plan de Cuentas"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Descripción en facturas"
diff --git a/addons/account/i18n/es_MX.po.moved b/addons/account/i18n/es_MX.po.moved
deleted file mode 100644
index 7a69e08a362..00000000000
--- a/addons/account/i18n/es_MX.po.moved
+++ /dev/null
@@ -1,9130 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-10-07 15:12+0000\n"
-"PO-Revision-Date: 2011-10-07 15:12+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
-msgid "System payment"
-msgstr "Sistema de pagos"
-
-#. module: account
-#: view:account.journal:0
-msgid "Other Configuration"
-msgstr "Otra configuración"
-
-#. module: account
-#: code:addons/account/account.py:516
-#, python-format
-msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
-msgstr "No se puede eliminar/desactivar una cuenta que está vinculada a una empresa."
-
-#. module: account
-#: view:account.move.reconcile:0
-msgid "Journal Entry Reconcile"
-msgstr "Conciliar poliza contable"
-
-#. module: account
-#: field:account.installer.modules,account_voucher:0
-msgid "Voucher Management"
-msgstr "Gestión de recibos"
-
-#. module: account
-#: view:account.account:0
-#: view:account.bank.statement:0
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Account Statistics"
-msgstr "Estadísticas de cuentas"
-
-#. module: account
-#: field:account.invoice,residual:0
-#: field:report.invoice.created,residual:0
-msgid "Residual"
-msgstr "Pendiente"
-
-#. module: account
-#: code:addons/account/invoice.py:793
-#, python-format
-msgid "Please define sequence on invoice journal"
-msgstr "Defina una secuencia en el diario de la factura"
-
-#. module: account
-#: constraint:account.period:0
-msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "¡Error! La duración de el/los período(s) no es válida. "
-
-#. module: account
-#: field:account.analytic.line,currency_id:0
-msgid "Account currency"
-msgstr "Moneda contable"
-
-#. module: account
-#: view:account.tax:0
-msgid "Children Definition"
-msgstr "Definición hijos"
-
-#. module: account
-#: model:ir.model,name:account.model_report_aged_receivable
-msgid "Aged Receivable Till Today"
-msgstr "A cobrar vencidos hasta hoy"
-
-#. module: account
-#: field:account.partner.ledger,reconcil:0
-msgid "Include Reconciled Entries"
-msgstr "Incluir polizas conciliadas"
-
-#. module: account
-#: view:account.pl.report:0
-msgid "The Profit and Loss report gives you an overview of your company profit and loss in a single document"
-msgstr "El informe de pérdidas y ganancias (P&G) le da una visión global de las pérdidas y ganancias de su empresa en un único documento"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_invoiceimport0
-msgid "Import from invoice or payment"
-msgstr "Importar desde factura o pago"
-
-#. module: account
-#: model:ir.model,name:account.model_wizard_multi_charts_accounts
-msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
-
-#. module: account
-#: view:account.move:0
-msgid "Total Debit"
-msgstr "Total debe"
-
-#. module: account
-#: view:account.unreconcile:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"
-msgstr "Si rompe la conciliación de transacciones, también debe verificar todas la acciones que están relacionadas con esas transacciones porqué no serán deshabilitadas."
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Accounting Entries-"
-msgstr "Polizas contables"
-
-#. module: account
-#: code:addons/account/account.py:1309
-#, python-format
-msgid "You can not delete posted movement: \"%s\"!"
-msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
-
-#. module: account
-#: report:account.invoice:0
-#: field:account.invoice.line,origin:0
-msgid "Origin"
-msgstr "Origen"
-
-#. module: account
-#: view:account.account:0
-#: field:account.account,reconcile:0
-#: view:account.automatic.reconcile:0
-#: field:account.move.line,reconcile_id:0
-#: view:account.move.line.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Reconcile"
-msgstr "Conciliar"
-
-#. module: account
-#: field:account.bank.statement.line,ref:0
-#: field:account.entries.report,ref:0
-#: field:account.move,ref:0
-#: view:account.move.line:0
-#: field:account.move.line,ref:0
-#: field:account.subscription,ref:0
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: account
-#: view:account.open.closed.fiscalyear:0
-msgid "Choose Fiscal Year "
-msgstr "Seleccione el ejercicio fiscal "
-
-#. module: account
-#: help:account.payment.term,active:0
-msgid "If the active field is set to False, it will allow you to hide the payment term without removing it."
-msgstr "Si el campo activo se desmarca, permite ocultar el plazo de pago sin eliminarlo."
-
-#. module: account
-#: code:addons/account/invoice.py:1436
-#, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
-
-#. module: account
-#: field:account.fiscal.position.account,account_src_id:0
-#: field:account.fiscal.position.account.template,account_src_id:0
-msgid "Account Source"
-msgstr "Origen cuenta"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
-msgid "All Analytic Entries"
-msgstr "Todas las polizas analíticas"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Negative"
-msgstr "Negativo"
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:95
-#, python-format
-msgid "Journal: %s"
-msgstr "Diario: %s"
-
-#. module: account
-#: help:account.analytic.journal,type:0
-msgid "Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."
-msgstr "Indica el tipo de diario analítico. Cuando se necesita para un documento (por ej. una factura) para crear polizas analíticas, OpenERP buscará un diario coincidente del mismo tipo."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tax_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
-msgid "Tax Templates"
-msgstr "Plantillas impuestos"
-
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
-#. module: account
-#: code:addons/account/account.py:919
-#, python-format
-msgid "No period defined for this date: %s !\n"
-"Please create a fiscal year."
-msgstr "¡No se ha definido un periodo para esta fecha: %s !\n"
-"Cree un ejercicio fiscal."
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_line_reconcile_select
-msgid "Move line reconcile select"
-msgstr "Seleccionar conciliación línea movimiento"
-
-#. module: account
-#: help:account.model.line,sequence:0
-msgid "The sequence field is used to order the resources from lower sequences to higher ones"
-msgstr "El campo secuencia se utiliza para ordenar los recursos secuencialmente de menor a mayor."
-
-#. module: account
-#: help:account.tax.code,notprintable:0
-#: help:account.tax.code.template,notprintable:0
-msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
-msgstr "Marque esta opción si desea que no aparezca en las facturas ningún IVA relacionado con este código de impuesto."
-
-#. module: account
-#: code:addons/account/invoice.py:1224
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
-msgid "Accounting entries are an input of the reconciliation."
-msgstr "Las polizass contables son una entrada de la conciliación."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
-msgid "Belgian Reports"
-msgstr "Informes Belgas"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1185
-#, python-format
-msgid "You can not add/modify entries in a closed journal."
-msgstr "No puede añadir/modificar polizas en un diario cerrado."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Calculated Balance"
-msgstr "Saldo calculado"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
-#: model:ir.actions.act_window,name:account.action_view_account_use_model
-#: model:ir.ui.menu,name:account.menu_action_manual_recurring
-msgid "Manual Recurring"
-msgstr "Recurrencia manual"
-
-#. module: account
-#: view:account.fiscalyear.close.state:0
-msgid "Close Fiscalyear"
-msgstr "Cerrar ejercicio fiscal"
-
-#. module: account
-#: field:account.automatic.reconcile,allow_write_off:0
-msgid "Allow write off"
-msgstr "Permitir desfase"
-
-#. module: account
-#: view:account.analytic.chart:0
-msgid "Select the Period for Analysis"
-msgstr "Seleccione el período de análisis"
-
-#. module: account
-#: view:account.move.line:0
-msgid "St."
-msgstr "Ext."
-
-#. module: account
-#: code:addons/account/invoice.py:532
-#, python-format
-msgid "Invoice line account company does not match with invoice company."
-msgstr "Compañía de la cuenta de la línea de factura no concuerda con la compañía de la factura."
-
-#. module: account
-#: field:account.journal.column,field:0
-msgid "Field Name"
-msgstr "Nombre del campo"
-
-#. module: account
-#: help:account.installer,charts:0
-msgid "Installs localized accounting charts to match as closely as possible the accounting needs of your company based on your country."
-msgstr "Instala el plan contable de la localización que satisface las necesidades contables de su compañía basadas en su país."
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:63
-#, python-format
-msgid "Can't find any account journal of %s type for this company.\n"
-"\n"
-"You can create one in the menu: \n"
-"Configuration/Financial Accounting/Accounts/Journals."
-msgstr "No se encuentra ningún diario contable del tipo %s para esta compañía.\n"
-"\n"
-"Puede crear un diario en el menú: \n"
-"Configuración/Contabilidad financiera/Cuentas/Diarios."
-
-#. module: account
-#: model:ir.model,name:account.model_account_unreconcile
-msgid "Account Unreconcile"
-msgstr "Desconciliar cuenta"
-
-#. module: account
-#: view:product.product:0
-#: view:product.template:0
-msgid "Purchase Properties"
-msgstr "Propiedades de compra"
-
-#. module: account
-#: view:account.installer:0
-#: view:account.installer.modules:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_bank
-msgid "This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments."
-msgstr "Los contadores utilizan esta vista para introducir polizas masivamente en OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos de cliente/proveedor OpenERP crea automáticamente apuntes contables."
-
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
-
-#. module: account
-#: model:ir.model,name:account.model_account_bank_accounts_wizard
-msgid "account.bank.accounts.wizard"
-msgstr "cuenta.banco.cuentas.asistente"
-
-#. module: account
-#: field:account.move.line,date_created:0
-#: field:account.move.reconcile,create_date:0
-msgid "Creation date"
-msgstr "Fecha creación"
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Purchase Refund"
-msgstr "Abono de compra"
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Opening/Closing Situation"
-msgstr "Situación apertura/cierre"
-
-#. module: account
-#: help:account.journal,currency:0
-msgid "The currency used to enter statement"
-msgstr "La divisa utilizada para introducir polizas."
-
-#. module: account
-#: field:account.open.closed.fiscalyear,fyear_id:0
-msgid "Fiscal Year to Open"
-msgstr "Ejercicio fiscal a abrir"
-
-#. module: account
-#: help:account.journal,sequence_id:0
-msgid "This field contains the informatin related to the numbering of the journal entries of this journal."
-msgstr "Este campo contiene la información relacionada con la numeración de las polizas de este diario."
-
-#. module: account
-#: field:account.journal,default_debit_account_id:0
-msgid "Default Debit Account"
-msgstr "Cuenta deudora por defecto"
-
-#. module: account
-#: view:account.move:0
-msgid "Total Credit"
-msgstr "Total crédito"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Positive"
-msgstr "Positivo"
-
-#. module: account
-#: view:account.move.line.unreconcile.select:0
-msgid "Open for Unreconciliation"
-msgstr "Abrir para romper conciliación"
-
-#. module: account
-#: field:account.fiscal.position.template,chart_template_id:0
-#: field:account.tax.template,chart_template_id:0
-#: field:wizard.multi.charts.accounts,chart_template_id:0
-msgid "Chart Template"
-msgstr "Plantilla plan contable"
-
-#. module: account
-#: help:account.model.line,amount_currency:0
-msgid "The amount expressed in an optional other currency."
-msgstr "El importe expresado en otra divisa opcional."
-
-#. module: account
-#: help:account.journal.period,state:0
-msgid "When journal period is created. The state is 'Draft'. If a report is printed it comes to 'Printed' state. When all transactions are done, it comes in 'Done' state."
-msgstr "Cuando se crea el periodo de diario. El estado es 'Borrador'. Si se imprime un informe, se cambiará el estado a 'Impreso'. Cuando todas las transacciones se completen, se cambiará el estado a \"Listo\"."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_tax_chart
-msgid "Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs."
-msgstr "La tabla impuestos es una vista en árbol reflejando la estructura de tipos impositivos (o códigos de impuesto) y muestra la situación impositiva actual. La tabla de impuestos representa la cantidad económica correspondiente a cada código de la declaración de impuestos de su país. Se representa en una estructura jerárquica, que puede ser modificada de acuerdo a sus necesidades."
-
-#. module: account
-#: view:account.analytic.line:0
-#: field:account.automatic.reconcile,journal_id:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement,journal_id:0
-#: report:account.central.journal:0
-#: view:account.entries.report:0
-#: field:account.entries.report,journal_id:0
-#: report:account.general.ledger:0
-#: view:account.invoice:0
-#: field:account.invoice,journal_id:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: report:account.journal.period.print:0
-#: view:account.model:0
-#: field:account.model,journal_id:0
-#: view:account.move:0
-#: field:account.move,journal_id:0
-#: field:account.move.bank.reconcile,journal_id:0
-#: view:account.move.line:0
-#: field:account.move.line,journal_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: code:addons/account/account_move_line.py:986
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,journal_id:0
-#: model:ir.actions.report.xml,name:account.account_journal
-#: model:ir.model,name:account.model_account_journal
-#: field:validate.account.move,journal_id:0
-#, python-format
-msgid "Journal"
-msgstr "Diario"
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_confirm
-msgid "Confirm the selected invoices"
-msgstr "Confirmar las facturas seleccionadas"
-
-#. module: account
-#: field:account.addtmpl.wizard,cparent_id:0
-msgid "Parent target"
-msgstr "Destino padre"
-
-#. module: account
-#: field:account.bank.statement,account_id:0
-msgid "Account used in this journal"
-msgstr "Cuenta utilizada en este diario"
-
-#. module: account
-#: help:account.aged.trial.balance,chart_account_id:0
-#: help:account.balance.report,chart_account_id:0
-#: help:account.bs.report,chart_account_id:0
-#: help:account.central.journal,chart_account_id:0
-#: help:account.common.account.report,chart_account_id:0
-#: help:account.common.journal.report,chart_account_id:0
-#: help:account.common.partner.report,chart_account_id:0
-#: help:account.common.report,chart_account_id:0
-#: help:account.general.journal,chart_account_id:0
-#: help:account.partner.balance,chart_account_id:0
-#: help:account.partner.ledger,chart_account_id:0
-#: help:account.pl.report,chart_account_id:0
-#: help:account.print.journal,chart_account_id:0
-#: help:account.report.general.ledger,chart_account_id:0
-#: help:account.vat.declaration,chart_account_id:0
-msgid "Select Charts of Accounts"
-msgstr "Seleccionar plan contable."
-
-#. module: account
-#: view:product.product:0
-msgid "Purchase Taxes"
-msgstr "Impuestos de compras"
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_refund
-msgid "Invoice Refund"
-msgstr "Abono factura"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Li."
-msgstr "Li."
-
-#. module: account
-#: field:account.automatic.reconcile,unreconciled:0
-msgid "Not reconciled transactions"
-msgstr "Transacciones no conciliadas"
-
-#. module: account
-#: code:addons/account/account_cash_statement.py:349
-#, python-format
-msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr "¡El saldo de caja no coincide con el saldo calculado!"
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
-#: field:account.fiscal.position.template,tax_ids:0
-msgid "Tax Mapping"
-msgstr "Mapeo impuestos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
-#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
-msgid "Close a Fiscal Year"
-msgstr "Cerrar un ejercicio fiscal"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
-msgid "The accountant confirms the statement."
-msgstr "El contable confirma el extracto."
-
-#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
-#: selection:account.tax,type_tax_use:0
-#: selection:account.tax.template,type_tax_use:0
-msgid "All"
-msgstr "Todas"
-
-#. module: account
-#: field:account.invoice.report,address_invoice_id:0
-msgid "Invoice Address Name"
-msgstr "Nombre dirección factura"
-
-#. module: account
-#: selection:account.installer,period:0
-msgid "3 Monthly"
-msgstr "Trimestral"
-
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si rompe la conciliación de las transacciones, también debe verificar todas las acciones que están relacionadas con estas transacciones, ya que no se desactivarán."
-
-#. module: account
-#: view:analytic.entries.report:0
-msgid "   30 Days   "
-msgstr "   30 Días   "
-
-#. module: account
-#: field:ir.sequence,fiscal_ids:0
-msgid "Sequences"
-msgstr "Secuencias"
-
-#. module: account
-#: view:account.fiscal.position.template:0
-msgid "Taxes Mapping"
-msgstr "Mapeo de impuestos"
-
-#. module: account
-#: report:account.central.journal:0
-msgid "Centralized Journal"
-msgstr "Diario centralizado"
-
-#. module: account
-#: sql_constraint:account.sequence.fiscalyear:0
-msgid "Main Sequence must be different from current !"
-msgstr "¡La secuencia principal debe ser diferente de la actual!"
-
-#. module: account
-#: field:account.invoice.tax,tax_amount:0
-msgid "Tax Code Amount"
-msgstr "Importe código impuesto"
-
-#. module: account
-#: code:addons/account/account.py:2861
-#: code:addons/account/installer.py:434
-#, python-format
-msgid "SAJ"
-msgstr "VEN"
-
-#. module: account
-#: help:account.bank.statement,balance_end_real:0
-msgid "closing balance entered by the cashbox verifier"
-msgstr "cerrando balance introducido por el verificador de caja"
-
-#. module: account
-#: view:account.period:0
-#: view:account.period.close:0
-msgid "Close Period"
-msgstr "Cerrar período"
-
-#. module: account
-#: model:ir.model,name:account.model_account_common_partner_report
-msgid "Account Common Partner Report"
-msgstr "Rapport du compte commun partenaire"
-
-#. module: account
-#: field:account.fiscalyear.close,period_id:0
-msgid "Opening Entries Period"
-msgstr "Período polizas de apertura"
-
-#. module: account
-#: model:ir.model,name:account.model_account_journal_period
-msgid "Journal Period"
-msgstr "Periodo diario"
-
-#. module: account
-#: code:addons/account/account_move_line.py:726
-#: code:addons/account/account_move_line.py:770
-#, python-format
-msgid "To reconcile the entries company should be the same for all entries"
-msgstr "Para conciliar las polizas, la compañía debería ser la misma para todos los polizas"
-
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:302
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
-
-#. module: account
-#: model:ir.model,name:account.model_account_report_general_ledger
-msgid "General Ledger Report"
-msgstr "Informe del libro mayor"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Re-Open"
-msgstr "Reabrir"
-
-#. module: account
-#: view:account.use.model:0
-msgid "Are you sure you want to create entries?"
-msgstr "¿Está seguro que desea crear las polizas?"
-
-#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
-msgid "Check"
-msgstr "Comprobar"
-
-#. module: account
-#: field:account.partner.reconcile.process,today_reconciled:0
-msgid "Partners Reconciled Today"
-msgstr "Empresas conciliadas hoy"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-""
-msgstr "¡El balance del extracto bancario es incorrecto!\n"
-""
-
-#. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax.template,type:0
-msgid "Percent"
-msgstr "Porcentaje"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_charts
-msgid "Charts"
-msgstr "Planes contables"
-
-#. module: account
-#: code:addons/account/project/wizard/project_account_analytic_line.py:47
-#: model:ir.model,name:account.model_project_account_analytic_line
-#, python-format
-msgid "Analytic Entries by line"
-msgstr "Polizas analíticas por línea"
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:38
-#, python-format
-msgid "You can only change currency for Draft Invoice !"
-msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
-
-#. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,type:0
-#: view:account.journal:0
-#: field:account.journal,type:0
-#: field:account.move.reconcile,type:0
-#: field:report.invoice.created,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: account
-#: model:ir.model,name:account.model_account_subscription_line
-msgid "Account Subscription Line"
-msgstr "Contabilidad. Línea de subscripción"
-
-#. module: account
-#: help:account.invoice,reference:0
-msgid "The partner reference of this invoice."
-msgstr "La referencia de la empresa de esta factura."
-
-#. module: account
-#: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
-#: view:account.unreconcile.reconcile:0
-#: model:ir.model,name:account.model_account_move_line_unreconcile_select
-msgid "Unreconciliation"
-msgstr "No conciliación"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_Journal_report
-msgid "Account Analytic Journal"
-msgstr "Contabilidad. Diario analítico"
-
-#. module: account
-#: model:ir.model,name:account.model_account_automatic_reconcile
-msgid "Automatic Reconcile"
-msgstr "Conciliación automática"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Due date Computation"
-msgstr "Cálculo fecha vencimiento"
-
-#. module: account
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "J.C./Move name"
-msgstr "C.Diario / Nombre mov."
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: account
-#: selection:account.subscription,period_type:0
-msgid "days"
-msgstr "días"
-
-#. module: account
-#: help:account.account.template,nocreate:0
-msgid "If checked, the new chart of accounts will not contain this by default."
-msgstr "Si está marcado, el nuevo plan contable no lo contendrá por defecto."
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:102
-#, python-format
-msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
-msgstr "No se puede %s factura que ya está conciliada, primero debería romper la conciliación de la factura. Sólo puede hacer un abono (nota de credito) de esta factura."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form_new
-msgid "New Subscription"
-msgstr "Nueva suscripción"
-
-#. module: account
-#: view:account.payment.term:0
-msgid "Computation"
-msgstr "Cálculo"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Next Partner to reconcile"
-msgstr "Próxima empresa a conciliar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1200
-#, python-format
-msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
-msgstr "¡No puede hacer esta modificación en una poliza confirmada! ¡Observe que sólo puede cambiar algunos campos no importantes!"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,delay_to_pay:0
-msgid "Avg. Delay To Pay"
-msgstr "Retraso promedio a pagar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tax_chart
-#: model:ir.actions.act_window,name:account.action_tax_code_tree
-#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
-msgid "Chart of Taxes"
-msgstr "Tabla de impuestos"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Create 3 Months Periods"
-msgstr "Crear períodos trimestrales"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Due"
-msgstr "Debido"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,price_total_tax:0
-msgid "Total With Tax"
-msgstr "Total con impuestos"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.move:0
-#: view:validate.account.move:0
-#: view:validate.account.move.lines:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.move:0
-#: view:report.invoice.created:0
-msgid "Total Amount"
-msgstr "Importe total"
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.entries.report,type:0
-msgid "Consolidation"
-msgstr "Consolidación"
-
-#. module: account
-#: field:account.invoice,date_invoice:0
-msgid "Date Invoiced"
-msgstr "Date Invoiced"
-
-#. module: account
-#: view:account.analytic.line:0
-#: view:account.entries.report:0
-#: view:account.invoice.report:0
-#: view:account.move.line:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_account_central_journal
-msgid "Centralizing Journal"
-msgstr "Diario centralizado"
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Sale Refund"
-msgstr "Abono ventas"
-
-#. module: account
-#: model:process.node,note:account.process_node_accountingstatemententries0
-msgid "Bank statement"
-msgstr "Extracto bancario"
-
-#. module: account
-#: field:account.analytic.line,move_id:0
-msgid "Move Line"
-msgstr "Línea de movimiento"
-
-#. module: account
-#: help:account.move.line,tax_amount:0
-msgid "If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, this field will contain the basic amount(without tax)."
-msgstr "Si la cuenta es un una cuenta de tipo impositivo, este campo contendrá el monto del impuesto. Si la cuenta es un tipo base impositiva, el campo contendrá el monto de base imponible (sin impuesto)."
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Purchases"
-msgstr "Compras"
-
-#. module: account
-#: field:account.model,lines_id:0
-msgid "Model Entries"
-msgstr "Polizas del modelo"
-
-#. module: account
-#: field:account.account,code:0
-#: report:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.inverted.balance:0
-#: report:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.fiscalyear,code:0
-#: report:account.general.journal:0
-#: field:account.journal,code:0
-#: report:account.partner.balance:0
-#: field:account.period,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: account
-#: code:addons/account/account.py:2135
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:678
-#: code:addons/account/wizard/account_use_model.py:81
-#, python-format
-msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
-
-#. module: account
-#: report:account.partner.balance:0
-#: view:account.partner.balance:0
-#: model:ir.actions.act_window,name:account.action_account_partner_balance
-#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
-#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
-msgid "Partner Balance"
-msgstr "Balance de empresa"
-
-#. module: account
-#: field:account.bank.accounts.wizard,acc_name:0
-msgid "Account Name."
-msgstr "Nombre cuenta."
-
-#. module: account
-#: field:account.chart.template,property_reserve_and_surplus_account:0
-#: field:res.company,property_reserve_and_surplus_account:0
-msgid "Reserve and Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
-
-#. module: account
-#: field:report.account.receivable,name:0
-msgid "Week of Year"
-msgstr "Semana del año"
-
-#. module: account
-#: field:account.bs.report,display_type:0
-#: field:account.pl.report,display_type:0
-#: field:account.report.general.ledger,landscape:0
-msgid "Landscape Mode"
-msgstr "Modo horizontal"
-
-#. module: account
-#: view:board.board:0
-msgid "Customer Invoices to Approve"
-msgstr "Facturas de cliente para aprobar"
-
-#. module: account
-#: help:account.fiscalyear.close,fy_id:0
-msgid "Select a Fiscal year to close"
-msgstr "Seleccione un ejercicio fiscal para cerrar."
-
-#. module: account
-#: help:account.account,user_type:0
-#: help:account.account.template,user_type:0
-msgid "These types are defined according to your country. The type contains more information about the account and its specificities."
-msgstr "Estos tipos se definen de acuerdo a la legislación contable de su país. El tipo contiene más información acerca de la cuenta y sus especificidades."
-
-#. module: account
-#: view:account.tax:0
-msgid "Applicability Options"
-msgstr "Opciones para su aplicación"
-
-#. module: account
-#: report:account.partner.balance:0
-msgid "In dispute"
-msgstr "A cuadrar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
-#: model:ir.ui.menu,name:account.journal_cash_move_lines
-msgid "Cash Registers"
-msgstr "Registros de caja"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Expense Accounts)"
-msgstr "Pérdidas y Ganancias (cuentas de gastos)"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "-"
-msgstr "-"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: account
-#: view:account.subscription.generate:0
-msgid "Generate Entries before:"
-msgstr "Generar polizas antes:"
-
-#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: account
-#: field:account.period,date_start:0
-msgid "Start of Period"
-msgstr "Inicio del periodo"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
-msgid "Confirm statement"
-msgstr "Confirmar extracto"
-
-#. module: account
-#: field:account.fiscal.position.tax,tax_dest_id:0
-#: field:account.fiscal.position.tax.template,tax_dest_id:0
-msgid "Replacement Tax"
-msgstr "Impuesto sustitución"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-msgid "Credit Centralisation"
-msgstr "Centralización del haber"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree2
-msgid "With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received."
-msgstr "Con las facturas de proveedor puede introducir y gestionar facturas emitidas por sus proveedores. OpenERP también puede generar borradores de factura automáticamente desde pedidos o albaranes de compra. De esta forma, puede contrastar la factura de su proveedor con lo comprado o recibido."
-
-#. module: account
-#: view:account.invoice.cancel:0
-msgid "Cancel Invoices"
-msgstr "Cancelar facturas"
-
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transacciones no conciliadas"
-
-#. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax.template,tax_code_id:0
-#: model:ir.model,name:account.model_account_tax_code
-msgid "Tax Code"
-msgstr "Código impuesto"
-
-#. module: account
-#: field:account.account,currency_mode:0
-msgid "Outgoing Currencies Rate"
-msgstr "Tasa de divisas de salida"
-
-#. module: account
-#: help:account.move.line,move_id:0
-msgid "The move of this entry line."
-msgstr "La poliza de este apunte."
-
-#. module: account
-#: field:account.move.line.reconcile,trans_nbr:0
-msgid "# of Transaction"
-msgstr "# de transacción"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.tax.code.entries:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Entry Label"
-msgstr "Etiqueta poliza"
-
-#. module: account
-#: code:addons/account/account.py:994
-#, python-format
-msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "¡No puede modificar/eliminar un diario con polizas para este período!"
-
-#. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
-msgid "Reference of the document that produced this invoice."
-msgstr "Referencia del documento que ha creado esta factura."
-
-#. module: account
-#: view:account.analytic.line:0
-#: view:account.journal:0
-msgid "Others"
-msgstr "Otros"
-
-#. module: account
-#: view:account.account:0
-#: report:account.account.balance:0
-#: view:account.analytic.line:0
-#: field:account.automatic.reconcile,writeoff_acc_id:0
-#: field:account.bank.statement.line,account_id:0
-#: view:account.entries.report:0
-#: field:account.entries.report,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
-#: field:account.invoice.report,account_id:0
-#: field:account.journal,account_control_ids:0
-#: report:account.journal.period.print:0
-#: field:account.model.line,account_id:0
-#: view:account.move.line:0
-#: field:account.move.line,account_id:0
-#: field:account.move.line.reconcile.select,account_id:0
-#: field:account.move.line.unreconcile.select,account_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,account_id:0
-#: model:ir.model,name:account.model_account_account
-#: field:report.account.sales,account_id:0
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: account
-#: field:account.tax,include_base_amount:0
-msgid "Included in base amount"
-msgstr "Incluido en importe base"
-
-#. module: account
-#: view:account.entries.report:0
-#: model:ir.actions.act_window,name:account.action_account_entries_report_all
-#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
-msgid "Entries Analysis"
-msgstr "Análisis polizas"
-
-#. module: account
-#: field:account.account,level:0
-msgid "Level"
-msgstr "Nivel"
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-#: view:account.invoice.line:0
-#: field:account.invoice.line,invoice_line_tax_id:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: model:ir.actions.act_window,name:account.action_tax_form
-#: model:ir.ui.menu,name:account.account_template_taxes
-#: model:ir.ui.menu,name:account.menu_action_tax_form
-#: model:ir.ui.menu,name:account.menu_tax_report
-#: model:ir.ui.menu,name:account.next_id_27
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: account
-#: code:addons/account/wizard/account_report_common.py:120
-#, python-format
-msgid "Select a starting and an ending period"
-msgstr "Seleccione un periodo inicial y final"
-
-#. module: account
-#: model:ir.model,name:account.model_account_account_template
-msgid "Templates for Accounts"
-msgstr "Plantillas para cuentas"
-
-#. module: account
-#: view:account.tax.code.template:0
-msgid "Search tax template"
-msgstr "Buscar plantilla impuestos"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: account
-#: view:account.move.reconcile:0
-#: model:ir.actions.act_window,name:account.action_account_reconcile_select
-#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
-msgid "Reconcile Entries"
-msgstr "Conciliar las polizas"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
-msgid "Overdue Payments"
-msgstr "Pagos fuera de plazo"
-
-#. module: account
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Initial Balance"
-msgstr "Saldo inicial"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "Bank Information"
-msgstr "Información bancaria"
-
-#. module: account
-#: view:account.aged.trial.balance:0
-#: view:account.common.report:0
-msgid "Report Options"
-msgstr "Opciones del informe"
-
-#. module: account
-#: model:ir.model,name:account.model_account_entries_report
-msgid "Journal Items Analysis"
-msgstr "Análisis elementos diario"
-
-#. module: account
-#: model:ir.ui.menu,name:account.next_id_22
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: account
-#: view:account.bank.statement:0
-#: model:ir.model,name:account.model_account_bank_statement
-#: model:process.node,name:account.process_node_accountingstatemententries0
-#: model:process.node,name:account.process_node_bankstatement0
-#: model:process.node,name:account.process_node_supplierbankstatement0
-msgid "Bank Statement"
-msgstr "Extracto bancario"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank account owner"
-msgstr "Titular de la cuenta bancaria"
-
-#. module: account
-#: field:res.partner,property_account_receivable:0
-msgid "Account Receivable"
-msgstr "Cuenta a cobrar"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_central_journal
-msgid "Central Journal"
-msgstr "Diario central"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1280
-#, python-format
-msgid "You can not use this general account in this journal !"
-msgstr "¡No puede usar esta cuenta general en este diario!"
-
-#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.partner.balance,display_partner:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
-msgid "With balance is not equal to 0"
-msgstr "Con balance si no es igual a 0"
-
-#. module: account
-#: view:account.tax:0
-msgid "Search Taxes"
-msgstr "Buscar impuestos"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_cost_ledger
-msgid "Account Analytic Cost Ledger"
-msgstr "Contabilidad. Diario de costes analíticos"
-
-#. module: account
-#: view:account.model:0
-msgid "Create entries"
-msgstr "Crear polizas"
-
-#. module: account
-#: field:account.entries.report,nbr:0
-msgid "# of Items"
-msgstr "Nº de elementos"
-
-#. module: account
-#: field:account.automatic.reconcile,max_amount:0
-msgid "Maximum write-off amount"
-msgstr "Importe máximo de desajuste"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Compute Taxes"
-msgstr "Calcular impuestos"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,code_digits:0
-msgid "# of Digits"
-msgstr "Núm. de dígitos"
-
-#. module: account
-#: field:account.journal,entry_posted:0
-msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Omitir estado 'Borrador' para polizas manuales."
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,price_total:0
-msgid "Total Without Tax"
-msgstr "Total base"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_move_journal_line
-msgid "A journal entry consists of several journal items, each of which is either a debit or a credit transaction. OpenERP automatically creates one journal entry per accounting document: invoice, refund, supplier payment, bank statements, etc."
-msgstr "Una poliza de diario se compone de varias anotaciones, cada una de las cuales es una operación al debe o al haber. OpenERP crea automáticamente una poliza por cada documento contable: factura, nota de credito (abono), pago a proveedor, extractos de cuenta bancaria, etc."
-
-#. module: account
-#: view:account.entries.report:0
-msgid "# of Entries "
-msgstr "Nº de polizas "
-
-#. module: account
-#: model:ir.model,name:account.model_temp_range
-msgid "A Temporary table used for Dashboard view"
-msgstr "Una tabla temporal utilizada para la vista de tablero"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree4
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
-msgid "Supplier Refunds"
-msgstr "Nota de Credito de proveedor"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
-msgstr "Por ejemplo: a 14 días netos 2 por ciento, importe restante a 30 días fin de mes."
-
-#. module: account
-#: code:addons/account/invoice.py:823
-#, python-format
-msgid "Cannot create the invoice !\n"
-"The payment term defined gives a computed amount greater than the total invoiced amount."
-msgstr "¡No se puede crear la factura!\n"
-"El plazo de pago definido genera un importe superior que el importe total facturado."
-
-#. module: account
-#: field:account.installer.modules,account_anglo_saxon:0
-msgid "Anglo-Saxon Accounting"
-msgstr "Contabilidad anglo-sajona"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Movimiento de desajuste"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
-msgid "Recurring Entries"
-msgstr "Polizas recurrentes"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
-
-#. module: account
-#: field:account.automatic.reconcile,reconciled:0
-msgid "Reconciled transactions"
-msgstr "Transacciones conciliadas"
-
-#. module: account
-#: field:account.journal.view,columns_id:0
-msgid "Columns"
-msgstr "Columnas"
-
-#. module: account
-#: report:account.overdue:0
-msgid "."
-msgstr "."
-
-#. module: account
-#: view:account.analytic.cost.ledger.journal.report:0
-msgid "and Journals"
-msgstr "y diarios"
-
-#. module: account
-#: field:account.journal,groups_id:0
-msgid "Groups"
-msgstr "Grupos"
-
-#. module: account
-#: field:account.invoice,amount_untaxed:0
-#: field:report.invoice.created,amount_untaxed:0
-msgid "Untaxed"
-msgstr "Base"
-
-#. module: account
-#: view:account.partner.reconcile.process:0
-msgid "Go to Next Partner"
-msgstr "Ir a la siguiente empresa"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Search Bank Statements"
-msgstr "Buscar extractos bancarios"
-
-#. module: account
-#: sql_constraint:account.model.line:0
-msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
-msgstr "¡Valores debe o haber incorrectos en el modelo (debe + haber debe ser mayor que \"0\")!"
-
-#. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_payable:0
-msgid "Payable Account"
-msgstr "Cuenta a pagar"
-
-#. module: account
-#: field:account.tax,account_paid_id:0
-#: field:account.tax.template,account_paid_id:0
-msgid "Refund Tax Account"
-msgstr "Cuenta impuestos de reintegros"
-
-#. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
-msgid "Statement lines"
-msgstr "Líneas extracto"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_bank_statement_tree
-msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically and the closing balance is to be found on your statement. When you are in the Payment column of a line, you can press F1 to open the reconciliation form."
-msgstr "Un extracto de cuenta bancaria es un resumen de todas las transacciones financieras ocurridas en un periodo de tiempo en una cuenta de depósito, una tarjeta de crédito o cualquier otro tipo de cuenta financiera. El balance inicial será propuesto automáticamente y el balance de cierre se basará en su extracto. Situándose sobre la columna Pagos de una línea, puede pulsar F1 para abrir el formulario de conciliación."
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-msgid "Date/Code"
-msgstr "Fecha/Código"
-
-#. module: account
-#: field:account.analytic.line,general_account_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,general_account_id:0
-msgid "General Account"
-msgstr "Cuenta general"
-
-#. module: account
-#: field:res.partner,debit_limit:0
-msgid "Payable Limit"
-msgstr "Límite a pagar"
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: field:account.move.line,invoice:0
-#: model:ir.model,name:account.model_account_invoice
-#: model:res.request.link,name:account.req_link_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account
-#: model:process.node,note:account.process_node_analytic0
-#: model:process.node,note:account.process_node_analyticcost0
-msgid "Analytic costs to invoice"
-msgstr "Costes analíticos a facturar"
-
-#. module: account
-#: view:ir.sequence:0
-msgid "Fiscal Year Sequence"
-msgstr "Secuencia ejercicio fiscal"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,seq_journal:0
-msgid "Separated Journal Sequences"
-msgstr "Secuencias de diarios separadas"
-
-#. module: account
-#: field:account.bank.statement,user_id:0
-#: view:account.invoice:0
-msgid "Responsible"
-msgstr "Responsible"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Sub-Total :"
-msgstr "Subtotal :"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."
-msgstr "Cancelar factura: Crea la factura de abono (nota de credito), la valida y concilia para cancelar la factura actual."
-
-#. module: account
-#: model:ir.ui.menu,name:account.periodical_processing_invoicing
-msgid "Invoicing"
-msgstr "Facturación"
-
-#. module: account
-#: field:account.chart.template,tax_code_root_id:0
-msgid "Root Tax Code"
-msgstr "Código impuesto raíz"
-
-#. module: account
-#: field:account.partner.ledger,initial_balance:0
-#: field:account.report.general.ledger,initial_balance:0
-msgid "Include initial balances"
-msgstr "Incluir balances iniciales"
-
-#. module: account
-#: field:account.tax.code,sum:0
-msgid "Year Sum"
-msgstr "Suma del año"
-
-#. module: account
-#: view:account.change.currency:0
-msgid "This wizard will change the currency of the invoice"
-msgstr "Este asistente cambiará la moneda de la factura"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_chart
-msgid "Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account."
-msgstr "Muestra el plan de cuentas de su compañía por ejercicio fiscal y filtrado por periodo. Obtiene una vista en árbol completa de todas los polizas por código de cuenta que puede expandir haciendo clic sobre una cuenta."
-
-#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! You cannot define overlapping fiscal years"
-msgstr "¡Error! No puede definir ejercicios fiscales que se superpongan"
-
-#. module: account
-#: code:addons/account/account_move_line.py:802
-#, python-format
-msgid "The account is not defined to be reconciled !"
-msgstr "¡No se ha definido la cuenta como conciliable!"
-
-#. module: account
-#: field:account.cashbox.line,pieces:0
-msgid "Values"
-msgstr "Valores"
-
-#. module: account
-#: help:account.journal.period,active:0
-msgid "If the active field is set to False, it will allow you to hide the journal period without removing it."
-msgstr "Si el campo activo está establecido a falso, le permitirá ocultar el período de diario sin borrarlo."
-
-#. module: account
-#: view:res.partner:0
-msgid "Supplier Debit"
-msgstr "Debe del proveedor"
-
-#. module: account
-#: help:account.model.line,quantity:0
-msgid "The optional quantity on entries"
-msgstr "La cantidad opcional en las polizas"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
-msgid "Receivables & Payables"
-msgstr "Cuentas a cobrar y pagar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:809
-#, python-format
-msgid "You have to provide an account for the write off entry !"
-msgstr "¡Debe indicar una cuenta para la poliza de ajuste!"
-
-#. module: account
-#: model:ir.model,name:account.model_account_common_journal_report
-msgid "Account Common Journal Report"
-msgstr "Contabilidad. Informe diario común"
-
-#. module: account
-#: selection:account.partner.balance,display_partner:0
-msgid "All Partners"
-msgstr "Todas empresas"
-
-#. module: account
-#: view:account.analytic.chart:0
-msgid "Analytic Account Charts"
-msgstr "Planes de cuentas analíticas"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "My Entries"
-msgstr "Mis polizas"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Customer Ref:"
-msgstr "Ref. cliente:"
-
-#. module: account
-#: code:addons/account/account_cash_statement.py:329
-#, python-format
-msgid "User %s does not have rights to access %s journal !"
-msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
-
-#. module: account
-#: help:account.period,special:0
-msgid "These periods can overlap."
-msgstr "Estos períodos se pueden solapar."
-
-#. module: account
-#: model:process.node,name:account.process_node_draftstatement0
-msgid "Draft statement"
-msgstr "Extracto borrador"
-
-#. module: account
-#: view:account.tax:0
-msgid "Tax Declaration: Credit Notes"
-msgstr "Declaración de impuestos: Nota de Credito"
-
-#. module: account
-#: code:addons/account/account.py:509
-#, python-format
-msgid "You cannot deactivate an account that contains account moves."
-msgstr "No puede desactivar una cuenta que contiene polizas contables."
-
-#. module: account
-#: field:account.move.line.reconcile,credit:0
-msgid "Credit amount"
-msgstr "Importe haber"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
-#. module: account
-#: code:addons/account/account.py:529
-#, python-format
-msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!"
-msgstr "¡No puede cambiar el tipo de cuenta de 'Cerrado' a cualquier otro tipo si contiene polizas contables!"
-
-#. module: account
-#: view:res.company:0
-msgid "Reserve And Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
-
-#. module: account
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr "¡Valor haber o debe erróneo en la poliza contable!"
-
-#. module: account
-#: view:account.invoice.report:0
-#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
-#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
-msgid "Invoices Analysis"
-msgstr "Análisis de facturas"
-
-#. module: account
-#: model:ir.model,name:account.model_account_period_close
-msgid "period close"
-msgstr "cierre periodo"
-
-#. module: account
-#: view:account.installer:0
-msgid "Configure Fiscal Year"
-msgstr "Configurar ejercicio fiscal"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
-msgid "Entries By Line"
-msgstr "Polizas por línea"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "A/c Code"
-msgstr "Código cuenta"
-
-#. module: account
-#: field:account.invoice,move_id:0
-#: field:account.invoice,move_name:0
-msgid "Journal Entry"
-msgstr "Poliza contable"
-
-#. module: account
-#: view:account.tax:0
-msgid "Tax Declaration: Invoices"
-msgstr "Declaración de impuestos: Facturas"
-
-#. module: account
-#: field:account.cashbox.line,subtotal:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: account
-#: view:account.account:0
-msgid "Treasury Analysis"
-msgstr "Análisis de tesorería"
-
-#. module: account
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No se pueden crear compañías recursivas."
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:332
-#, python-format
-msgid "Please verify that an account is defined in the journal."
-msgstr "Compruebe que se ha definido una cuenta en el diario."
-
-#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: selection:account.move.line,state:0
-msgid "Valid"
-msgstr "Válido"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_print_journal
-#: model:ir.model,name:account.model_account_print_journal
-msgid "Account Print Journal"
-msgstr "Contabilidad. Imprimir diario"
-
-#. module: account
-#: model:ir.model,name:account.model_product_category
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "/"
-msgstr "/"
-
-#. module: account
-#: field:account.bs.report,reserve_account_id:0
-msgid "Reserve & Profit/Loss Account"
-msgstr "Cuenta de Reservas y Pérdidas/Ganancias"
-
-#. module: account
-#: help:account.bank.statement,balance_end:0
-msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr "Saldo de cierre calculado a partir del balance inicial y las transiciones de caja."
-
-#. module: account
-#: model:process.node,note:account.process_node_reconciliation0
-#: model:process.node,note:account.process_node_supplierreconciliation0
-msgid "Comparison between accounting and payment entries"
-msgstr "Comparación entre polizas contables y de pago"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Tax Definition"
-msgstr "Definición de impuestos"
-
-#. module: account
-#: help:wizard.multi.charts.accounts,seq_journal:0
-msgid "Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."
-msgstr "Marque esta opción si desea utilizar una secuencia diferente para cada diario creado. De lo contrario, todos utilizarán la misma secuencia."
-
-#. module: account
-#: help:account.partner.ledger,amount_currency:0
-#: help:account.report.general.ledger,amount_currency:0
-msgid "It adds the currency column if the currency is different then the company currency"
-msgstr "Añade la columna de moneda si la moneda es distinta de la moneda de la compañía."
-
-#. module: account
-#: help:account.journal,allow_date:0
-msgid "If set to True then do not accept the entry if the entry date is not into the period dates"
-msgstr "Si se marca esta opción no aceptan polizas que la fecha de la poliza no esté dentro de las fechas del periodo."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_pl_report
-msgid "Account Profit And Loss"
-msgstr "Cuenta de pérdidas y ganancias"
-
-#. module: account
-#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
-#: field:wizard.multi.charts.accounts,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: account
-#: view:account.invoice:0
-#: view:report.invoice.created:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: account
-#: help:account.tax,active:0
-msgid "If the active field is set to False, it will allow you to hide the tax without removing it."
-msgstr "Si el campo activo está desmarcardo, le permitirá ocultar el impuesto sin eliminarlo."
-
-#. module: account
-#: help:account.bank.statement,name:0
-msgid "if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself"
-msgstr "si le da un nombre distinto de /, su poliza contable tendrá el mismo nombre que el extracto. Esto permite que las polizas del extracto tengan las mismas referencias que el extracto en sí"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_unreconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
-msgid "Unreconcile Entries"
-msgstr "Romper conciliación de las polizas"
-
-#. module: account
-#: field:account.move.reconcile,line_partial_ids:0
-msgid "Partial Entry lines"
-msgstr "Apuntes de conciliación parcial"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Fiscalyear"
-msgstr "Ejercicio fiscal"
-
-#. module: account
-#: view:account.journal.select:0
-#: view:project.account.analytic.line:0
-msgid "Open Entries"
-msgstr "Abrir polizas"
-
-#. module: account
-#: field:account.automatic.reconcile,account_ids:0
-msgid "Accounts to Reconcile"
-msgstr "Cuentas a conciliar"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_filestatement0
-msgid "Import of the statement in the system from an electronic file"
-msgstr "Importa al sistema un extracto desde un fichero electrónico"
-
-#. module: account
-#: model:process.node,name:account.process_node_importinvoice0
-msgid "Import from invoice"
-msgstr "Importa desde factura"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "January"
-msgstr "Enero"
-
-#. module: account
-#: view:account.journal:0
-msgid "Validations"
-msgstr "Validaciones"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "This F.Year"
-msgstr "Este ejercicio fiscal"
-
-#. module: account
-#: view:account.tax.chart:0
-msgid "Account tax charts"
-msgstr "Plan de impuestos contables"
-
-#. module: account
-#: constraint:account.period:0
-msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
-msgstr "¡Periodo inválida! Algunos periodos se superponen o la fecha del periodo no está dentro del intervalo del ejercicio fiscal. "
-
-#. module: account
-#: selection:account.invoice,state:0
-#: view:account.invoice.report:0
-#: selection:account.invoice.report,state:0
-#: selection:report.invoice.created,state:0
-msgid "Pro-forma"
-msgstr "Pro-forma"
-
-#. module: account
-#: code:addons/account/installer.py:348
-#, python-format
-msgid " Journal"
-msgstr " Diario"
-
-#. module: account
-#: code:addons/account/account.py:1339
-#, python-format
-msgid "There is no default default debit account defined \n"
-"on journal \"%s\""
-msgstr "No se ha definido una cuenta debe por defecto \n"
-"en el diario \"%s\""
-
-#. module: account
-#: help:account.account,type:0
-#: help:account.account.template,type:0
-#: help:account.entries.report,type:0
-msgid "This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
-msgstr "Esta clasificación se utiliza para diferenciar tipos con efectos especiales en OpenERP: vista no puede tener polizas, consolidación son cuentas que pueden tener cuentas hijas para consolidaciones multi-empresa, pagable/cobrable son para cuentas de empresas (para los cálculos de crédito / débito), cerrado es para cuentas de depreciación."
-
-#. module: account
-#: view:account.chart.template:0
-msgid "Search Chart of Accounts Templates"
-msgstr "Buscar plantillas de plan contable"
-
-#. module: account
-#: view:account.installer:0
-msgid "The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."
-msgstr "El plan contable por defecto se ajusta a su selección de país. Si no existe un plan contable certificado para el país especificado, se puede instalar uno genérico que será seleccionado por defecto."
-
-#. module: account
-#: view:account.account.type:0
-#: field:account.account.type,note:0
-#: view:account.analytic.account:0
-#: report:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
-#: field:account.invoice.refund,description:0
-#: report:account.overdue:0
-#: field:account.payment.term,note:0
-#: view:account.tax.code:0
-#: field:account.tax.code,info:0
-#: view:account.tax.code.template:0
-#: field:account.tax.code.template,info:0
-#: field:analytic.entries.report,name:0
-#: field:report.invoice.created,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: account
-#: code:addons/account/account.py:2926
-#: code:addons/account/installer.py:498
-#, python-format
-msgid "ECNJ"
-msgstr "ACOMPRA"
-
-#. module: account
-#: view:account.subscription:0
-#: selection:account.subscription,state:0
-msgid "Running"
-msgstr "En proceso"
-
-#. module: account
-#: view:account.chart.template:0
-#: field:product.category,property_account_income_categ:0
-#: field:product.template,property_account_income:0
-msgid "Income Account"
-msgstr "Cuenta de ingresos"
-
-#. module: account
-#: code:addons/account/invoice.py:351
-#, python-format
-msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
-
-#. module: account
-#: view:product.category:0
-msgid "Accounting Properties"
-msgstr "Propiedades de contabilidad"
-
-#. module: account
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: field:account.print.journal,sort_selection:0
-msgid "Entries Sorted By"
-msgstr "Polizas ordenadas por"
-
-#. module: account
-#: field:account.change.currency,currency_id:0
-msgid "Change to"
-msgstr "Cambiar a"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "# of Products Qty "
-msgstr "Nº ctdad de productos "
-
-#. module: account
-#: model:ir.model,name:account.model_product_template
-msgid "Product Template"
-msgstr "Plantilla de producto"
-
-#. module: account
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: view:account.entries.report:0
-#: field:account.entries.report,fiscalyear_id:0
-#: field:account.fiscalyear,name:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.journal.period,fiscalyear_id:0
-#: report:account.journal.period.print:0
-#: report:account.partner.balance:0
-#: field:account.period,fiscalyear_id:0
-#: field:account.sequence.fiscalyear,fiscalyear_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.vat.declaration:0
-#: model:ir.model,name:account.model_account_fiscalyear
-msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
-
-#. module: account
-#: help:account.aged.trial.balance,fiscalyear_id:0
-#: help:account.balance.report,fiscalyear_id:0
-#: help:account.bs.report,fiscalyear_id:0
-#: help:account.central.journal,fiscalyear_id:0
-#: help:account.common.account.report,fiscalyear_id:0
-#: help:account.common.journal.report,fiscalyear_id:0
-#: help:account.common.partner.report,fiscalyear_id:0
-#: help:account.common.report,fiscalyear_id:0
-#: help:account.general.journal,fiscalyear_id:0
-#: help:account.partner.balance,fiscalyear_id:0
-#: help:account.partner.ledger,fiscalyear_id:0
-#: help:account.pl.report,fiscalyear_id:0
-#: help:account.print.journal,fiscalyear_id:0
-#: help:account.report.general.ledger,fiscalyear_id:0
-#: help:account.vat.declaration,fiscalyear_id:0
-msgid "Keep empty for all open fiscal year"
-msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
-
-#. module: account
-#: model:ir.model,name:account.model_account_move
-msgid "Account Entry"
-msgstr "Poliza contable"
-
-#. module: account
-#: field:account.sequence.fiscalyear,sequence_main_id:0
-msgid "Main Sequence"
-msgstr "Secuencia principal"
-
-#. module: account
-#: field:account.invoice,payment_term:0
-#: field:account.invoice.report,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
-#: field:account.payment.term.line,payment_id:0
-#: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
-msgid "Payment Term"
-msgstr "Plazo de pago"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
-#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Positions"
-msgstr "Posiciones fiscales"
-
-#. module: account
-#: field:account.period.close,sure:0
-msgid "Check this box"
-msgstr "Marque esta opción"
-
-#. module: account
-#: view:account.common.report:0
-msgid "Filters"
-msgstr "Filtros"
-
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: view:account.open.closed.fiscalyear:0
-#: selection:account.period,state:0
-#: code:addons/account/wizard/account_move_journal.py:106
-#: selection:report.invoice.created,state:0
-#, python-format
-msgid "Open"
-msgstr "Abierto"
-
-#. module: account
-#: model:process.node,note:account.process_node_draftinvoices0
-#: model:process.node,note:account.process_node_supplierdraftinvoices0
-msgid "Draft state of an invoice"
-msgstr "Estado borrador de una factura"
-
-#. module: account
-#: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
-msgstr "Marque esta opción si el usuario se le permite conciliar polizas en esta cuenta."
-
-#. module: account
-#: view:account.partner.reconcile.process:0
-msgid "Partner Reconciliation"
-msgstr "Conciliciación empresa"
-
-#. module: account
-#: field:account.tax,tax_code_id:0
-#: view:account.tax.code:0
-msgid "Account Tax Code"
-msgstr "Código impuesto contable"
-
-#. module: account
-#: code:addons/account/invoice.py:552
-#, python-format
-msgid "Can't find any account journal of %s type for this company.\n"
-"\n"
-"You can create one in the menu: \n"
-"Configuration\\Financial Accounting\\Accounts\\Journals."
-msgstr "No se encuentra ningún diario del tipo %s para esta compañía.\n"
-"\n"
-"Debe crear uno en el menú: \n"
-"Configuración\\Contabilidad financiera\\Cuentas\\Diarios."
-
-#. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax.template,base_code_id:0
-msgid "Base Code"
-msgstr "Código base"
-
-#. module: account
-#: help:account.invoice.tax,sequence:0
-msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr "Indica el orden de secuencia cuando se muestra una lista de impuestos de factura."
-
-#. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
-#: field:account.tax.template,base_sign:0
-#: field:account.tax.template,ref_base_sign:0
-msgid "Base Code Sign"
-msgstr "Signo código base"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-msgid "Debit Centralisation"
-msgstr "Centralización del debe"
-
-#. module: account
-#: view:account.invoice.confirm:0
-#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
-msgid "Confirm Draft Invoices"
-msgstr "Confirmar facturas borrador"
-
-#. module: account
-#: field:account.entries.report,day:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,day:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,day:0
-msgid "Day"
-msgstr "Día"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_renew_view
-msgid "Accounts to Renew"
-msgstr "Cuentas a renovar"
-
-#. module: account
-#: model:ir.model,name:account.model_account_model_line
-msgid "Account Model Entries"
-msgstr "Contabilidad. Líneas de modelo"
-
-#. module: account
-#: code:addons/account/account.py:2878
-#: code:addons/account/installer.py:454
-#, python-format
-msgid "EXJ"
-msgstr "COMPRA"
-
-#. module: account
-#: field:product.template,supplier_taxes_id:0
-msgid "Supplier Taxes"
-msgstr "Impuestos proveedor"
-
-#. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
-msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
-msgstr "Si utiliza los plazos de pago, la fecha de vencimiento será calculada automáticamente en la generación de las polizas contables. Si se mantiene el plazo de pago y la fecha de vencimiento vacía, significa que es un pago directo. El plazo de pago podrá calcular varias fechas de vencimiento, por ejemplo, 50% ahora, 50% en un mes."
-
-#. module: account
-#: view:account.analytic.cost.ledger.journal.report:0
-msgid "Select period"
-msgstr "Seleccionar período"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_account_pp_statements
-msgid "Statements"
-msgstr "Declaraciones"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-msgid "Move Name"
-msgstr "Mover nombre"
-
-#. module: account
-#: help:res.partner,property_account_position:0
-msgid "The fiscal position will determine taxes and the accounts used for the partner."
-msgstr "La posición fiscal calculará los impuestos y las cuentas contables utilizados para esta empresa."
-
-#. module: account
-#: view:account.print.journal:0
-msgid "This report gives you an overview of the situation of a specific journal"
-msgstr "Este informe le proporciona una visión global sobre la situación de un diario específico"
-
-#. module: account
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
-
-#. module: account
-#: report:account.invoice:0
-#: field:account.invoice,amount_tax:0
-#: field:account.move.line,account_tax_id:0
-msgid "Tax"
-msgstr "Impuesto"
-
-#. module: account
-#: view:account.analytic.account:0
-#: field:account.bank.statement.line,analytic_account_id:0
-#: field:account.entries.report,analytic_account_id:0
-#: field:account.invoice.line,account_analytic_id:0
-#: field:account.model.line,analytic_account_id:0
-#: field:account.move.line,analytic_account_id:0
-#: field:account.move.line.reconcile.writeoff,analytic_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: account
-#: view:account.account:0
-#: view:account.journal:0
-#: model:ir.actions.act_window,name:account.action_account_form
-#: model:ir.ui.menu,name:account.account_account_menu
-#: model:ir.ui.menu,name:account.account_template_accounts
-#: model:ir.ui.menu,name:account.menu_action_account_form
-#: model:ir.ui.menu,name:account.menu_analytic
-msgid "Accounts"
-msgstr "Cuentas"
-
-#. module: account
-#: code:addons/account/invoice.py:350
-#, python-format
-msgid "Configuration Error!"
-msgstr "¡Error de configuración!"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,price_average:0
-msgid "Average Price"
-msgstr "Precio promedio"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Date:"
-msgstr "Fecha:"
-
-#. module: account
-#: code:addons/account/account.py:654
-#, python-format
-msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
-msgstr "No puede modificar la compañía de este diario porqué ya contiene polizas"
-
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Label"
-msgstr "Etiqueta"
-
-#. module: account
-#: view:account.tax:0
-msgid "Accounting Information"
-msgstr "Información contable"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Special Computation"
-msgstr "Cálculo especial"
-
-#. module: account
-#: view:account.move.bank.reconcile:0
-#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
-msgid "Bank reconciliation"
-msgstr "Conciliación bancaria"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: report:account.overdue:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Ref"
-msgstr "Ref."
-
-#. module: account
-#: help:account.move.line,tax_code_id:0
-msgid "The Account can either be a base tax code or a tax code account."
-msgstr "La cuenta puede ser una cuenta de un código de impuesto base o de un código de impuesto."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_automatic_reconcile
-msgid "Automatic Reconciliation"
-msgstr "Conciliación automática"
-
-#. module: account
-#: field:account.invoice,reconciled:0
-msgid "Paid/Reconciled"
-msgstr "Pagado/Conciliado"
-
-#. module: account
-#: field:account.tax,ref_base_code_id:0
-#: field:account.tax.template,ref_base_code_id:0
-msgid "Refund Base Code"
-msgstr "Código base reintegro"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
-
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Verdadero"
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.common.report:0
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
-msgid "Parent Tax Account"
-msgstr "Cuenta impuestos padre"
-
-#. module: account
-#: view:account.subscription.generate:0
-msgid "Automatically generate entries based on what has been entered in the  system before a specific date."
-msgstr "Genera automáticamente los polizas a partir de lo que se ha entrado en el sistema antes de una fecha concreta."
-
-#. module: account
-#: view:account.aged.trial.balance:0
-#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
-#: model:ir.ui.menu,name:account.menu_aged_trial_balance
-msgid "Aged Partner Balance"
-msgstr "Saldos vencidos de empresa"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_entriesreconcile0
-#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
-msgid "Accounting entries"
-msgstr "Polizas contables"
-
-#. module: account
-#: field:account.invoice.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: account
-#: help:account.journal,entry_posted:0
-msgid "Check this box if you don't want new journal entries to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation. \n"
-"Note that journal entries that are automatically created by the system are always skipping that state."
-msgstr "Marque esta opción si no desea que los nuevos polizas pasen por el estado 'No asentado' y por tanto vayan directamente al estado 'Asentado' sin ninguna validación manual. \n"
-"Tenga en cuenta que los apuntes creados automáticamente por el sistema siempre obvian ese estado."
-
-#. module: account
-#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
-#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
-msgid "New Company Financial Setting"
-msgstr "Configuración financiera para nueva compañía"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
-#. module: account
-#: view:account.use.model:0
-msgid "This wizard will create recurring accounting entries"
-msgstr "Este asistente creará polizas contables recurrentes"
-
-#. module: account
-#: code:addons/account/account.py:1199
-#, python-format
-msgid "No sequence defined on the journal !"
-msgstr "¡No se ha definido una secuencia en el diario!"
-
-#. module: account
-#: code:addons/account/account.py:2135
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:169
-#: code:addons/account/invoice.py:678
-#: code:addons/account/wizard/account_use_model.py:81
-#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "¡Debe definir un diario analítico en el diario '%s'!"
-
-#. module: account
-#: view:account.invoice.tax:0
-#: model:ir.actions.act_window,name:account.action_tax_code_list
-#: model:ir.ui.menu,name:account.menu_action_tax_code_list
-msgid "Tax Codes"
-msgstr "Códigos de impuestos"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_account_customer
-#: model:ir.ui.menu,name:account.menu_finance_receivables
-msgid "Customers"
-msgstr "Clientes"
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.journal:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "Period to"
-msgstr "Periodo hasta"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:307
-#, python-format
-msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_paymentreconcile0
-msgid "Payment entries are the second input of the reconciliation."
-msgstr "Ploizas de pago son la segunda entrada para la conciliación."
-
-#. module: account
-#: selection:account.print.journal,sort_selection:0
-msgid "Reference Number"
-msgstr "Número de referencia"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: account
-#: help:account.move.line,quantity:0
-msgid "The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."
-msgstr "La cantidad opcional expresadas por esta línea, por ejemplo: el número de productos vendidos. La cantidad no es un requisito legal, pero es muy útil para algunos informes."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
-msgstr "Línea 2:"
-
-#. module: account
-#: field:account.journal.column,required:0
-msgid "Required"
-msgstr "Requerido"
-
-#. module: account
-#: view:account.chart.template:0
-#: field:product.category,property_account_expense_categ:0
-#: field:product.template,property_account_expense:0
-msgid "Expense Account"
-msgstr "Cuenta de gastos"
-
-#. module: account
-#: help:account.invoice,period_id:0
-msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "Dejarlo vacío para utilizar el período de la fecha de validación (factura)."
-
-#. module: account
-#: help:account.bank.statement,account_id:0
-msgid "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr "Utilizado en el dominio de conciliación de extractos, pero no debería ser usado en otro sitio."
-
-#. module: account
-#: field:account.invoice.tax,base_amount:0
-msgid "Base Code Amount"
-msgstr "Importe código base"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,sale_tax:0
-msgid "Default Sale Tax"
-msgstr "Impuesto de venta por defecto"
-
-#. module: account
-#: help:account.model.line,date_maturity:0
-msgid "The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."
-msgstr "La fecha de vencimiento de las polizas generadas por este modelo. Puede elegir entre la fecha de creación o la fecha de creación de las polizas más los plazos de pago de la empresa."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_accounting
-msgid "Financial Accounting"
-msgstr "Contabilidad financiera"
-
-#. module: account
-#: view:account.pl.report:0
-#: model:ir.ui.menu,name:account.menu_account_pl_report
-msgid "Profit And Loss"
-msgstr "Pérdidas y ganancias"
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
-#: field:account.fiscal.position.account,position_id:0
-#: field:account.fiscal.position.tax,position_id:0
-#: field:account.fiscal.position.tax.template,position_id:0
-#: view:account.fiscal.position.template:0
-#: field:account.invoice,fiscal_position:0
-#: field:account.invoice.report,fiscal_position:0
-#: model:ir.model,name:account.model_account_fiscal_position
-#: field:res.partner,property_account_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: account
-#: help:account.partner.ledger,initial_balance:0
-#: help:account.report.general.ledger,initial_balance:0
-msgid "It adds initial balance row on report which display previous sum amount of debit/credit/balance"
-msgstr "Añade una fila de saldo inicial en el informe que muestra el importe previo del debe/haber/saldo."
-
-#. module: account
-#: view:account.analytic.line:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
-msgid "Analytic Entries"
-msgstr "Polizas analíticas"
-
-#. module: account
-#: code:addons/account/account.py:833
-#, python-format
-msgid "No fiscal year defined for this date !\n"
-"Please create one."
-msgstr "¡No se ha definido un ejercicio fiscal para esta fecha!\n"
-"Por favor, cree uno."
-
-#. module: account
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: model:process.process,name:account.process_process_invoiceprocess0
-#: selection:report.invoice.created,type:0
-msgid "Customer Invoice"
-msgstr "Factura de cliente"
-
-#. module: account
-#: help:account.tax.template,include_base_amount:0
-msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
-msgstr "Indica si el importe del impuesto deberá incluirse en el importe base antes de calcular los siguientes impuestos."
-
-#. module: account
-#: help:account.journal,user_id:0
-msgid "The user responsible for this journal"
-msgstr "El usuario responsable de este diario"
-
-#. module: account
-#: view:account.period:0
-msgid "Search Period"
-msgstr "Buscar periodo"
-
-#. module: account
-#: view:account.change.currency:0
-msgid "Invoice Currency"
-msgstr "Moneda factura"
-
-#. module: account
-#: field:account.payment.term,line_ids:0
-msgid "Terms"
-msgstr "Plazos de pago"
-
-#. module: account
-#: field:account.bank.statement,total_entry_encoding:0
-msgid "Cash Transaction"
-msgstr "Transición de caja"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank account"
-msgstr "Cuenta bancaria"
-
-#. module: account
-#: field:account.chart.template,tax_template_ids:0
-msgid "Tax Template List"
-msgstr "Lista plantilla impuestos"
-
-#. module: account
-#: help:account.account,currency_mode:0
-msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
-msgstr "Permite seleccionar la forma en que se calcula la tasa de la divisa actual en las transacciones de salida. En la mayoría de los países el método legal es \"Promedio\", pero sólo unos pocos sistemas de software son capaces de gestionarlo. Por lo tanto, si la importación procede de otro sistema de software, es posible que tenga que utilizar la tasa \"En fecha\". Las transacciones de entrada siempre utilizan la tasa \"En fecha\"."
-
-#. module: account
-#: help:wizard.multi.charts.accounts,code_digits:0
-msgid "No. of Digits to use for account code"
-msgstr "Núm. de dígitos a usar para código de cuenta."
-
-#. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
-msgstr "Nombre línea"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Search Fiscalyear"
-msgstr "Buscar ejercicio fiscal"
-
-#. module: account
-#: selection:account.tax,applicable_type:0
-msgid "Always"
-msgstr "Siempre"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Total Quantity"
-msgstr "Cantidad total"
-
-#. module: account
-#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
-msgid "Write-Off account"
-msgstr "Cuenta de desajuste"
-
-#. module: account
-#: field:account.model.line,model_id:0
-#: view:account.subscription:0
-#: field:account.subscription,model_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. module: account
-#: help:account.invoice.tax,base_code_id:0
-msgid "The account basis of the tax declaration."
-msgstr "La cuenta base de la declaración de impuestos."
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.entries.report,type:0
-msgid "View"
-msgstr "Vista"
-
-#. module: account
-#: code:addons/account/account.py:2989
-#: code:addons/account/installer.py:296
-#, python-format
-msgid "BNK"
-msgstr "BANCO"
-
-#. module: account
-#: field:account.move.line,analytic_lines:0
-msgid "Analytic lines"
-msgstr "Líneas analíticas"
-
-#. module: account
-#: model:process.node,name:account.process_node_electronicfile0
-msgid "Electronic File"
-msgstr "Archivo electrónico"
-
-#. module: account
-#: view:res.partner:0
-msgid "Customer Credit"
-msgstr "Haber del cliente"
-
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Starts on"
-msgstr "Empieza en"
-
-#. module: account
-#: model:ir.model,name:account.model_account_partner_ledger
-msgid "Account Partner Ledger"
-msgstr "Contabilidad. Libro mayor empresa"
-
-#. module: account
-#: help:account.journal.column,sequence:0
-msgid "Gives the sequence order to journal column."
-msgstr "Indica el orden de secuencia de la columna del diario."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Tax Declaration"
-msgstr "Declaración de impuestos"
-
-#. module: account
-#: help:account.account,currency_id:0
-#: help:account.account.template,currency_id:0
-#: help:account.bank.accounts.wizard,currency_id:0
-msgid "Forces all moves for this account to have this secondary currency."
-msgstr "Fuerza a todos los movimientos de esta cuenta tener esta moneda secundaria."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_validate_account_move_line
-msgid "This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore."
-msgstr "Este asistente validará todas las polizas de un diario y período en particular. Una vez que se validan las polizas, no se pueden modificar más."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_chart_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
-msgid "Chart of Accounts Templates"
-msgstr "Plantillas para el plan contable"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
-
-#. module: account
-#: model:ir.model,name:account.model_account_unreconcile_reconcile
-msgid "Account Unreconcile Reconcile"
-msgstr "Contabilidad. Romper conciliación. Conciliar"
-
-#. module: account
-#: help:account.account.type,close_method:0
-msgid "Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.\n"
-"\n"
-" 'None' means that nothing will be done.\n"
-" 'Balance' will generally be used for cash accounts.\n"
-" 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.\n"
-" 'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."
-msgstr "Establezca aquí el método que usará el asistente genérico para crear la poliza de cierre de ejercicio para todas las cuentas de este tipo.\n"
-"\n"
-" 'Ninguno' significa que no se hará nada.\n"
-" 'Saldo' normalmente se usará para cuentas de efectivo.\n"
-" 'Detallado' copiará cada apunte del ejercicio anterior, incluso los no conciliadas.\n"
-" 'Sin conciliar' copiará sólo los apuntes aun no conciliadas el primer día del nuevo ejercicio fiscal."
-
-#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "No hay ningún diario de cierre definido para el ejercicio fiscal"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Keep empty to use the expense account"
-msgstr "Dejar vacío para la cuenta de gastos"
-
-#. module: account
-#: field:account.aged.trial.balance,journal_ids:0
-#: field:account.analytic.cost.ledger.journal.report,journal:0
-#: field:account.balance.report,journal_ids:0
-#: field:account.bs.report,journal_ids:0
-#: field:account.central.journal,journal_ids:0
-#: field:account.common.account.report,journal_ids:0
-#: field:account.common.journal.report,journal_ids:0
-#: field:account.common.partner.report,journal_ids:0
-#: view:account.common.report:0
-#: field:account.common.report,journal_ids:0
-#: report:account.general.journal:0
-#: field:account.general.journal,journal_ids:0
-#: report:account.general.ledger_landscape:0
-#: view:account.journal.period:0
-#: report:account.partner.balance:0
-#: field:account.partner.balance,journal_ids:0
-#: field:account.partner.ledger,journal_ids:0
-#: field:account.pl.report,journal_ids:0
-#: view:account.print.journal:0
-#: field:account.print.journal,journal_ids:0
-#: field:account.report.general.ledger,journal_ids:0
-#: field:account.vat.declaration,journal_ids:0
-#: model:ir.actions.act_window,name:account.action_account_journal_form
-#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.ui.menu,name:account.menu_account_print_journal
-#: model:ir.ui.menu,name:account.menu_action_account_journal_form
-#: model:ir.ui.menu,name:account.menu_journals
-#: model:ir.ui.menu,name:account.menu_journals_report
-msgid "Journals"
-msgstr "Diarios"
-
-#. module: account
-#: field:account.partner.reconcile.process,to_reconcile:0
-msgid "Remaining Partners"
-msgstr "Empresas restantes"
-
-#. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
-msgid "Subscription Lines"
-msgstr "Apuntes de polizas periódicas"
-
-#. module: account
-#: selection:account.analytic.journal,type:0
-#: view:account.journal:0
-#: selection:account.journal,type:0
-#: view:account.model:0
-#: selection:account.tax,type_tax_use:0
-#: view:account.tax.template:0
-#: selection:account.tax.template,type_tax_use:0
-msgid "Purchase"
-msgstr "Compra"
-
-#. module: account
-#: view:account.installer:0
-#: view:account.installer.modules:0
-#: model:ir.actions.act_window,name:account.action_account_installer
-#: view:wizard.multi.charts.accounts:0
-msgid "Accounting Application Configuration"
-msgstr "Configuración aplicaciones contabilidad"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.open_board_account
-#: model:ir.ui.menu,name:account.menu_board_account
-msgid "Accounting Dashboard"
-msgstr "Tablero de contabilidad"
-
-#. module: account
-#: field:account.bank.statement,balance_start:0
-msgid "Starting Balance"
-msgstr "Saldo inicial"
-
-#. module: account
-#: code:addons/account/invoice.py:1298
-#, python-format
-msgid "No Partner Defined !"
-msgstr "¡No se ha definido empresa!"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_period_close
-#: model:ir.actions.act_window,name:account.action_account_period_tree
-#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
-msgid "Close a Period"
-msgstr "Cerrar un periodo"
-
-#. module: account
-#: field:account.analytic.balance,empty_acc:0
-msgid "Empty Accounts ? "
-msgstr "¿Cuentas vacías? "
-
-#. module: account
-#: report:account.overdue:0
-msgid "VAT:"
-msgstr "IVA:"
-
-#. module: account
-#: help:account.analytic.line,amount_currency:0
-msgid "The amount expressed in the related account currency if not equal to the company one."
-msgstr "El importe expresado en la moneda contable relacionada no es igual al de la compañía."
-
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.invoice:0
-#: selection:account.invoice,state:0
-#: view:account.invoice.report:0
-#: selection:account.invoice.report,state:0
-#: selection:account.journal.period,state:0
-#: view:account.subscription:0
-#: selection:account.subscription,state:0
-#: selection:report.invoice.created,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Accounting Chart Configuration"
-msgstr "Configuración plan contable"
-
-#. module: account
-#: field:account.tax.code,notprintable:0
-#: field:account.tax.code.template,notprintable:0
-msgid "Not Printable in Invoice"
-msgstr "No se imprime en factura"
-
-#. module: account
-#: report:account.vat.declaration:0
-#: field:account.vat.declaration,chart_tax_id:0
-msgid "Chart of Tax"
-msgstr "Plan de impuestos"
-
-#. module: account
-#: view:account.journal:0
-msgid "Search Account Journal"
-msgstr "Buscar diario"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
-msgid "Pending Invoice"
-msgstr "Factura pendiente"
-
-#. module: account
-#: selection:account.subscription,period_type:0
-msgid "year"
-msgstr "año"
-
-#. module: account
-#: view:validate.account.move.lines:0
-msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
-msgstr "Todas las polizas seleccionadas serán validadas y asentadas. Esto significa que ya no podrá modificar sus campos contables."
-
-#. module: account
-#: code:addons/account/invoice.py:373
-#, python-format
-msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_transfers
-msgid "Transfers"
-msgstr "Transferencias"
-
-#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
-msgstr "Descuadrado"
-
-#. module: account
-#: view:account.chart:0
-msgid "Account charts"
-msgstr "Planes contables"
-
-#. module: account
-#: report:account.vat.declaration:0
-msgid "Tax Amount"
-msgstr "Importe impuesto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Your bank and cash accounts"
-msgstr "Sus cuentas bancarias y de caja"
-
-#. module: account
-#: view:account.move:0
-msgid "Search Move"
-msgstr "Buscar movimiento"
-
-#. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
-msgid "Tax Case Name"
-msgstr "Nombre código de impuesto"
-
-#. module: account
-#: report:account.invoice:0
-#: model:process.node,name:account.process_node_draftinvoices0
-msgid "Draft Invoice"
-msgstr "Factura borrador"
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_state.py:68
-#, python-format
-msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
-msgstr "¡La(s) factura(s) seleccionada(s) no se puede cancelar ya que está en estado 'Cancelada' o 'Realizada'!"
-
-#. module: account
-#: code:addons/account/account.py:532
-#, python-format
-msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
-msgstr "¡No puede cambiar el tipo de cuenta de '%s' a '%s' si contiene polizas contables!"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-msgid "Counterpart"
-msgstr "Contrapartida"
-
-#. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
-msgstr "Datos facturación"
-
-#. module: account
-#: field:account.invoice.report,state:0
-msgid "Invoice State"
-msgstr "Estado factura"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: account
-#: view:account.move:0
-#: field:account.move,narration:0
-#: view:account.move.line:0
-#: field:account.move.line,narration:0
-msgid "Narration"
-msgstr "Notas"
-
-#. module: account
-#: view:account.addtmpl.wizard:0
-#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
-msgid "Create Account"
-msgstr "Crear cuenta"
-
-#. module: account
-#: model:ir.model,name:account.model_report_account_type_sales
-msgid "Report of the Sales by Account Type"
-msgstr "Informe de las ventas por tipo de cuenta"
-
-#. module: account
-#: selection:account.account.type,close_method:0
-msgid "Detail"
-msgstr "Detalle"
-
-#. module: account
-#: field:account.installer,bank_accounts_id:0
-msgid "Your Bank and Cash Accounts"
-msgstr "Sus cuentas de banco y caja"
-
-#. module: account
-#: report:account.invoice:0
-msgid "VAT :"
-msgstr "CIF/NIF:"
-
-#. module: account
-#: field:account.installer,charts:0
-#: model:ir.actions.act_window,name:account.action_account_chart
-#: model:ir.actions.act_window,name:account.action_account_tree
-#: model:ir.ui.menu,name:account.menu_action_account_tree2
-msgid "Chart of Accounts"
-msgstr "Plan contable"
-
-#. module: account
-#: view:account.tax.chart:0
-msgid "(If you do not select period it will take all open periods)"
-msgstr "(si no selecciona periodo se usarán todos los periodos abiertos)"
-
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised counterpart"
-msgstr "Homólogo centralizado"
-
-#. module: account
-#: model:ir.model,name:account.model_account_partner_reconcile_process
-msgid "Reconcilation Process partner by partner"
-msgstr "Proceso conciliación empresa por empresa"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "2"
-msgstr "2"
-
-#. module: account
-#: view:account.chart:0
-msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr "(Si no selecciona un ejercicio fiscal se tendrán en cuenta todos los ejercicios fiscales)"
-
-#. module: account
-#: selection:account.aged.trial.balance,filter:0
-#: report:account.analytic.account.journal:0
-#: selection:account.balance.report,filter:0
-#: field:account.bank.statement,date:0
-#: field:account.bank.statement.line,date:0
-#: selection:account.bs.report,filter:0
-#: selection:account.central.journal,filter:0
-#: selection:account.common.account.report,filter:0
-#: selection:account.common.journal.report,filter:0
-#: selection:account.common.partner.report,filter:0
-#: selection:account.common.report,filter:0
-#: view:account.entries.report:0
-#: field:account.entries.report,date:0
-#: selection:account.general.journal,filter:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.invoice.report,date:0
-#: report:account.journal.period.print:0
-#: view:account.move:0
-#: field:account.move,date:0
-#: field:account.move.line.reconcile.writeoff,date_p:0
-#: report:account.overdue:0
-#: selection:account.partner.balance,filter:0
-#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
-#: selection:account.print.journal,filter:0
-#: selection:account.print.journal,sort_selection:0
-#: selection:account.report.general.ledger,filter:0
-#: selection:account.report.general.ledger,sortby:0
-#: field:account.subscription.generate,date:0
-#: field:account.subscription.line,date:0
-#: report:account.tax.code.entries:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: selection:account.vat.declaration,filter:0
-#: code:addons/account/report/common_report_header.py:97
-#: field:analytic.entries.report,date:0
-#, python-format
-msgid "Date"
-msgstr "Fecha"
-
-#. module: account
-#: view:account.unreconcile:0
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
-
-#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:81
-#, python-format
-msgid "The journal must have default credit and debit account"
-msgstr "El diario debe tener una cuenta haber y debe por defecto."
-
-#. module: account
-#: view:account.chart.template:0
-msgid "Chart of Accounts Template"
-msgstr "Plantilla del plan contable"
-
-#. module: account
-#: code:addons/account/account.py:2147
-#, python-format
-msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
-"Please define partner on it!"
-msgstr "La fecha de vencimiento dla linea generado por la línea del modelo '%s' del modelo '%s' se basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
-
-#. module: account
-#: code:addons/account/account_move_line.py:804
-#, python-format
-msgid "Some entries are already reconciled !"
-msgstr "¡Algunas polizas ya están conciliadas!"
-
-#. module: account
-#: code:addons/account/account.py:1222
-#, python-format
-msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
-msgstr "¡No puede validar una poliza hasta que todos los movimientos estén en el mismo plan contable!"
-
-#. module: account
-#: view:account.tax:0
-msgid "Account Tax"
-msgstr "Cuenta de impuestos"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
-msgid "Budgets"
-msgstr "Presupuestos"
-
-#. module: account
-#: selection:account.aged.trial.balance,filter:0
-#: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
-#: selection:account.central.journal,filter:0
-#: selection:account.common.account.report,filter:0
-#: selection:account.common.journal.report,filter:0
-#: selection:account.common.partner.report,filter:0
-#: selection:account.common.report,filter:0
-#: selection:account.general.journal,filter:0
-#: selection:account.partner.balance,filter:0
-#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
-#: selection:account.print.journal,filter:0
-#: selection:account.report.general.ledger,filter:0
-#: selection:account.vat.declaration,filter:0
-msgid "No Filters"
-msgstr "No filtros"
-
-#. module: account
-#: selection:account.analytic.journal,type:0
-msgid "Situation"
-msgstr "Situación"
-
-#. module: account
-#: view:res.partner:0
-msgid "History"
-msgstr "Historial"
-
-#. module: account
-#: help:account.tax,applicable_type:0
-#: help:account.tax.template,applicable_type:0
-msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
-msgstr "Si no es aplicable (calculado a través de un código Python), el impuesto no aparecerá en la factura."
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Applicable Code (if type=code)"
-msgstr "Código aplicable (si tipo=código)"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,product_qty:0
-msgid "Qty"
-msgstr "Cantidad"
-
-#. module: account
-#: field:account.invoice.report,address_contact_id:0
-msgid "Contact Address Name"
-msgstr "Nombre dirección contacto"
-
-#. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Desacuerdo"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Search Analytic Lines"
-msgstr "Buscar líneas analíticas"
-
-#. module: account
-#: field:res.partner,property_account_payable:0
-msgid "Account Payable"
-msgstr "Cuenta a pagar"
-
-#. module: account
-#: constraint:account.move:0
-msgid "You cannot create entries on different periods/journals in the same move"
-msgstr "No puede crear polizas con movimientos en distintos periodos/diarios"
-
-#. module: account
-#: model:process.node,name:account.process_node_supplierpaymentorder0
-msgid "Payment Order"
-msgstr "Orden de pago"
-
-#. module: account
-#: help:account.account.template,reconcile:0
-msgid "Check this option if you want the user to reconcile entries in this account."
-msgstr "Marque esta opción si desea que el usuario concilie polizas en esta cuenta."
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
-msgid "Account balance"
-msgstr "Balance contable"
-
-#. module: account
-#: report:account.invoice:0
-#: field:account.invoice.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tree1
-msgid "Analytic Items"
-msgstr "Apuntes analíticos"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1137
-#, python-format
-msgid "Unable to change tax !"
-msgstr "¡No ha sido posible cambiar el impuesto!"
-
-#. module: account
-#: field:analytic.entries.report,nbr:0
-msgid "#Entries"
-msgstr "Nº polizas"
-
-#. module: account
-#: code:addons/account/invoice.py:1437
-#, python-format
-msgid "You selected an Unit of Measure which is not compatible with the product."
-msgstr "Ha seleccionado una unidad de medida que no es compatible con el producto."
-
-#. module: account
-#: code:addons/account/invoice.py:476
-#, python-format
-msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
-msgstr "¡El plazo de pago de los proveedores no tiene líneas de plazo de pago (Cálculo) definidas!"
-
-#. module: account
-#: view:account.state.open:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
-
-#. module: account
-#: field:account.invoice.tax,factor_tax:0
-msgid "Multipication factor Tax code"
-msgstr "Código impuesto factor multiplicación"
-
-#. module: account
-#: view:account.fiscal.position:0
-msgid "Mapping"
-msgstr "Asignaciones"
-
-#. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
-#: report:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,name:0
-#: field:account.chart.template,name:0
-#: field:account.model.line,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
-#: field:account.subscription,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: account
-#: model:ir.model,name:account.model_account_aged_trial_balance
-msgid "Account Aged Trial balance Report"
-msgstr "Informe de balance de comprobación de vencimientos"
-
-#. module: account
-#: field:account.move.line,date:0
-msgid "Effective date"
-msgstr "Fecha vigencia"
-
-#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:53
-#, python-format
-msgid "Standard Encoding"
-msgstr "Codificación estándar"
-
-#. module: account
-#: help:account.journal,analytic_journal_id:0
-msgid "Journal for analytic entries"
-msgstr "Diario para polizas analíticas"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance
-#: model:process.node,name:account.process_node_accountingentries0
-#: model:process.node,name:account.process_node_supplieraccountingentries0
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: account
-#: help:account.central.journal,amount_currency:0
-#: help:account.common.journal.report,amount_currency:0
-#: help:account.general.journal,amount_currency:0
-#: help:account.print.journal,amount_currency:0
-msgid "Print Report with the currency column if the currency is different then the company currency"
-msgstr "Imprime informe con la columna de la moneda si la moneda es distinta de la moneda de la compañía."
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "General Accounting"
-msgstr "Contabilidad general"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Balance :"
-msgstr "Saldo :"
-
-#. module: account
-#: help:account.fiscalyear.close,journal_id:0
-msgid "The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts, of type 'situation' and with a centralized counterpart."
-msgstr "Lo más recomendable es usar un diario dedicado a contener las polizas de apertura de todos los ejercicios. Tenga en cuenta que lo debería definir con cuentas de debe/haber por defecto, de tipo 'situación' y con una contrapartida centralizada."
-
-#. module: account
-#: view:account.installer:0
-#: view:account.installer.modules:0
-#: view:wizard.multi.charts.accounts:0
-msgid "title"
-msgstr "título"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form
-msgid "Recurring Lines"
-msgstr "Líneas recurrentes"
-
-#. module: account
-#: field:account.partner.balance,display_partner:0
-msgid "Display Partners"
-msgstr "Mostrar empresas"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: account
-#: sql_constraint:account.model.line:0
-msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
-msgstr "¡Valor de haber o debe en el modelo erróneo (haber o debe debería ser \"0\")!"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
-msgid "From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs."
-msgstr "A partir de este informe, puede tener una visión general del importe facturado a sus clientes, así como los retrasos en los pagos. La herramienta de búsqueda también se puede utilizar para personalizar los informes de las facturas y por tanto, adaptar este análisis a sus necesidades."
-
-#. module: account
-#: view:account.invoice.confirm:0
-msgid "Confirm Invoices"
-msgstr "Confirmar facturas"
-
-#. module: account
-#: selection:account.account,currency_mode:0
-msgid "Average Rate"
-msgstr "Tasa promedio"
-
-#. module: account
-#: view:account.state.open:0
-msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(debería romper la conciliación si desea abrir la factura)"
-
-#. module: account
-#: field:account.aged.trial.balance,period_from:0
-#: field:account.balance.report,period_from:0
-#: field:account.bs.report,period_from:0
-#: field:account.central.journal,period_from:0
-#: field:account.chart,period_from:0
-#: field:account.common.account.report,period_from:0
-#: field:account.common.journal.report,period_from:0
-#: field:account.common.partner.report,period_from:0
-#: field:account.common.report,period_from:0
-#: field:account.general.journal,period_from:0
-#: field:account.partner.balance,period_from:0
-#: field:account.partner.ledger,period_from:0
-#: field:account.pl.report,period_from:0
-#: field:account.print.journal,period_from:0
-#: field:account.report.general.ledger,period_from:0
-#: field:account.vat.declaration,period_from:0
-msgid "Start period"
-msgstr "Periodo inicial"
-
-#. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
-#: report:account.vat.declaration:0
-msgid "Tax Name"
-msgstr "Nombre impuesto"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_balance
-#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
-msgid "Analytic Balance"
-msgstr "Saldo analítico"
-
-#. module: account
-#: code:addons/account/report/account_balance_sheet.py:78
-#: code:addons/account/report/account_balance_sheet.py:124
-#: code:addons/account/report/account_profit_loss.py:79
-#: code:addons/account/report/account_profit_loss.py:130
-#, python-format
-msgid "Net Loss"
-msgstr "Pérdida neta"
-
-#. module: account
-#: help:account.account,active:0
-msgid "If the active field is set to False, it will allow you to hide the account without removing it."
-msgstr "Si el campo activo se desmarca, permite ocultar la cuenta sin eliminarla."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Search Tax Templates"
-msgstr "Buscar plantillas impuestos"
-
-#. module: account
-#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
-msgid "Draft Entries"
-msgstr "Polizas borrador"
-
-#. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
-msgid "Shortcut"
-msgstr "Abreviación"
-
-#. module: account
-#: view:account.account:0
-#: field:account.account,user_type:0
-#: view:account.account.template:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
-#: field:account.bank.accounts.wizard,account_type:0
-#: field:account.entries.report,user_type:0
-#: model:ir.model,name:account.model_account_account_type
-#: field:report.account.receivable,type:0
-#: field:report.account_type.sales,user_type:0
-msgid "Account Type"
-msgstr "Tipo de cuenta"
-
-#. module: account
-#: report:account.account.balance:0
-#: view:account.balance.report:0
-#: model:ir.actions.act_window,name:account.action_account_balance_menu
-#: model:ir.actions.report.xml,name:account.account_account_balance
-#: model:ir.ui.menu,name:account.menu_general_Balance_report
-msgid "Trial Balance"
-msgstr "Balance de sumas y saldos"
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_cancel
-msgid "Cancel the Selected Invoices"
-msgstr "Cancelar las facturas seleccionadas"
-
-#. module: account
-#: help:product.category,property_account_income_categ:0
-#: help:product.template,property_account_income:0
-msgid "This account will be used to value outgoing stock for the current product category using sale price"
-msgstr "Esta cuenta se utilizará para valorar el stock saliente para la categoría de producto actual utilizando el precio de venta."
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "3"
-msgstr "3"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid "Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices."
-msgstr "Los costes analíticos (hojas de servicios, algunos productos comprados, ...) provienen de las cuentas analíticas. Estos generan facturas borrador de proveedor."
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
-msgstr "Cerrar caja"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,due_delay:0
-msgid "Avg. Due Delay"
-msgstr "Retraso promedio deuda"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "Acc.Type"
-msgstr "Tipo cuenta"
-
-#. module: account
-#: code:addons/account/invoice.py:722
-#, python-format
-msgid "Global taxes defined, but are not in invoice lines !"
-msgstr "¡Impuestos globales definidos, pero no están en líneas de la factura!"
-
-#. module: account
-#: field:account.entries.report,month:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,month:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,month:0
-#: field:report.account.sales,month:0
-#: field:report.account_type.sales,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: account
-#: field:account.invoice.report,uom_name:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Overdue Account"
-msgstr "Cuenta atrasos"
-
-#. module: account
-#: selection:account.invoice,state:0
-#: report:account.overdue:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: account
-#: field:account.invoice,tax_line:0
-msgid "Tax Lines"
-msgstr "Líneas de impuestos"
-
-#. module: account
-#: field:account.tax,base_code_id:0
-msgid "Account Base Code"
-msgstr "Código base cuenta"
-
-#. module: account
-#: help:account.move,state:0
-msgid "All manually created new journal entry are usually in the state 'Unposted', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in 'Posted' state."
-msgstr "Todas los polizas creadas manualmente están, por lo general, en el estado 'No asentado', pero puede configurar la opción de omitir ese estado en el diario correspondiente. En ese caso, se comportan como polizas creadas automáticamente por el sistema en la validación de documentos (facturas, extractos bancarios, ...) y se crearán en estado 'Asentado'."
-
-#. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
-
-#. module: account
-#: view:res.partner:0
-msgid "Customer Accounting Properties"
-msgstr "Propiedades de contabilidad del cliente"
-
-#. module: account
-#: field:account.invoice.tax,name:0
-msgid "Tax Description"
-msgstr "Descripción impuesto"
-
-#. module: account
-#: selection:account.aged.trial.balance,target_move:0
-#: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
-#: selection:account.central.journal,target_move:0
-#: selection:account.chart,target_move:0
-#: selection:account.common.account.report,target_move:0
-#: selection:account.common.journal.report,target_move:0
-#: selection:account.common.partner.report,target_move:0
-#: selection:account.common.report,target_move:0
-#: selection:account.general.journal,target_move:0
-#: selection:account.move.journal,target_move:0
-#: selection:account.partner.balance,target_move:0
-#: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
-#: selection:account.print.journal,target_move:0
-#: selection:account.report.general.ledger,target_move:0
-#: selection:account.tax.chart,target_move:0
-#: selection:account.vat.declaration,target_move:0
-#: code:addons/account/report/common_report_header.py:68
-#, python-format
-msgid "All Posted Entries"
-msgstr "Todas las polizas asentadas"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:357
-#, python-format
-msgid "Statement %s is confirmed, journal items are created."
-msgstr "Se ha confirmado el extracto %s, se han creado los polizas contables."
-
-#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr "¡Error! La duración del ejercicio fiscal no es válida. "
-
-#. module: account
-#: field:report.aged.receivable,name:0
-msgid "Month Range"
-msgstr "Rango mensual"
-
-#. module: account
-#: help:account.analytic.balance,empty_acc:0
-msgid "Check if you want to display Accounts with 0 balance too."
-msgstr "Compruebe si también desea mostrar cuentas con saldo 0."
-
-#. module: account
-#: view:account.tax:0
-msgid "Compute Code"
-msgstr "Código cálculo"
-
-#. module: account
-#: view:account.account.template:0
-msgid "Default taxes"
-msgstr "Impuestos por defecto"
-
-#. module: account
-#: code:addons/account/invoice.py:88
-#, python-format
-msgid "Free Reference"
-msgstr "Referencia libre"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
-
-#. module: account
-#: help:account.move.line,state:0
-msgid "When new move line is created the state will be 'Draft'.\n"
-"* When all the payments are done it will be in 'Valid' state."
-msgstr "Cuando se crea un nuevo apunte, el estado será 'Borrador'.\n"
-"* Cuando se realicen todos los pagos, el estado será 'Válido'"
-
-#. module: account
-#: field:account.journal,view_id:0
-msgid "Display Mode"
-msgstr "Modo de visualización"
-
-#. module: account
-#: model:process.node,note:account.process_node_importinvoice0
-msgid "Statement from invoice or payment"
-msgstr "Extracto desde factura o pago"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month: 0"
-msgstr "  día del mes: 0"
-
-#. module: account
-#: model:ir.model,name:account.model_account_chart
-msgid "Account chart"
-msgstr "Plan contable"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-#: report:account.analytic.account.balance:0
-#: report:account.central.journal:0
-msgid "Account Name"
-msgstr "Nombre de cuenta"
-
-#. module: account
-#: help:account.fiscalyear.close,report_name:0
-msgid "Give name of the new entries"
-msgstr "Indique el nombre de las nuevas polizas."
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_report
-msgid "Invoices Statistics"
-msgstr "Estadísticas de facturas"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
-msgid "Bank statements are entered in the system."
-msgstr "Han sido introducidos los extractos bancarios en el sistema."
-
-#. module: account
-#: code:addons/account/wizard/account_reconcile.py:133
-#, python-format
-msgid "Reconcile Writeoff"
-msgstr "Desfase conciliación"
-
-#. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Fecha vencimiento"
-
-#. module: account
-#: view:report.account.receivable:0
-msgid "Accounts by Type"
-msgstr "Cuentas por tipo"
-
-#. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,balance_end_real:0
-msgid "Closing Balance"
-msgstr "Saldo de cierre"
-
-#. module: account
-#: code:addons/account/report/common_report_header.py:92
-#, python-format
-msgid "Not implemented"
-msgstr "No implementado"
-
-#. module: account
-#: model:ir.model,name:account.model_account_journal_select
-msgid "Account Journal Select"
-msgstr "Contabilidad. Seleccionar diario"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Print Invoice"
-msgstr "Imprimir factura"
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Credit Notes"
-msgstr "Abonos"
-
-#. module: account
-#: code:addons/account/account.py:2119
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "Unable to find a valid period !"
-msgstr "¡No ha sido posible encontrar un período válida!"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Voucher No"
-msgstr "Núm. de bono"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr "Romper conciliación transacciones"
-
-#. module: account
-#: view:account.use.model:0
-msgid "Create Entries From Models"
-msgstr "Crear polizas desde modelos"
-
-#. module: account
-#: field:account.account.template,reconcile:0
-msgid "Allow Reconciliation"
-msgstr "Permitir conciliación"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Analytic Account Statistics"
-msgstr "Estadísticas cuenta analítica"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
-msgstr "Permite configurar automáticamente su plan contable, cuentas de bancos, impuestos y diarios según la plantilla seleccionada"
-
-#. module: account
-#: field:account.tax,price_include:0
-#: field:account.tax.template,price_include:0
-msgid "Tax Included in Price"
-msgstr "Impuestos incluidos en precio"
-
-#. module: account
-#: constraint:account.account:0
-#: constraint:account.account.template:0
-msgid "Configuration Error! \n"
-"You cannot define children to an account with internal type different of \"View\"! "
-msgstr "¡Error de configuración!\n"
-"¡No puede definir hijos de una cuenta de tipo interno distinto al tipo \"Vista\"! "
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
-msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Contabilidad. Libro de costes analíticos para informe diario"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_model_form
-#: model:ir.ui.menu,name:account.menu_action_model_form
-msgid "Recurring Models"
-msgstr "Modelos recurrentes"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "4"
-msgstr "4"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Change"
-msgstr "Cambiar"
-
-#. module: account
-#: code:addons/account/account.py:1308
-#: code:addons/account/account.py:1338
-#: code:addons/account/account.py:1345
-#: code:addons/account/account_move_line.py:1064
-#: code:addons/account/invoice.py:904
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:80
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_move_journal.py:165
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
-#, python-format
-msgid "UserError"
-msgstr "Error de usuario"
-
-#. module: account
-#: field:account.journal,type_control_ids:0
-msgid "Type Controls"
-msgstr "Controles de tipo"
-
-#. module: account
-#: help:account.journal,default_credit_account_id:0
-msgid "It acts as a default account for credit amount"
-msgstr "Actúa como una cuenta por defecto para los importes en el haber."
-
-#. module: account
-#: help:account.partner.ledger,reconcil:0
-msgid "Consider reconciled entries"
-msgstr "Considerar polizas conciliadas."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_validate_account_move_line
-#: model:ir.ui.menu,name:account.menu_validate_account_moves
-#: view:validate.account.move:0
-#: view:validate.account.move.lines:0
-msgid "Post Journal Entries"
-msgstr "Asentar polizas"
-
-#. module: account
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:report.invoice.created,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: account
-#: help:account.bank.statement,balance_end_cash:0
-msgid "Closing balance based on cashBox"
-msgstr "Saldo de cierre basado en la caja."
-
-#. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "¡Error! No se pueden crear cuentas recursivas."
-
-#. module: account
-#: view:account.subscription.generate:0
-#: model:ir.actions.act_window,name:account.action_account_subscription_generate
-#: model:ir.ui.menu,name:account.menu_generate_subscription
-msgid "Generate Entries"
-msgstr "Generar polizas"
-
-#. module: account
-#: help:account.vat.declaration,chart_tax_id:0
-msgid "Select Charts of Taxes"
-msgstr "Selecciona plan de impuestos."
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
-#: field:account.fiscal.position.template,account_ids:0
-msgid "Account Mapping"
-msgstr "Mapeo de cuentas"
-
-#. module: account
-#: selection:account.bank.statement.line,type:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:320
-#, python-format
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Cancelled Invoice"
-msgstr "Factura cancelada"
-
-#. module: account
-#: code:addons/account/invoice.py:73
-#, python-format
-msgid "You must define an analytic journal of type '%s' !"
-msgstr "¡Debe definir un diario analítico de tipo '%s'!"
-
-#. module: account
-#: code:addons/account/account.py:1447
-#, python-format
-msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
-msgstr "No se pudo crear movimiento con moneda distinta de la moneda secundaria de la cuenta \"%s - %s\". Borrar el campo de moneda secundaria de la definición de la cuenta si desea aceptar todas las monedas."
-
-#. module: account
-#: field:account.invoice.refund,date:0
-msgid "Operation date"
-msgstr "Fecha operación"
-
-#. module: account
-#: field:account.tax,ref_tax_code_id:0
-#: field:account.tax.template,ref_tax_code_id:0
-msgid "Refund Tax Code"
-msgstr "Código impuesto reintegro"
-
-#. module: account
-#: view:validate.account.move:0
-msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."
-msgstr "Todas las polizas borrador de este diario y periodo serán validados. Esto significa que ya no podrá modificar sus campos contables."
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Account Balance -"
-msgstr "Balance cuenta -"
-
-#. module: account
-#: code:addons/account/invoice.py:997
-#, python-format
-msgid "Invoice "
-msgstr "Factura "
-
-#. module: account
-#: field:account.automatic.reconcile,date1:0
-msgid "Starting Date"
-msgstr "Fecha inicial"
-
-#. module: account
-#: field:account.chart.template,property_account_income:0
-msgid "Income Account on Product Template"
-msgstr "Cuenta de ingresos en plantilla producto"
-
-#. module: account
-#: help:res.partner,last_reconciliation_date:0
-msgid "Date on which the partner accounting entries were reconciled last time"
-msgstr "Fecha en que las polizas contables de la empresa fueron conciliadas por última vez."
-
-#. module: account
-#: field:account.fiscalyear.close,fy2_id:0
-msgid "New Fiscal Year"
-msgstr "Nuevo ejercicio fiscal"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.tax.template:0
-#: selection:account.vat.declaration,based_on:0
-#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
-#: model:ir.actions.act_window,name:account.action_invoice_tree
-#: model:ir.actions.report.xml,name:account.account_invoices
-#: view:report.invoice.created:0
-#: field:res.partner,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: account
-#: code:addons/account/invoice.py:812
-#, python-format
-msgid "Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
-msgstr "¡Compruebe el importe de la factura!\n"
-"El total real no concuerda con el total calculado."
-
-#. module: account
-#: view:account.invoice:0
-#: field:account.invoice,user_id:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,user_id:0
-msgid "Salesman"
-msgstr "Comercial"
-
-#. module: account
-#: view:account.invoice.report:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: account
-#: view:account.use.model:0
-msgid "Use Model"
-msgstr "Usar modelo"
-
-#. module: account
-#: view:account.state.open:0
-msgid "No"
-msgstr "No"
-
-#. module: account
-#: help:account.invoice.tax,tax_code_id:0
-msgid "The tax basis of the tax declaration."
-msgstr "La base del impuesto de la declaración de impuestos."
-
-#. module: account
-#: view:account.addtmpl.wizard:0
-msgid "Add"
-msgstr "Añadir"
-
-#. module: account
-#: help:account.invoice,date_invoice:0
-msgid "Keep empty to use the current date"
-msgstr "Dejarlo vacío para utilizar la fecha actual."
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
-
-#. module: account
-#: view:account.period.close:0
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#. module: account
-#: help:account.move.line,statement_id:0
-msgid "The bank statement used for bank reconciliation"
-msgstr "El extracto bancario utilizado para la conciliación bancaria"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
-msgid "Draft invoices are validated. "
-msgstr "Facturas borrador son validadas. "
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.subscription:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: account
-#: field:account.tax,type_tax_use:0
-msgid "Tax Application"
-msgstr "Aplicación impuesto"
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: code:addons/account/wizard/account_move_journal.py:153
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
-#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
-#: model:ir.actions.act_window,name:account.act_account_partner_account_move
-#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.actions.act_window,name:account.action_account_moves_all_a
-#: model:ir.actions.act_window,name:account.action_account_moves_bank
-#: model:ir.actions.act_window,name:account.action_account_moves_purchase
-#: model:ir.actions.act_window,name:account.action_account_moves_sale
-#: model:ir.actions.act_window,name:account.action_move_line_search
-#: model:ir.actions.act_window,name:account.action_move_line_select
-#: model:ir.actions.act_window,name:account.action_move_line_tree1
-#: model:ir.actions.act_window,name:account.action_tax_code_line_open
-#: model:ir.model,name:account.model_account_move_line
-#: model:ir.ui.menu,name:account.menu_action_account_moves_all
-#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
-#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
-#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
-#, python-format
-msgid "Journal Items"
-msgstr "Journal Items"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance de situación (cuentas de activos)"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Third Party (Country)"
-msgstr "Tercera parte (país)"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
-msgstr "Con notas de credito de proveedor puede gestionar las facturas de abono que recibe de sus proveedores. Una nota de credito es un documento que abona una factura total o parcialmente. Puede fácilmente generar notas de credito y conciliarlas directamente desde el formulario de factura."
-
-#. module: account
-#: field:account.analytic.Journal.report,date2:0
-#: field:account.analytic.balance,date2:0
-#: field:account.analytic.cost.ledger,date2:0
-#: field:account.analytic.cost.ledger.journal.report,date2:0
-#: field:account.analytic.inverted.balance,date2:0
-msgid "End of period"
-msgstr "Fin del período"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Detalles del banco"
-
-#. module: account
-#: code:addons/account/invoice.py:728
-#, python-format
-msgid "Taxes missing !"
-msgstr "¡Faltan impuestos!"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
-msgid "To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount."
-msgstr "Para imprimir un diario analítico (o costes) para un periodo determinado. En el informe se lista el código, el nombre de movimiento, número de cuenta, el importe general y el importe analítico."
-
-#. module: account
-#: help:account.journal,refund_journal:0
-msgid "Fill this if the journal is to be used for refunds of invoices."
-msgstr "Marque esta opción si el diario se utilizará para notas de credito (abonos)."
-
-#. module: account
-#: view:account.fiscalyear.close:0
-msgid "Generate Fiscal Year Opening Entries"
-msgstr "Generar polizas de apertura ejercicio fiscal"
-
-#. module: account
-#: field:account.journal,group_invoice_lines:0
-msgid "Group Invoice Lines"
-msgstr "Agrupar líneas de factura"
-
-#. module: account
-#: view:account.invoice.cancel:0
-#: view:account.invoice.confirm:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: account
-#: field:account.bank.statement.line,move_ids:0
-msgid "Moves"
-msgstr "Movimientos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_vat_declaration
-#: model:ir.model,name:account.model_account_vat_declaration
-msgid "Account Vat Declaration"
-msgstr "Contabilidad. Declaración IVA"
-
-#. module: account
-#: view:account.period:0
-msgid "To Close"
-msgstr "Para cerrar"
-
-#. module: account
-#: field:account.journal,allow_date:0
-msgid "Check Date not in the Period"
-msgstr "Comprobar fecha no está en el periodo"
-
-#. module: account
-#: code:addons/account/account.py:1228
-#, python-format
-msgid "You can not modify a posted entry of this journal !\n"
-"You should set the journal to allow cancelling entries if you want to do that."
-msgstr "¡No se puede modificar una poliza asentada de este diario!\n"
-"Debe configurar el diario para permitir la cancelación de las polizas si quiere hacerlo."
-
-#. module: account
-#: model:ir.ui.menu,name:account.account_template_folder
-msgid "Templates"
-msgstr "Plantillas"
-
-#. module: account
-#: field:account.tax,child_ids:0
-msgid "Child Tax Accounts"
-msgstr "Cuentas impuestos hijas"
-
-#. module: account
-#: code:addons/account/account.py:958
-#, python-format
-msgid "Start period should be smaller then End period"
-msgstr "Periodo inicial debería ser más pequeño que el periodo final"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "5"
-msgstr "5"
-
-#. module: account
-#: report:account.analytic.account.balance:0
-msgid "Analytic Balance -"
-msgstr "Balance analítico -"
-
-#. module: account
-#: report:account.account.balance:0
-#: field:account.aged.trial.balance,target_move:0
-#: field:account.balance.report,target_move:0
-#: field:account.bs.report,target_move:0
-#: report:account.central.journal:0
-#: field:account.central.journal,target_move:0
-#: field:account.chart,target_move:0
-#: field:account.common.account.report,target_move:0
-#: field:account.common.journal.report,target_move:0
-#: field:account.common.partner.report,target_move:0
-#: field:account.common.report,target_move:0
-#: report:account.general.journal:0
-#: field:account.general.journal,target_move:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: field:account.move.journal,target_move:0
-#: report:account.partner.balance:0
-#: field:account.partner.balance,target_move:0
-#: field:account.partner.ledger,target_move:0
-#: field:account.pl.report,target_move:0
-#: field:account.print.journal,target_move:0
-#: field:account.report.general.ledger,target_move:0
-#: field:account.tax.chart,target_move:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: field:account.vat.declaration,target_move:0
-msgid "Target Moves"
-msgstr "Movimientos destino"
-
-#. module: account
-#: field:account.subscription,period_type:0
-msgid "Period Type"
-msgstr "Período: Unidad de tiempo"
-
-#. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
-#: selection:account.vat.declaration,based_on:0
-msgid "Payments"
-msgstr "Pagos"
-
-#. module: account
-#: view:account.tax:0
-msgid "Reverse Compute Code"
-msgstr "Código cálculo inverso"
-
-#. module: account
-#: field:account.subscription.line,move_id:0
-msgid "Entry"
-msgstr "Poliza"
-
-#. module: account
-#: field:account.tax,python_compute_inv:0
-#: field:account.tax.template,python_compute_inv:0
-msgid "Python Code (reverse)"
-msgstr "Código Python (inverso)"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_payment_term_form
-#: model:ir.ui.menu,name:account.menu_action_payment_term_form
-msgid "Payment Terms"
-msgstr "Plazos de pago"
-
-#. module: account
-#: field:account.journal.column,name:0
-msgid "Column Name"
-msgstr "Nombre columna"
-
-#. module: account
-#: view:account.general.journal:0
-msgid "This report gives you an overview of the situation of your general journals"
-msgstr "Este informe proporciona una vista general de la situación de sus diarios"
-
-#. module: account
-#: field:account.entries.report,year:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,year:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,year:0
-#: field:report.account.sales,name:0
-#: field:report.account_type.sales,name:0
-msgid "Year"
-msgstr "Año"
-
-#. module: account
-#: field:account.bank.statement,starting_details_ids:0
-msgid "Opening Cashbox"
-msgstr "Apertura caja"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr "Línea 1:"
-
-#. module: account
-#: code:addons/account/account.py:1185
-#, python-format
-msgid "Integrity Error !"
-msgstr "¡Error de integridad!"
-
-#. module: account
-#: field:account.tax.template,description:0
-msgid "Internal Name"
-msgstr "Nombre interno"
-
-#. module: account
-#: selection:account.subscription,period_type:0
-msgid "month"
-msgstr "mes"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:293
-#, python-format
-msgid "Journal Item \"%s\" is not valid"
-msgstr "Apunte \"%s\" no es válida"
-
-#. module: account
-#: view:account.payment.term:0
-msgid "Description on invoices"
-msgstr "Descripción en facturas"
-
-#. module: account
-#: field:account.partner.reconcile.process,next_partner_id:0
-msgid "Next Partner to Reconcile"
-msgstr "Próxima empresa a conciliar"
-
-#. module: account
-#: field:account.invoice.tax,account_id:0
-#: field:account.move.line,tax_code_id:0
-msgid "Tax Account"
-msgstr "Cuenta impuesto"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-msgid "Reconciliation Result"
-msgstr "Resultado de conciliación"
-
-#. module: account
-#: view:account.bs.report:0
-#: model:ir.actions.act_window,name:account.action_account_bs_report
-#: model:ir.ui.menu,name:account.menu_account_bs_report
-msgid "Balance Sheet"
-msgstr "Balance de situación"
-
-#. module: account
-#: model:ir.ui.menu,name:account.final_accounting_reports
-msgid "Accounting Reports"
-msgstr "Informes contables"
-
-#. module: account
-#: field:account.move,line_id:0
-#: view:analytic.entries.report:0
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
-#: model:ir.actions.act_window,name:account.action_move_line_form
-msgid "Entries"
-msgstr "Polizas"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "This Period"
-msgstr "Este periodo"
-
-#. module: account
-#: field:account.analytic.line,product_uom_id:0
-#: field:account.move.line,product_uom_id:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:138
-#, python-format
-msgid "No Period found on Invoice!"
-msgstr "No se encontro un período en la factura"
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Compute Code (if type=code)"
-msgstr "Código para calcular (si tipo=código)"
-
-#. module: account
-#: selection:account.analytic.journal,type:0
-#: view:account.journal:0
-#: selection:account.journal,type:0
-#: view:account.model:0
-#: selection:account.tax,type_tax_use:0
-#: view:account.tax.template:0
-#: selection:account.tax.template,type_tax_use:0
-msgid "Sale"
-msgstr "Venta"
-
-#. module: account
-#: view:account.analytic.line:0
-#: field:account.bank.statement.line,amount:0
-#: report:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: view:account.move:0
-#: field:account.move,amount:0
-#: view:account.move.line:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,amount:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:41
-#, python-format
-msgid "End of Fiscal Year Entry"
-msgstr "Poliza fin de ejercicio fiscal"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_customerinvoice0
-#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
-#: model:process.transition,name:account.process_transition_statemententries0
-#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
-#: model:process.transition,name:account.process_transition_suppliervalidentries0
-#: model:process.transition,name:account.process_transition_validentries0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: account
-#: help:account.invoice,reconciled:0
-msgid "The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."
-msgstr "La poliza de la factura ha sido totalmente conciliada con una o varias polizas de pago."
-
-#. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
-msgid "Tax on Children"
-msgstr "Impuesto en hijos"
-
-#. module: account
-#: code:addons/account/account.py:2119
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "No period found !"
-msgstr "¡No se ha encontrado período!"
-
-#. module: account
-#: field:account.journal,update_posted:0
-msgid "Allow Cancelling Entries"
-msgstr "Permitir cancelación de polizas"
-
-#. module: account
-#: field:account.tax.code,sign:0
-msgid "Coefficent for parent"
-msgstr "Coeficiente para padre"
-
-#. module: account
-#: report:account.partner.balance:0
-msgid "(Account/Partner) Name"
-msgstr "Nombre de Cuenta/Empresa"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Transaction"
-msgstr "Transacción"
-
-#. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
-#: help:account.tax.template,base_code_id:0
-#: help:account.tax.template,ref_base_code_id:0
-#: help:account.tax.template,ref_tax_code_id:0
-#: help:account.tax.template,tax_code_id:0
-msgid "Use this code for the VAT declaration."
-msgstr "Utilice este código para la declaración del IVA."
-
-#. module: account
-#: view:account.move.line:0
-msgid "Debit/Credit"
-msgstr "Debe/Haber"
-
-#. module: account
-#: view:report.hr.timesheet.invoice.journal:0
-msgid "Analytic Entries Stats"
-msgstr "Estadística de polizas analíticas"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
-msgid "Tax Code Templates"
-msgstr "Plantillas códigos de impuestos"
-
-#. module: account
-#: model:ir.model,name:account.model_account_installer
-msgid "account.installer"
-msgstr "account.instalador"
-
-#. module: account
-#: field:account.tax.template,include_base_amount:0
-msgid "Include in Base Amount"
-msgstr "Incluir en importe base"
-
-#. module: account
-#: help:account.payment.term.line,days:0
-msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
-msgstr "Número de días a añadir antes del cálculo del día de mes. Si fecha=15/01, Número de días=22, Día de mes=-1, entonces la fecha de vencimiento es 28/02."
-
-#. module: account
-#: code:addons/account/account.py:2978
-#: code:addons/account/installer.py:283
-#: code:addons/account/installer.py:295
-#, python-format
-msgid "Bank Journal "
-msgstr "Diario bancario "
-
-#. module: account
-#: view:account.journal:0
-msgid "Entry Controls"
-msgstr "Controles de poliza"
-
-#. module: account
-#: view:account.analytic.chart:0
-#: view:project.account.analytic.line:0
-msgid "(Keep empty to open the current situation)"
-msgstr "(dejarlo vacío para abrir la situación actual)"
-
-#. module: account
-#: field:account.analytic.Journal.report,date1:0
-#: field:account.analytic.balance,date1:0
-#: field:account.analytic.cost.ledger,date1:0
-#: field:account.analytic.cost.ledger.journal.report,date1:0
-#: field:account.analytic.inverted.balance,date1:0
-msgid "Start of period"
-msgstr "Inicio del período"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1202
-#, python-format
-msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
-msgstr "¡No puede hacer esta modificación en una poliza conciliada! ¡Observe que sólo puede cambiar algunos campos no importantes!"
-
-#. module: account
-#: model:ir.model,name:account.model_account_common_account_report
-msgid "Account Common Account Report"
-msgstr "Contabilidad. Informe contable común"
-
-#. module: account
-#: field:account.bank.statement.line,name:0
-msgid "Communication"
-msgstr "Comunicación"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_analytic_accounting
-msgid "Analytic Accounting"
-msgstr "Contabilidad analítica"
-
-#. module: account
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: selection:report.invoice.created,type:0
-msgid "Customer Refund"
-msgstr "Nota de credito de cliente"
-
-#. module: account
-#: view:account.account:0
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
-msgid "Default Taxes"
-msgstr "Impuestos por defecto"
-
-#. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
-#: field:account.tax.template,ref_tax_sign:0
-#: field:account.tax.template,tax_sign:0
-msgid "Tax Code Sign"
-msgstr "Signo código impuesto"
-
-#. module: account
-#: model:ir.model,name:account.model_report_invoice_created
-msgid "Report of Invoices Created within Last 15 days"
-msgstr "Informe de facturas creadas en los últimos 15 días"
-
-#. module: account
-#: field:account.fiscalyear,end_journal_period_id:0
-msgid "End of Year Entries Journal"
-msgstr "Diario de polizas cierre del ejercicio"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:408
-#: code:addons/account/invoice.py:508
-#: code:addons/account/invoice.py:523
-#: code:addons/account/invoice.py:531
-#: code:addons/account/invoice.py:552
-#: code:addons/account/invoice.py:1361
-#: code:addons/account/wizard/account_move_journal.py:63
-#, python-format
-msgid "Configuration Error !"
-msgstr "¡Error de configuración!"
-
-#. module: account
-#: help:account.partner.reconcile.process,to_reconcile:0
-msgid "This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled."
-msgstr "Estos son las empresas restantes a las que debería comprobar si hay algo para conciliar o no. Esta cifra ya contabiliza la empresa actual como conciliada."
-
-#. module: account
-#: view:account.subscription.line:0
-msgid "Subscription lines"
-msgstr "Líneas de las polizas periódicos"
-
-#. module: account
-#: field:account.entries.report,quantity:0
-msgid "Products Quantity"
-msgstr "Cantidad de productos"
-
-#. module: account
-#: view:account.entries.report:0
-#: selection:account.entries.report,move_state:0
-#: view:account.move:0
-#: selection:account.move,state:0
-#: view:account.move.line:0
-msgid "Unposted"
-msgstr "No asentado"
-
-#. module: account
-#: view:account.change.currency:0
-#: model:ir.actions.act_window,name:account.action_account_change_currency
-#: model:ir.model,name:account.model_account_change_currency
-msgid "Change Currency"
-msgstr "Cambiar moneda"
-
-#. module: account
-#: model:process.node,note:account.process_node_accountingentries0
-#: model:process.node,note:account.process_node_supplieraccountingentries0
-msgid "Accounting entries."
-msgstr "Polizas contables."
-
-#. module: account
-#: view:account.invoice:0
-msgid "Payment Date"
-msgstr "Fecha de pago"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "6"
-msgstr "6"
-
-#. module: account
-#: view:account.analytic.account:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
-#: model:ir.actions.act_window,name:account.action_analytic_open
-#: model:ir.ui.menu,name:account.account_analytic_def_account
-msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
-
-#. module: account
-#: help:account.account.type,report_type:0
-msgid "According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"
-msgstr "Según el valor relacionado las cuentas se mostrarán en sus respectivos informes (Balance de situación contable pérdidas y ganancias)."
-
-#. module: account
-#: field:account.report.general.ledger,sortby:0
-msgid "Sort By"
-msgstr "Ordenar por"
-
-#. module: account
-#: code:addons/account/account.py:1346
-#, python-format
-msgid "There is no default default credit account defined \n"
-"on journal \"%s\""
-msgstr "No se ha definido una cuenta haber por defecto \n"
-"en el diario \"%s\""
-
-#. module: account
-#: field:account.entries.report,amount_currency:0
-#: field:account.model.line,amount_currency:0
-#: field:account.move.line,amount_currency:0
-msgid "Amount Currency"
-msgstr "Importe divisa"
-
-#. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:39
-#, python-format
-msgid "Specified Journal does not have any account move entries in draft state for this period"
-msgstr "El diario indicado no tiene polizas contables en estado borrador para este período"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_move_line
-msgid "Lines to reconcile"
-msgstr "Líneas a conciliar"
-
-#. module: account
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.inverted.balance:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: report:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
-#: field:account.move.line,quantity:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,unit_amount:0
-#: field:report.account.sales,quantity:0
-#: field:report.account_type.sales,quantity:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Number (Move)"
-msgstr "Número (movimiento)"
-
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Refund Invoice Options"
-msgstr "Opciones Nota de credito (abono)"
-
-#. module: account
-#: help:account.automatic.reconcile,power:0
-msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation"
-msgstr "La potencia de la conciliación automática a seleccionar es el número de los importes parciales que se pueden combinar para encontrar un saldo a cero."
-
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
-msgstr "El campo secuencia es usado para ordenar las líneas de plazos de pago en orden ascendente."
-
-#. module: account
-#: view:account.fiscal.position.template:0
-#: field:account.fiscal.position.template,name:0
-msgid "Fiscal Position Template"
-msgstr "Plantilla de posición fiscal"
-
-#. module: account
-#: view:account.analytic.chart:0
-#: view:account.chart:0
-#: view:account.tax.chart:0
-msgid "Open Charts"
-msgstr "Abrir plan contable"
-
-#. module: account
-#: view:account.fiscalyear.close.state:0
-msgid "If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "
-msgstr "Si no debe introducir más polizas en un ejercicio fiscal, lo puede cerrar desde aquí. Se cerrarán todos los períodos abiertos en este ejercicio que hará imposible introducir ningúna poliza nueva. Cierre un ejercicio fiscal cuando necesite finalizar los resultados de fin de ejercicio definitivamente. "
-
-#. module: account
-#: field:account.central.journal,amount_currency:0
-#: field:account.common.journal.report,amount_currency:0
-#: field:account.general.journal,amount_currency:0
-#: field:account.partner.ledger,amount_currency:0
-#: field:account.print.journal,amount_currency:0
-#: field:account.report.general.ledger,amount_currency:0
-msgid "With Currency"
-msgstr "Con divisa"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Open CashBox"
-msgstr "Abrir caja"
-
-#. module: account
-#: view:account.move.line.reconcile:0
-msgid "Reconcile With Write-Off"
-msgstr "Conciliación con desfase"
-
-#. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Valid Up to"
-msgstr "Válido hasta"
-
-#. module: account
-#: view:board.board:0
-msgid "Aged Receivables"
-msgstr "A cobrar vencidos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
-msgid "Account Automatic Reconcile"
-msgstr "Contabilidad. Conciliación automática"
-
-#. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Journal Item"
-msgstr "Apunte contable"
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_journal
-msgid "Move journal"
-msgstr "Diario movimientos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
-#: model:ir.ui.menu,name:account.menu_wizard_fy_close
-msgid "Generate Opening Entries"
-msgstr "Generar polizas de apertura"
-
-#. module: account
-#: code:addons/account/account_move_line.py:732
-#, python-format
-msgid "Already Reconciled!"
-msgstr "¡Ya está conciliado!"
-
-#. module: account
-#: help:account.tax,type:0
-msgid "The computation method for the tax amount."
-msgstr "El método de cálculo del importe del impuesto."
-
-#. module: account
-#: help:account.installer.modules,account_anglo_saxon:0
-msgid "This module will support the Anglo-Saxons accounting methodology by changing the accounting logic with stock transactions."
-msgstr "Este módulo soporta la metodología contable anglosajón, cambiando la lógica contable en las transacciones de stock."
-
-#. module: account
-#: field:report.invoice.created,create_date:0
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-#. module: account
-#: view:account.analytic.journal:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
-#: model:ir.ui.menu,name:account.account_def_analytic_journal
-msgid "Analytic Journals"
-msgstr "Diarios analíticos"
-
-#. module: account
-#: field:account.account,child_id:0
-msgid "Child Accounts"
-msgstr "Cuentas hijas"
-
-#. module: account
-#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:824
-#, python-format
-msgid "Write-Off"
-msgstr "Desajuste"
-
-#. module: account
-#: field:res.partner,debit:0
-msgid "Total Payable"
-msgstr "Total a pagar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
-msgid "account.analytic.line.extended"
-msgstr "account.analytic.line.extended"
-
-#. module: account
-#: selection:account.bank.statement.line,type:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:322
-#, python-format
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: account
-#: view:account.account.template:0
-msgid "Account Template"
-msgstr "Plantilla de cuenta"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-msgid "Account n°"
-msgstr "Cuenta n°"
-
-#. module: account
-#: help:account.installer.modules,account_payment:0
-msgid "Streamlines invoice payment and creates hooks to plug automated payment systems in."
-msgstr "Agiliza el pago de facturas y crea interfaces para conectar sistemas de pago automatizados."
-
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr "Valoración"
-
-#. module: account
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:306
-#, python-format
-msgid "Receivable and Payable Accounts"
-msgstr "Cuentas a cobrar y pagar"
-
-#. module: account
-#: field:account.fiscal.position.account.template,position_id:0
-msgid "Fiscal Mapping"
-msgstr "Mapeo fiscal"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_state_open
-#: model:ir.model,name:account.model_account_state_open
-msgid "Account State Open"
-msgstr "Contabilidad. Abrir estado"
-
-#. module: account
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "Max Qty:"
-msgstr "Ctdad máx."
-
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Refund Invoice"
-msgstr "Reintegrar factura"
-
-#. module: account
-#: field:account.invoice,address_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_entries_report_all
-msgid "From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool."
-msgstr "Desde esta vista obtiene un análisis de sus distintas cuentas financieras. El documento muestra el debe y haber teniendo en consideración algún criterio que puede seleccionar usando la herramienta de búsqueda."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_list
-msgid "The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes."
-msgstr "La definición de los códigos de impuestos depende de la declaración de impuestos de su país. OpenERP le permite definir y gestionar la estructura de impuestos desde este menú. Puede definir códigos tanto numéricos como alfanuméricos."
-
-#. module: account
-#: help:account.partner.reconcile.process,progress:0
-msgid "Shows you the progress made today on the reconciliation process. Given by \n"
-"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
-msgstr "Le muestra el progreso realizado hoy en el proceso de conciliación. Indica:\n"
-"Empresas conciliadas hoy / (Empresas restantes + Empresas conciliadas hoy)"
-
-#. module: account
-#: help:account.payment.term.line,value:0
-msgid "Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."
-msgstr "Seleccione aquí el tipo de valoración relacionada con esta línea de plazo de pago. Tenga en cuenta que debe tener la última línea con el tipo 'Saldo' para garantizar que el importe total sea procesado."
-
-#. module: account
-#: field:account.invoice,period_id:0
-#: field:account.invoice.report,period_id:0
-#: field:report.account.sales,period_id:0
-#: field:report.account_type.sales,period_id:0
-msgid "Force Period"
-msgstr "Forzar período"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,nbr:0
-msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:59
-#, python-format
-msgid "New currency is not confirured properly !"
-msgstr "¡La nueva moneda no está configurada correctamente!"
-
-#. module: account
-#: field:account.aged.trial.balance,filter:0
-#: field:account.balance.report,filter:0
-#: field:account.bs.report,filter:0
-#: field:account.central.journal,filter:0
-#: field:account.common.account.report,filter:0
-#: field:account.common.journal.report,filter:0
-#: field:account.common.partner.report,filter:0
-#: field:account.common.report,filter:0
-#: field:account.general.journal,filter:0
-#: field:account.partner.balance,filter:0
-#: field:account.partner.ledger,filter:0
-#: field:account.pl.report,filter:0
-#: field:account.print.journal,filter:0
-#: field:account.report.general.ledger,filter:0
-#: field:account.vat.declaration,filter:0
-msgid "Filter by"
-msgstr "Filtrar por"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1140
-#: code:addons/account/account_move_line.py:1223
-#, python-format
-msgid "You can not use an inactive account!"
-msgstr "¡No puede utilizar una cuenta inactiva!"
-
-#. module: account
-#: code:addons/account/account_move_line.py:797
-#, python-format
-msgid "Entries are not of the same account or already reconciled ! "
-msgstr "¡Las polizas no son de la misma cuenta o ya están conciliadas! "
-
-#. module: account
-#: field:account.tax,account_collected_id:0
-#: field:account.tax.template,account_collected_id:0
-msgid "Invoice Tax Account"
-msgstr "Cuenta impuestos de facturas"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_general_journal
-#: model:ir.model,name:account.model_account_general_journal
-msgid "Account General Journal"
-msgstr "Contabilidad. Diario general"
-
-#. module: account
-#: code:addons/account/report/common_report_header.py:100
-#, python-format
-msgid "No Filter"
-msgstr "Sin filtro"
-
-#. module: account
-#: field:account.payment.term.line,days:0
-msgid "Number of Days"
-msgstr "Número de días"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "7"
-msgstr "7"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:373
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:102
-#, python-format
-msgid "Period: %s"
-msgstr "Período: %s"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Template Tax Fiscal Position"
-msgstr "Plantilla posición fiscal impuesto"
-
-#. module: account
-#: help:account.tax,name:0
-msgid "This name will be displayed on reports"
-msgstr "Este nombre se mostrará en los informes"
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "Printing date"
-msgstr "Fecha impresión"
-
-#. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
-msgid "None"
-msgstr "Ninguno"
-
-#. module: account
-#: view:analytic.entries.report:0
-msgid "  365 Days  "
-msgstr "  365 Días  "
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree3
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
-msgid "Customer Refunds"
-msgstr "Notas de credito de cliente"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Amount Computation"
-msgstr "Calculo importe"
-
-#. module: account
-#: field:account.journal.period,name:0
-msgid "Journal-Period Name"
-msgstr "Nombre diario-período"
-
-#. module: account
-#: field:account.invoice.tax,factor_base:0
-msgid "Multipication factor for Base code"
-msgstr "Factor de multiplicación para código base"
-
-#. module: account
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "not implemented"
-msgstr "no implementado"
-
-#. module: account
-#: help:account.journal,company_id:0
-msgid "Company related to this journal"
-msgstr "Compañía relacionada con este diario"
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_state.py:44
-#, python-format
-msgid "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"
-msgstr "¡La(s) factura(s) seleccionada(s) no se puede confirmar ya que no está en estado 'Borrador' o 'Pro-forma'!"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Fiscal Position Remark :"
-msgstr "Observación posición fiscal :"
-
-#. module: account
-#: view:analytic.entries.report:0
-#: model:ir.actions.act_window,name:account.action_analytic_entries_report
-#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
-msgid "Analytic Entries Analysis"
-msgstr "Análisis de polizas analíticas"
-
-#. module: account
-#: selection:account.aged.trial.balance,direction_selection:0
-msgid "Past"
-msgstr "Anterior"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Analytic Entry"
-msgstr "Poliza analítica"
-
-#. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
-msgid "Overdue Payments Message"
-msgstr "Mensaje pagos vencidos"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_all_a
-msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"."
-msgstr "Esta vista puede ser utilizada por los contadores para registrar polizas rápidamente en OpenERP. Si desea registrar una factura de proveedor, comience registrando la linea de la cuenta de gastos. OpenERP le propondrá automáticamente el impuesto asociado a esta cuenta y la \"cuenta a pagar\" de contrapartida."
-
-#. module: account
-#: field:account.entries.report,date_created:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: account
-#: field:account.payment.term.line,value_amount:0
-msgid "Value Amount"
-msgstr "Valor importe"
-
-#. module: account
-#: help:account.journal,code:0
-msgid "The code will be used to generate the numbers of the journal entries of this journal."
-msgstr "El código se usará para generar los números de las polizas de este diario."
-
-#. module: account
-#: view:account.invoice:0
-msgid "(keep empty to use the current period)"
-msgstr "(vacío para período actual)"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
-msgid "As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system."
-msgstr "Tan pronto como la conciliación se ha realizado, el estado de la factura se convierte en \"Realizada\" (es decir, pagada) en el sistema."
-
-#. module: account
-#: code:addons/account/invoice.py:997
-#, python-format
-msgid "is validated."
-msgstr "está validada."
-
-#. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,account_root_id:0
-msgid "Root Account"
-msgstr "Cuenta principal"
-
-#. module: account
-#: field:res.partner,last_reconciliation_date:0
-msgid "Latest Reconciliation Date"
-msgstr "Fecha última conciliación"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_line
-msgid "Analytic Line"
-msgstr "Línea analítica"
-
-#. module: account
-#: field:product.template,taxes_id:0
-msgid "Customer Taxes"
-msgstr "Impuestos cliente"
-
-#. module: account
-#: view:account.addtmpl.wizard:0
-msgid "Create an Account Based on this Template"
-msgstr "Crear una cuenta basada en esta plantilla"
-
-#. module: account
-#: view:account.account.type:0
-#: view:account.tax.code:0
-msgid "Reporting Configuration"
-msgstr "Configuración informes"
-
-#. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
-msgid "Tax Type"
-msgstr "Tipo impuesto"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_template_form
-msgid "Account Templates"
-msgstr "Plantillas de cuentas"
-
-#. module: account
-#: report:account.vat.declaration:0
-msgid "Tax Statement"
-msgstr "Declaración de impuestos"
-
-#. module: account
-#: model:ir.model,name:account.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: account
-#: code:addons/account/account.py:546
-#, python-format
-msgid "You cannot modify Company of account as its related record exist in Entry Lines"
-msgstr "No puede modificar la compañía de la cuenta porqué ya hay apuntes con esta cuenta"
-
-#. module: account
-#: help:account.fiscalyear.close.state,fy_id:0
-msgid "Select a fiscal year to close"
-msgstr "Seleccionar un ejercicio fiscal a cerrar."
-
-#. module: account
-#: help:account.chart.template,tax_template_ids:0
-msgid "List of all the taxes that have to be installed by the wizard"
-msgstr "Lista de todos los impuestos que deben ser instalados por el asistente"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_intracom
-msgid "IntraCom"
-msgstr "IntraCom"
-
-#. module: account
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Information addendum"
-msgstr "Información adicional"
-
-#. module: account
-#: field:account.aged.trial.balance,fiscalyear_id:0
-#: field:account.balance.report,fiscalyear_id:0
-#: field:account.bs.report,fiscalyear_id:0
-#: field:account.central.journal,fiscalyear_id:0
-#: field:account.chart,fiscalyear:0
-#: field:account.common.account.report,fiscalyear_id:0
-#: field:account.common.journal.report,fiscalyear_id:0
-#: field:account.common.partner.report,fiscalyear_id:0
-#: field:account.common.report,fiscalyear_id:0
-#: field:account.general.journal,fiscalyear_id:0
-#: field:account.partner.balance,fiscalyear_id:0
-#: field:account.partner.ledger,fiscalyear_id:0
-#: field:account.pl.report,fiscalyear_id:0
-#: field:account.print.journal,fiscalyear_id:0
-#: field:account.report.general.ledger,fiscalyear_id:0
-#: field:account.vat.declaration,fiscalyear_id:0
-msgid "Fiscal year"
-msgstr "Ejercicio fiscal"
-
-#. module: account
-#: view:account.move.reconcile:0
-msgid "Partial Reconcile Entries"
-msgstr "Polizas parcialmente conciliadas"
-
-#. module: account
-#: view:account.addtmpl.wizard:0
-#: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
-#: view:account.analytic.balance:0
-#: view:account.analytic.chart:0
-#: view:account.analytic.cost.ledger:0
-#: view:account.analytic.cost.ledger.journal.report:0
-#: view:account.analytic.inverted.balance:0
-#: view:account.automatic.reconcile:0
-#: view:account.bank.statement:0
-#: view:account.change.currency:0
-#: view:account.chart:0
-#: view:account.common.report:0
-#: view:account.fiscalyear.close:0
-#: view:account.fiscalyear.close.state:0
-#: view:account.invoice:0
-#: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
-#: view:account.journal.select:0
-#: view:account.move:0
-#: view:account.move.bank.reconcile:0
-#: view:account.move.line.reconcile:0
-#: view:account.move.line.reconcile.select:0
-#: view:account.move.line.reconcile.writeoff:0
-#: view:account.move.line.unreconcile.select:0
-#: view:account.open.closed.fiscalyear:0
-#: view:account.partner.reconcile.process:0
-#: view:account.period.close:0
-#: view:account.subscription.generate:0
-#: view:account.tax.chart:0
-#: view:account.unreconcile:0
-#: view:account.unreconcile.reconcile:0
-#: view:account.use.model:0
-#: view:account.vat.declaration:0
-#: code:addons/account/wizard/account_move_journal.py:105
-#: view:project.account.analytic.line:0
-#: view:validate.account.move:0
-#: view:validate.account.move.lines:0
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account
-#: field:account.account.type,name:0
-msgid "Acc. Type Name"
-msgstr "Nombre tipo cuenta"
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.entries.report,type:0
-msgid "Receivable"
-msgstr "A cobrar"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: account
-#: field:account.journal,default_credit_account_id:0
-msgid "Default Credit Account"
-msgstr "Cuenta haber por defecto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Configure Your Accounting Chart"
-msgstr "Configure su plan contable"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  number of days: 30"
-msgstr "  número de días: 30"
-
-#. module: account
-#: help:account.analytic.line,currency_id:0
-msgid "The related account currency if not equal to the company one."
-msgstr "La moneda contable relacionada si no es igual a la de la compañía."
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "CashBox"
-msgstr "Caja"
-
-#. module: account
-#: selection:account.tax,type:0
-msgid "Percentage"
-msgstr "Porcentaje"
-
-#. module: account
-#: selection:account.report.general.ledger,sortby:0
-msgid "Journal & Partner"
-msgstr "Diario y Empresa"
-
-#. module: account
-#: field:account.automatic.reconcile,power:0
-msgid "Power"
-msgstr "Fuerza"
-
-#. module: account
-#: field:account.invoice.refund,filter_refund:0
-msgid "Refund Type"
-msgstr "Tipo abono"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: account
-#: view:project.account.analytic.line:0
-msgid "View Account Analytic Lines"
-msgstr "Ver líneas contables analíticas"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Liability Accounts)"
-msgstr "Balance de situación (cuentas de riesgos)"
-
-#. module: account
-#: field:account.invoice,internal_number:0
-#: field:report.invoice.created,number:0
-msgid "Invoice Number"
-msgstr "Número factura"
-
-#. module: account
-#: help:account.tax,include_base_amount:0
-msgid "Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"
-msgstr "Indica si el importe del impuesto debe ser incluido en el importe base para el cálculo de los siguientes impuestos."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
-msgid "Reconciliation: Go to Next Partner"
-msgstr "Conciliación: Ir a siguiente empresa"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
-#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
-msgid "Inverted Analytic Balance"
-msgstr "Saldo analítico invertido"
-
-#. module: account
-#: field:account.tax.template,applicable_type:0
-msgid "Applicable Type"
-msgstr "Tipo aplicable"
-
-#. module: account
-#: field:account.invoice,reference:0
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
-msgstr "Referencia factura"
-
-#. module: account
-#: help:account.tax.template,sequence:0
-msgid "The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."
-msgstr "El campo secuencia es usado para ordenar las líneas de impuestos de menor a mayor secuencia. El orden es importante si tiene un impuesto que tiene varios impuesto hijos. En este caso, el orden de evaluación es importante."
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: view:account.journal:0
-msgid "Liquidity"
-msgstr "Liquidez"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
-#: model:ir.ui.menu,name:account.account_analytic_journal_entries
-msgid "Analytic Journal Items"
-msgstr "Apuntes analíticos"
-
-#. module: account
-#: view:account.fiscalyear.close:0
-msgid "This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."
-msgstr "Este asistente generará las polizas de fin de ejercicio para el ejercicio fiscal seleccionado. Tenga en cuenta que puede ejecutar este asistente varias veces para el mismo ejercicio fiscal: simplemente se sustituyen las polizas de apertura viejos por los nuevos."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
-msgid "Bank and Cash"
-msgstr "Banco y caja"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_analytic_entries_report
-msgid "From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system."
-msgstr "Desde esta vista, dispone de un análisis de los distintos polizas analíticos de la cuenta analítica que ha definido para ajustarse a sus necesidades del negocio. Utilice la herramienta de búsqueda para analizar la información sobre las polizas analíticos generados en el sistema."
-
-#. module: account
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr "¡El nombre del diaro debe ser único por compañía!"
-
-#. module: account
-#: field:account.account.template,nocreate:0
-msgid "Optional create"
-msgstr "Crear opcional"
-
-#. module: account
-#: code:addons/account/invoice.py:409
-#: code:addons/account/invoice.py:509
-#: code:addons/account/invoice.py:1362
-#, python-format
-msgid "Can not find account chart for this company, Please Create account."
-msgstr "No se ha encontrado un plan contable para esta compañía. Cree un plan contable."
-
-#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
-#, python-format
-msgid "Enter a Start date !"
-msgstr "¡Introduzca una fecha inicial!"
-
-#. module: account
-#: report:account.invoice:0
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: selection:report.invoice.created,type:0
-msgid "Supplier Refund"
-msgstr "Nota de credito de proveedor"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: account
-#: field:account.bank.statement,move_line_ids:0
-msgid "Entry lines"
-msgstr "Apuntes"
-
-#. module: account
-#: field:account.move.line,centralisation:0
-msgid "Centralisation"
-msgstr "Centralización"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr "Generar su plan contable desde una plantilla de plan contable"
-
-#. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.analytic.account:0
-#: view:account.analytic.journal:0
-#: view:account.analytic.line:0
-#: view:account.bank.statement:0
-#: view:account.chart.template:0
-#: view:account.entries.report:0
-#: view:account.fiscalyear:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: view:account.journal:0
-#: view:account.model:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.subscription:0
-#: view:account.tax.code.template:0
-#: view:analytic.entries.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: account
-#: field:account.journal.column,readonly:0
-msgid "Readonly"
-msgstr "Sólo lectura"
-
-#. module: account
-#: model:ir.model,name:account.model_account_pl_report
-msgid "Account Profit And Loss Report"
-msgstr "Contabilidad. Informe de pérdida y ganancias"
-
-#. module: account
-#: field:account.invoice.line,uos_id:0
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: account
-#: constraint:account.payment.term.line:0
-msgid "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% "
-msgstr "Los porcentajes de una línea de plazo de pago deben estar entre 0 y 1. Por ejemplo: 0.02 para 2% "
-
-#. module: account
-#: model:ir.model,name:account.model_account_sequence_fiscalyear
-msgid "account.sequence.fiscalyear"
-msgstr "contabilidad.secuencia.ejerciciofiscal"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
-#: field:account.journal,analytic_journal_id:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal
-#: model:ir.actions.report.xml,name:account.analytic_journal_print
-#: model:ir.model,name:account.model_account_analytic_journal
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "Reconciled"
-msgstr "Conciliado"
-
-#. module: account
-#: report:account.invoice:0
-#: field:account.invoice.tax,base:0
-msgid "Base"
-msgstr "Base"
-
-#. module: account
-#: field:account.model,name:0
-msgid "Model Name"
-msgstr "Nombre modelo"
-
-#. module: account
-#: field:account.chart.template,property_account_expense_categ:0
-msgid "Expense Category Account"
-msgstr "Cuenta categoría gastos"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Cash Transactions"
-msgstr "Transacciones de caja"
-
-#. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled"
-msgstr "La factura ya está conciliada"
-
-#. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
-#: field:account.invoice.line,note:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: account
-#: model:ir.model,name:account.model_analytic_entries_report
-msgid "Analytic Entries Statistics"
-msgstr "Estadísticas polizas analíticos"
-
-#. module: account
-#: code:addons/account/account_analytic_line.py:141
-#: code:addons/account/account_move_line.py:900
-#, python-format
-msgid "Entries: "
-msgstr "Polizas: "
-
-#. module: account
-#: view:account.use.model:0
-msgid "Create manual recurring entries in a chosen journal."
-msgstr "Crear polizas recurrentes manuales en un diario seleccionado."
-
-#. module: account
-#: code:addons/account/account.py:1442
-#, python-format
-msgid "Couldn't create move between different companies"
-msgstr "No se ha podido crear movimiento entre diferentes compañías"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_type_form
-msgid "An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company."
-msgstr "Un tipo de cuenta es usado para determinar cómo se utiliza una cuenta en cada diario. El método por defecto de un tipo de cuenta determina el proceso para el cierre anual. Informes como el informe de balance y el de pérdidas y ganancias usan la categoría (perdidas/ganancias o balance). Por ejemplo, el tipo de cuenta puede ser asociado a una cuenta de activos, gastos o pagos. Desde esta vista, puede crear y gestionar los tipos de cuenta necesarios para su compañía."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
-msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system."
-msgstr "La conciliación bancaria consiste en verificar que su extracto bancario corresponde con las entradas (o registros) de esa cuenta en su sistema contable."
-
-#. module: account
-#: model:process.node,note:account.process_node_draftstatement0
-msgid "State is draft"
-msgstr "Estado es borrador"
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1006
-#, python-format
-msgid "Total debit"
-msgstr "Total debit"
-
-#. module: account
-#: code:addons/account/account_move_line.py:775
-#, python-format
-msgid "Entry \"%s\" is not valid !"
-msgstr "¡La poliza \"%s\" no es válida!"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: account
-#: report:account.vat.declaration:0
-#: field:account.vat.declaration,based_on:0
-msgid "Based On"
-msgstr "Basado en"
-
-#. module: account
-#: help:res.partner,property_account_receivable:0
-msgid "This account will be used instead of the default one as the receivable account for the current partner"
-msgstr "Esta cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a cobrar para la empresa actual."
-
-#. module: account
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,applicable_type:0
-#: field:account.tax.template,python_applicable:0
-#: field:account.tax.template,python_compute:0
-#: selection:account.tax.template,type:0
-msgid "Python Code"
-msgstr "Código Python"
-
-#. module: account
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#, python-format
-msgid "Please define the Reserve and Profit/Loss account for current user company !"
-msgstr "¡Defina la cuenta de reservas y pérdidas/ganancias para la compañía del usuario actual!"
-
-#. module: account
-#: help:account.journal,update_posted:0
-msgid "Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"
-msgstr "Marque esta opción si quiere permitir la cancelación de polizas relacionados con este diario o de la factura relacionada con este diario."
-
-#. module: account
-#: view:account.fiscalyear.close:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: account
-#: model:process.transition.action,name:account.process_transition_action_createentries0
-msgid "Create entry"
-msgstr "Crear poliza"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  valuation: percent"
-msgstr "  valoración: porcentaje"
-
-#. module: account
-#: code:addons/account/account.py:509
-#: code:addons/account/account.py:511
-#: code:addons/account/account.py:833
-#: code:addons/account/account.py:919
-#: code:addons/account/account.py:994
-#: code:addons/account/account.py:1222
-#: code:addons/account/account.py:1228
-#: code:addons/account/account.py:2147
-#: code:addons/account/account.py:2395
-#: code:addons/account/account_analytic_line.py:89
-#: code:addons/account/account_analytic_line.py:98
-#: code:addons/account/account_bank_statement.py:292
-#: code:addons/account/account_bank_statement.py:305
-#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:329
-#: code:addons/account/account_cash_statement.py:349
-#: code:addons/account/account_move_line.py:1185
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1202
-#: code:addons/account/invoice.py:793
-#: code:addons/account/invoice.py:823
-#: code:addons/account/invoice.py:1014
-#: code:addons/account/wizard/account_invoice_refund.py:100
-#: code:addons/account/wizard/account_invoice_refund.py:102
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_use_model.py:44
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: account
-#: view:account.vat.declaration:0
-#: model:ir.actions.report.xml,name:account.account_vat_declaration
-#: model:ir.ui.menu,name:account.menu_account_vat_declaration
-msgid "Taxes Report"
-msgstr "Informe impuestos"
-
-#. module: account
-#: selection:account.journal.period,state:0
-msgid "Printed"
-msgstr "Impreso"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Project line"
-msgstr "Línea de proyecto"
-
-#. module: account
-#: field:account.invoice.tax,manual:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-msgid "For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."
-msgstr "Para que una factura se considere pagada, los apuntes contables de la factura deben estar conciliadas con sus contrapartidas, normalmente pagos. Con la funcionalidad de reconciliación automática, OpenERP realiza su propia búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los apuntes, para cada empresa, cuando las cantidades se correspondan."
-
-#. module: account
-#: view:account.move:0
-#: field:account.move,to_check:0
-msgid "To Review"
-msgstr "A revisar"
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.move:0
-#: model:ir.actions.act_window,name:account.action_move_journal_line
-#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
-#: model:ir.ui.menu,name:account.menu_finance_entries
-msgid "Journal Entries"
-msgstr "Polizas contables"
-
-#. module: account
-#: help:account.partner.ledger,page_split:0
-msgid "Display Ledger Report with One partner per page"
-msgstr "Mostrar informe libro mayor con una empresa por página."
-
-#. module: account
-#: report:account.general.ledger_landscape:0
-msgid "JRNL"
-msgstr "LIBRO"
-
-#. module: account
-#: view:account.partner.balance:0
-#: view:account.partner.ledger:0
-msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
-msgstr "Este informe es un análisis realizado por una empresa. Es un informe PDF que contiene una línea por empresa representando el saldo del haber acumulativo."
-
-#. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:61
-#, python-format
-msgid "Selected Entry Lines does not have any account move enties in draft state"
-msgstr "Los apuntes seleccionados no tienen ningún movimiento contable en estado borrador"
-
-#. module: account
-#: selection:account.aged.trial.balance,target_move:0
-#: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
-#: selection:account.central.journal,target_move:0
-#: selection:account.chart,target_move:0
-#: selection:account.common.account.report,target_move:0
-#: selection:account.common.journal.report,target_move:0
-#: selection:account.common.partner.report,target_move:0
-#: selection:account.common.report,target_move:0
-#: selection:account.general.journal,target_move:0
-#: selection:account.move.journal,target_move:0
-#: selection:account.partner.balance,target_move:0
-#: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
-#: selection:account.print.journal,target_move:0
-#: selection:account.report.general.ledger,target_move:0
-#: selection:account.tax.chart,target_move:0
-#: selection:account.vat.declaration,target_move:0
-#: code:addons/account/report/common_report_header.py:67
-#: model:ir.actions.report.xml,name:account.account_move_line_list
-#, python-format
-msgid "All Entries"
-msgstr "Todos las polizas"
-
-#. module: account
-#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Error: La UdM por defecto y la UdM de compra deben estar en la misma categoría."
-
-#. module: account
-#: view:account.journal.select:0
-msgid "Journal Select"
-msgstr "Seleccionar diario"
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:64
-#, python-format
-msgid "Currnt currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_reconcile
-msgid "Account Reconciliation"
-msgstr "Contabilidad. Conciliación"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Taxes Fiscal Position"
-msgstr "Posición fiscal impuestos"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: view:account.report.general.ledger:0
-#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
-#: model:ir.actions.report.xml,name:account.account_general_ledger
-#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
-#: model:ir.ui.menu,name:account.menu_general_ledger
-msgid "General Ledger"
-msgstr "Libro mayor"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_paymentorderbank0
-msgid "The payment order is sent to the bank."
-msgstr "La orden de pago ha sido enviada al banco."
-
-#. module: account
-#: view:account.balance.report:0
-#: view:account.bs.report:0
-msgid "This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"
-msgstr "Este informe le permite imprimir o generar un pdf de su balance de sumas y saldos permitiendo comprobar con rapidez el saldo de cada una de sus cuentas en un único informe."
-
-#. module: account
-#: help:account.move,to_check:0
-msgid "Check this box if you are unsure of that journal entry and if you want to note it as 'to be reviewed' by an accounting expert."
-msgstr "Marque esta opción si no está seguro de este poliza y desea marcarlo como 'Para ser revisado' por un experto contable."
-
-#. module: account
-#: help:account.installer.modules,account_voucher:0
-msgid "Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
-msgstr "El módulo de recibos (justificantes) contables incluye todos los requisitos básicos de justificantes bancarios, de caja, ventas, compras, gastos, contrapartidas, etc... "
-
-#. module: account
-#: view:account.chart.template:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: account
-#: model:ir.model,name:account.model_account_tax_chart
-msgid "Account tax chart"
-msgstr "Contabilidad. Plan de impuestos"
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: report:account.central.journal:0
-#: report:account.general.journal:0
-#: report:account.invoice:0
-#: report:account.partner.balance:0
-msgid "Total:"
-msgstr "Total:"
-
-#. module: account
-#: code:addons/account/account.py:2102
-#, python-format
-msgid "You can specify year, month and date in the name of the model using the following labels:\n"
-"\n"
-"%(year)s: To Specify Year \n"
-"%(month)s: To Specify Month \n"
-"%(date)s: Current Date\n"
-"\n"
-"e.g. My model on %(date)s"
-msgstr "Puede indicar el año, mes y fecha en el nombre del modelo usando las siguientes etiquetas :  \n"
-"\n"
-"%(year)s: Para especificar el año \n"
-"%(month)s: Para especificar el mes \n"
-"%(date)s: Fecha actual\n"
-"Ejemplo: Mi modelo del %(date)s"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
-#. module: account
-#: help:report.invoice.created,origin:0
-msgid "Reference of the document that generated this invoice report."
-msgstr "Referencia del documento que ha generado este informe de factura."
-
-#. module: account
-#: field:account.tax.code,child_ids:0
-#: field:account.tax.code.template,child_ids:0
-msgid "Child Codes"
-msgstr "Códigos hijos"
-
-#. module: account
-#: code:addons/account/invoice.py:476
-#: code:addons/account/wizard/account_invoice_refund.py:137
-#, python-format
-msgid "Data Insufficient !"
-msgstr "¡Datos insuficientes!"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree1
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: account
-#: field:account.move.line.reconcile,writeoff:0
-msgid "Write-Off amount"
-msgstr "Importe desajuste"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: account
-#: view:account.journal.column:0
-#: model:ir.model,name:account.model_account_journal_column
-msgid "Journal Column"
-msgstr "Columna diario"
-
-#. module: account
-#: selection:account.invoice.report,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.subscription,state:0
-#: selection:report.invoice.created,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_invoicemanually0
-msgid "A statement with manual entries becomes a draft statement."
-msgstr "Un extracto con entradas manuales se convierte en un extracto borrador."
-
-#. module: account
-#: view:account.aged.trial.balance:0
-msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "
-msgstr "Saldos vencidos de empresa es un informe más detallado de sus efectos a cobrar por intervalos. Al abrir el informe, OpenERP pregunta por el nombre de la compañía, el periodo fiscal, y el tamaño del intervalo a analizar (en días). Luego OpenERP calcula una tabla del saldo deudor por periodo. Así que si solicita un intervalo de 30 días, OpenERP genera un análisis de todos los deudores para el mes pasado, últimos dos meses, etc. "
-
-#. module: account
-#: field:account.invoice,origin:0
-#: field:report.invoice.created,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: account
-#: help:account.account.type,sign:0
-msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
-msgstr "Permite cambiar el signo del saldo que se muestra en los informes, para que pueda ver cifras positivas en vez de negativas en cuentas de gastos."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
-msgid "Unreconciled Entries"
-msgstr "Polizas no conciliadas"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_menu_Bank_process
-msgid "Statements Reconciliation"
-msgstr "Conciliación de extractos"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Taxes:"
-msgstr "Impuestos:"
-
-#. module: account
-#: help:account.tax,amount:0
-msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr "Para impuestos de tipo porcentaj, introduzca valor % entre 0-1."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_subscription_form
-msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system."
-msgstr "Un poliza recurrente es un poliza contable que ocurre de forma recurrente desde una determinada fecha. Por ejemplo la firma de un contrato o un acuerdo con un cliente o un proveedor. Con la definición de polizas recurrentes, puede crear estos polizas para automatizar las anotaciones contables en el sistema."
-
-#. module: account
-#: field:account.entries.report,product_uom_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,product_uom_id:0
-msgid "Product UOM"
-msgstr "UdM del producto"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
-msgid "A Cash Register allows you to manage cash entries in your cash journals. This feature provides an easy way to follow up cash payments on a daily basis. You can enter the coins that are in your cash box, and then post entries when money comes in or goes out of the cash box."
-msgstr "Un registro de caja le permite gestionar las polizas de caja en sus diarios de caja. Esta funcionalidad provee una forma fácil de realizar el seguimiento de los pagos de caja diariamente. Puede introducir las monedas que tiene en su caja y luego registrar polizas cuando el dinero entra o sale de la caja."
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "9"
-msgstr "9"
-
-#. module: account
-#: help:account.invoice.refund,date:0
-msgid "This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!"
-msgstr "Esta fecha se utilizará como la fecha de facturación de la nota de credito (abono) y el período será elegido en consecuencia."
-
-#. module: account
-#: field:account.aged.trial.balance,period_length:0
-msgid "Period length (days)"
-msgstr "Longitud del período (días)"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Analytic Lines"
-msgstr "Líneas analíticas"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
-msgid "The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of accounts structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account."
-msgstr "El plan de cuentas normales tiene una estructura predefinida por los requisitos legales del país. La estructura del plan de cuentas analíticas debería reflejar las necesidades de su negocio de cara al análisis de costes e ingresos. Por lo general se estructuran por contratos, proyectos, productos o departamentos. La mayoría de las operaciones de OpenERP (facturas, hojas de servicio, gastos, etc) generan polizas analíticos en la cuenta asociada."
-
-#. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
-msgid "Lines"
-msgstr "Líneas"
-
-#. module: account
-#: code:addons/account/invoice.py:524
-#, python-format
-msgid "Can not find account chart for this company in invoice line account, Please Create account."
-msgstr "No se ha encontrado un plan contable para esta compañía en la cuenta de la línea de factura. Cree una cuenta."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Account Tax Template"
-msgstr "Plantilla de impuestos"
-
-#. module: account
-#: view:account.journal.select:0
-msgid "Are you sure you want to open Journal Entries?"
-msgstr "¿Está seguro que quiere abrir las polizas?"
-
-#. module: account
-#: view:account.state.open:0
-msgid "Are you sure you want to open this invoice ?"
-msgstr "¿Está seguro que desea abrir esta factura?"
-
-#. module: account
-#: code:addons/account/account_move_line.py:966
-#, python-format
-msgid "Accounting Entries"
-msgstr "Polizas contables"
-
-#. module: account
-#: field:account.account.template,parent_id:0
-msgid "Parent Account Template"
-msgstr "Plantilla cuenta padre"
-
-#. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,statement_id:0
-#: field:account.move.line,statement_id:0
-#: model:process.process,name:account.process_process_statementprocess0
-msgid "Statement"
-msgstr "Extracto"
-
-#. module: account
-#: help:account.journal,default_debit_account_id:0
-msgid "It acts as a default account for debit amount"
-msgstr "Actúa como una cuenta por defecto para importes en el debe."
-
-#. module: account
-#: model:ir.module.module,description:account.module_meta_information
-msgid "Financial and accounting module that covers:\n"
-"    General accountings\n"
-"    Cost / Analytic accounting\n"
-"    Third party accounting\n"
-"    Taxes management\n"
-"    Budgets\n"
-"    Customer and Supplier Invoices\n"
-"    Bank statements\n"
-"    Reconciliation process by partner\n"
-"    Creates a dashboard for accountants that includes:\n"
-"    * List of uninvoiced quotations\n"
-"    * Graph of aged receivables\n"
-"    * Graph of aged incomes\n"
-"\n"
-"The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or\n"
-"grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a\n"
-"module named account_voucher.\n"
-"    "
-msgstr "Módulo financiero y contable que cubre:\n"
-"    Contabilidad general\n"
-"    Contabilidad analítica / de costes\n"
-"    Gestión de terceros\n"
-"    Gestión de impuestos\n"
-"    Presupuestos\n"
-"    Facturación de clientes y proveedores\n"
-"    Extractos bancarios\n"
-"    Conciliación por tercero\n"
-"    Crea un cuadro de mandos para contables que incluye:\n"
-"    * Lista de presupuestos sin facturar\n"
-"    * Gráfica de cuentas vencidas a cobrar\n"
-"    * Gráfica de efectos a cobrar\n"
-"\n"
-"Los procesos, como el mantenimiento del libro mayor se realizan a través de los diarios financieros definidos\n"
-"(las polizas se agrupan por diario) para un ejercicio fiscal determinado; y para la preparación de recibos \n"
-"existe un módulo llamado account_voucher.\n"
-"    "
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
-msgid "You can search for individual account entries through useful information. To search for account entries, open a journal, then select a record line."
-msgstr "Puede buscar un poliza contable en concreto a través de información útil. Para buscar polizas contables, abra un diario, luego seleccione un apunte."
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: field:report.invoice.created,date_invoice:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: account
-#: help:res.partner,credit:0
-msgid "Total amount this customer owes you."
-msgstr "Importe total que este cliente le debe."
-
-#. module: account
-#: model:ir.model,name:account.model_ir_sequence
-msgid "ir.sequence"
-msgstr "ir.secuencia"
-
-#. module: account
-#: field:account.journal.period,icon:0
-msgid "Icon"
-msgstr "Icono"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.use.model:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: account
-#: code:addons/account/report/account_partner_balance.py:115
-#, python-format
-msgid "Unknown Partner"
-msgstr "Empresa desconocida"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
-msgstr "Saldo de apertura"
-
-#. module: account
-#: help:account.journal,centralisation:0
-msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
-msgstr "Marque esta opción para que cada poliza de este diario no crea una nueva contrapartida, sino que comparta la misma contrapartida. Se usa en el cierre del ejercicio fiscal."
-
-#. module: account
-#: field:account.bank.statement,closing_date:0
-msgid "Closed On"
-msgstr "Cerrado en"
-
-#. module: account
-#: model:ir.model,name:account.model_account_bank_statement_line
-msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
-
-#. module: account
-#: field:account.automatic.reconcile,date2:0
-msgid "Ending Date"
-msgstr "Fecha final"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,purchase_tax:0
-msgid "Default Purchase Tax"
-msgstr "Impuesto de compra por defecto"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: account
-#: help:account.invoice,partner_bank_id:0
-msgid "Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number."
-msgstr "Número de cuenta bancaria, cuenta bancaria de la compañía si la factura es un abono de cliente o proveedor, si no cuenta bancaria de la empresa cliente o proveedor."
-
-#. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
-msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
-msgstr "Este campo sólo se usará si desarrolla su propio módulo permitiendo a los desarrolladores crear impuestos específicos en una configuración personalizada."
-
-#. module: account
-#: code:addons/account/account.py:956
-#, python-format
-msgid "You should have chosen periods that belongs to the same company"
-msgstr "Debería haber seleccionado periodos que pertenezcan a la misma compañía"
-
-#. module: account
-#: field:account.fiscalyear.close,report_name:0
-msgid "Name of new entries"
-msgstr "Nombre de nuevos polizas"
-
-#. module: account
-#: view:account.use.model:0
-msgid "Create Entries"
-msgstr "Crear polizas"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_reporting
-msgid "Reporting"
-msgstr "Informes"
-
-#. module: account
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr "¡El código del diario debe ser único por compañía!"
-
-#. module: account
-#: field:account.bank.statement,ending_details_ids:0
-msgid "Closing Cashbox"
-msgstr "Cierre de caja"
-
-#. module: account
-#: view:account.journal:0
-msgid "Account Journal"
-msgstr "Diario de contabilidad"
-
-#. module: account
-#: model:process.node,name:account.process_node_paidinvoice0
-#: model:process.node,name:account.process_node_supplierpaidinvoice0
-msgid "Paid invoice"
-msgstr "Factura pagada"
-
-#. module: account
-#: help:account.partner.reconcile.process,next_partner_id:0
-msgid "This field shows you the next partner that will be automatically chosen by the system to go through the reconciliation process, based on the latest day it have been reconciled."
-msgstr "Este campo muestra la siguiente empresa que será elegida automáticamente por el sistema para pasar por el proceso de conciliación, basado en el último día que ha sido conciliada."
-
-#. module: account
-#: field:account.move.line.reconcile.writeoff,comment:0
-msgid "Comment"
-msgstr "Comentario"
-
-#. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: account
-#: model:ir.model,name:account.model_account_use_model
-msgid "Use model"
-msgstr "Usar modelo"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_purchase
-msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account Payable\"."
-msgstr "Esta vista es usada por los contables para registrar polizas masivamente en OpenERP. Si quiere registrar una factura de proveedor, comience introduciendo la linea de la cuenta de gastos. OpenERP le propondrá automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" de contrapartida."
-
-#. module: account
-#: help:res.company,property_reserve_and_surplus_account:0
-msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"
-msgstr "Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se calcula en el informe de Pérdidas y Ganancias."
-
-#. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
-#: model:ir.model,name:account.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Línea de factura"
-
-#. module: account
-#: field:account.balance.report,display_account:0
-#: field:account.bs.report,display_account:0
-#: field:account.common.account.report,display_account:0
-#: field:account.pl.report,display_account:0
-#: field:account.report.general.ledger,display_account:0
-msgid "Display accounts"
-msgstr "Mostrar cuentas"
-
-#. module: account
-#: field:account.account.type,sign:0
-msgid "Sign on Reports"
-msgstr "Signo en informes"
-
-#. module: account
-#: code:addons/account/account_cash_statement.py:250
-#, python-format
-msgid "You can not have two open register for the same journal"
-msgstr "No puede tener dos registros abiertos para el mismo diario"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month= -1"
-msgstr "  día del mes= -1"
-
-#. module: account
-#: help:account.journal,type:0
-msgid "Select 'Sale' for Sale journal to be used at the time of making invoice. Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order. Select 'Cash' to be used at the time of making payment. Select 'General' for miscellaneous operations. Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."
-msgstr "Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione 'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio fiscal o la generación del poliza de cierre."
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
-
-#. module: account
-#: help:account.installer.modules,account_followup:0
-msgid "Helps you generate reminder letters for unpaid invoices, including multiple levels of reminding and customized per-partner policies."
-msgstr "Le ayuda a generar cartas recordatorias para las facturas pendientes de pago, incluyendo múltiples niveles de recordatorio y políticas personalizadas por empresa."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  value amount: n.a"
-msgstr "  importe valor: n.a"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-msgid "Normal"
-msgstr "Normal"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Optional Information"
-msgstr "Información opcional"
-
-#. module: account
-#: view:account.analytic.line:0
-#: view:account.journal:0
-#: field:account.journal,user_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: account
-#: report:account.general.journal:0
-msgid ":"
-msgstr ":"
-
-#. module: account
-#: selection:account.account,currency_mode:0
-msgid "At Date"
-msgstr "En fecha"
-
-#. module: account
-#: help:account.move.line,date_maturity:0
-msgid "This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."
-msgstr "Este campo se usa para polizas a pagar y a cobrar. Puede introducir la fecha límite para el pago de esta línea."
-
-#. module: account
-#: code:addons/account/account_move_line.py:1280
-#, python-format
-msgid "Bad account !"
-msgstr "¡Cuenta incorrecta!"
-
-#. module: account
-#: code:addons/account/account.py:2859
-#: code:addons/account/installer.py:432
-#, python-format
-msgid "Sales Journal"
-msgstr "Diario de ventas"
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:104
-#, python-format
-msgid "Open Journal Items !"
-msgstr "¡Polizas abiertos!"
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_tax
-msgid "Invoice Tax"
-msgstr "Impuesto de factura"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1255
-#, python-format
-msgid "No piece number !"
-msgstr "¡Ningún trozo de número!"
-
-#. module: account
-#: view:product.product:0
-#: view:product.template:0
-msgid "Sales Properties"
-msgstr "Propiedades de venta"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_manual_reconcile
-msgid "Manual Reconciliation"
-msgstr "Conciliación manual"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Total amount due:"
-msgstr "Importe total debido:"
-
-#. module: account
-#: field:account.analytic.chart,to_date:0
-#: field:project.account.analytic.line,to_date:0
-msgid "To"
-msgstr "Hasta"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1397
-#, python-format
-msgid "Currency Adjustment"
-msgstr "Currency Adjustment"
-
-#. module: account
-#: field:account.fiscalyear.close,fy_id:0
-#: field:account.fiscalyear.close.state,fy_id:0
-msgid "Fiscal Year to close"
-msgstr "Ejercicio fiscal a cerrar"
-
-#. module: account
-#: view:account.invoice.cancel:0
-#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
-msgid "Cancel Selected Invoices"
-msgstr "Cancelar facturas seleccionadas"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:304
-#, python-format
-msgid "Payable Accounts"
-msgstr "Cuentas a pagar"
-
-#. module: account
-#: model:ir.model,name:account.model_account_chart_template
-msgid "Templates for Account Chart"
-msgstr "Plantillas para el plan contable"
-
-#. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Código"
-
-#. module: account
-#: view:validate.account.move:0
-msgid "Post Journal Entries of a Journal"
-msgstr "Asentar polizas de un diario"
-
-#. module: account
-#: view:product.product:0
-msgid "Sale Taxes"
-msgstr "Impuestos de ventas"
-
-#. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.bank.accounts.wizard,account_type:0
-#: selection:account.entries.report,type:0
-#: selection:account.journal,type:0
-msgid "Cash"
-msgstr "Efectivo"
-
-#. module: account
-#: field:account.fiscal.position.account,account_dest_id:0
-#: field:account.fiscal.position.account.template,account_dest_id:0
-msgid "Account Destination"
-msgstr "Cuenta destino"
-
-#. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
-msgstr "Pago de facturas"
-
-#. module: account
-#: field:account.bank.statement.line,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: view:account.journal:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
-#: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: account
-#: model:ir.model,name:account.model_account_bs_report
-msgid "Account Balance Sheet Report"
-msgstr "Contabilidad. Informe balance de situación"
-
-#. module: account
-#: help:account.tax,price_include:0
-#: help:account.tax.template,price_include:0
-msgid "Check this if the price you use on the product and invoices includes this tax."
-msgstr "Marque esta opción si el precio que utiliza en el producto y en las facturas incluye este impuesto."
-
-#. module: account
-#: view:account.state.open:0
-msgid "Yes"
-msgstr "Sí"
-
-#. module: account
-#: view:report.account_type.sales:0
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
-#. module: account
-#: help:account.invoice,move_id:0
-msgid "Link to the automatically generated Journal Items."
-msgstr "Enlace a las polizas generados automáticamente."
-
-#. module: account
-#: selection:account.installer,period:0
-msgid "Monthly"
-msgstr "Mensual"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_view
-msgid "Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it."
-msgstr "Aquí puede personalizar una vista de un diario existente o crear una nueva vista. Las vistas de diarios determinan la forma en la que puede registrar polizas en sus diarios. Seleccione los campos que desea que aparezcan en un diario y determine la secuencia en que aparecen. Después puede crear un diario nuevo y asociarle una vista."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  number of days: 14"
-msgstr "  número de días: 14"
-
-#. module: account
-#: view:analytic.entries.report:0
-msgid "    7 Days    "
-msgstr "    7 Días    "
-
-#. module: account
-#: field:account.partner.reconcile.process,progress:0
-msgid "Progress"
-msgstr "Progreso"
-
-#. module: account
-#: field:account.account,parent_id:0
-#: view:account.analytic.account:0
-msgid "Parent"
-msgstr "Padre"
-
-#. module: account
-#: field:account.installer.modules,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planes analíticos múltiples"
-
-#. module: account
-#: help:account.payment.term.line,days2:0
-msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
-msgstr "Día del mes, introduzca -1 para el último día del mes actual. Si es positivo, indica el día del próximo mes. Introduzca 0 para días netos (de lo contrario se calcula desde principio del mes)."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_legal_statement
-msgid "Legal Reports"
-msgstr "Informes legales"
-
-#. module: account
-#: field:account.tax.code,sum_period:0
-msgid "Period Sum"
-msgstr "Suma del período"
-
-#. module: account
-#: help:account.tax,sequence:0
-msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
-msgstr "El campo secuencia es usado para ordenar las líneas de impuestos de menor a mayor secuencia. El orden es importante si un impuesto tiene varios impuesto hijos. En este caso, el orden de evaluación es importante."
-
-#. module: account
-#: model:ir.model,name:account.model_account_cashbox_line
-msgid "CashBox Line"
-msgstr "Línea de caja"
-
-#. module: account
-#: view:account.partner.ledger:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-#: model:ir.ui.menu,name:account.menu_account_partner_ledger
-msgid "Partner Ledger"
-msgstr "Libro mayor de empresa"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Year :"
-msgstr "Ejercicio :"
-
-#. module: account
-#: selection:account.tax.template,type:0
-msgid "Fixed"
-msgstr "Fijo"
-
-#. module: account
-#: code:addons/account/account.py:516
-#: code:addons/account/account.py:529
-#: code:addons/account/account.py:532
-#: code:addons/account/account.py:546
-#: code:addons/account/account.py:654
-#: code:addons/account/account.py:945
-#: code:addons/account/account_move_line.py:726
-#: code:addons/account/account_move_line.py:770
-#: code:addons/account/invoice.py:722
-#: code:addons/account/invoice.py:725
-#: code:addons/account/invoice.py:728
-#, python-format
-msgid "Warning !"
-msgstr "¡Atención!"
-
-#. module: account
-#: field:account.entries.report,move_line_state:0
-msgid "State of Move Line"
-msgstr "Estado de línea movimiento"
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_line_reconcile
-#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
-msgid "Account move line reconcile"
-msgstr "Contabilidad. Conciliar línea movimiento"
-
-#. module: account
-#: view:account.subscription.generate:0
-#: model:ir.model,name:account.model_account_subscription_generate
-msgid "Subscription Compute"
-msgstr "Calcular polizas periódicos"
-
-#. module: account
-#: field:account.bank.statement.line,partner_id:0
-#: view:account.entries.report:0
-#: field:account.entries.report,partner_id:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: view:account.invoice:0
-#: field:account.invoice,partner_id:0
-#: field:account.invoice.line,partner_id:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,partner_id:0
-#: report:account.journal.period.print:0
-#: field:account.model.line,partner_id:0
-#: view:account.move:0
-#: field:account.move,partner_id:0
-#: view:account.move.line:0
-#: field:account.move.line,partner_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,partner_id:0
-#: model:ir.model,name:account.model_res_partner
-#: field:report.invoice.created,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: account
-#: help:account.change.currency,currency_id:0
-msgid "Select a currency to apply on the invoice"
-msgstr "Seleccione una moneda a aplicar en la factura."
-
-#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:100
-#, python-format
-msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "No se puede %s factura borrador/proforma/cancelada."
-
-#. module: account
-#: code:addons/account/invoice.py:795
-#, python-format
-msgid "No Invoice Lines !"
-msgstr "¡No hay líneas de factura!"
-
-#. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,state:0
-#: field:account.entries.report,move_state:0
-#: view:account.fiscalyear:0
-#: field:account.fiscalyear,state:0
-#: view:account.invoice:0
-#: field:account.invoice,state:0
-#: view:account.invoice.report:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: view:account.move.line:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: view:account.subscription:0
-#: field:account.subscription,state:0
-#: field:report.invoice.created,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: account
-#: help:account.open.closed.fiscalyear,fyear_id:0
-msgid "Select Fiscal Year which you want to remove entries for its End of year entries journal"
-msgstr "Seleccione el ejercicio fiscal que desea eliminar polizas de su diario de polizas fin de ejercicio."
-
-#. module: account
-#: field:account.tax.template,type_tax_use:0
-msgid "Tax Use In"
-msgstr "Impuesto usado en"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:346
-#, python-format
-msgid "The account entries lines are not in valid state."
-msgstr "Las líneas de las polizas contables no están en estado válida."
-
-#. module: account
-#: field:account.account.type,close_method:0
-msgid "Deferral Method"
-msgstr "Método cierre"
-
-#. module: account
-#: code:addons/account/invoice.py:360
-#, python-format
-msgid "Invoice '%s' is paid."
-msgstr "La factura '%s' está pagada."
-
-#. module: account
-#: model:process.node,note:account.process_node_electronicfile0
-msgid "Automatic entry"
-msgstr "Asiento automático"
-
-#. module: account
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuestos recursivos."
-
-#. module: account
-#: view:account.invoice.line:0
-msgid "Line"
-msgstr "Línea"
-
-#. module: account
-#: help:account.journal,group_invoice_lines:0
-msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
-msgstr "Si esta opción está marcada, el sistema tratará de agrupar las líneas del poliza cuando se generen desde facturas."
-
-#. module: account
-#: help:account.period,state:0
-msgid "When monthly periods are created. The state is 'Draft'. At the end of monthly period it is in 'Done' state."
-msgstr "Cuando se crean los periodos mensuales el estado es 'Borrador'. Al final del periodo mensual está en estado 'Realizado'."
-
-#. module: account
-#: report:account.analytic.account.inverted.balance:0
-msgid "Inverted Analytic Balance -"
-msgstr "Balance analítico invertido -"
-
-#. module: account
-#: view:account.move.bank.reconcile:0
-msgid "Open for Bank Reconciliation"
-msgstr "Abrir para la conciliación bancaria"
-
-#. module: account
-#: field:account.partner.ledger,page_split:0
-msgid "One Partner Per Page"
-msgstr "Una empresa por página"
-
-#. module: account
-#: field:account.account,child_parent_ids:0
-#: field:account.account.template,child_parent_ids:0
-msgid "Children"
-msgstr "Hijos"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Associated Partner"
-msgstr "Empresa asociada"
-
-#. module: account
-#: code:addons/account/invoice.py:1298
-#, python-format
-msgid "You must first select a partner !"
-msgstr "¡Primero debe seleccionar una empresa!"
-
-#. module: account
-#: view:account.invoice:0
-#: field:account.invoice,comment:0
-msgid "Additional Information"
-msgstr "Información adicional"
-
-#. module: account
-#: view:account.installer:0
-msgid "Bank and Cash Accounts"
-msgstr "Cuentas de banco y caja"
-
-#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,residual:0
-msgid "Total Residual"
-msgstr "Total residual"
-
-#. module: account
-#: model:process.node,note:account.process_node_invoiceinvoice0
-#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
-msgid "Invoice's state is Open"
-msgstr "Estado de la factura es Abierta"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_tree
-msgid "The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country."
-msgstr "El plan de impuestos se usa para generar sus informes periódicos de impuestos. Verá los impuestos con códigos relativos a sus requisitos legales de acuerdo a su país."
-
-#. module: account
-#: view:account.installer.modules:0
-msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr "Añade funcionalidades contables extras a las que ya tiene instaladas."
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_cost
-#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
-msgid "Cost Ledger"
-msgstr "Costo contable"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Proforma"
-msgstr "Proforma"
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-msgid "J.C. /Move name"
-msgstr "Cód. diario/Nombre mov."
-
-#. module: account
-#: model:ir.model,name:account.model_account_open_closed_fiscalyear
-msgid "Choose Fiscal Year"
-msgstr "Seleccione el ejercicio fiscal"
-
-#. module: account
-#: code:addons/account/account.py:2923
-#: code:addons/account/installer.py:495
-#, python-format
-msgid "Purchase Refund Journal"
-msgstr "Diario de abono de compras"
-
-#. module: account
-#: help:account.tax.template,amount:0
-msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "Para los porcentaje del tipo de pago introduzca valor % entre 0-1."
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "8"
-msgstr "8"
-
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."
-msgstr "Modificar factura: Cancela la factura actual y crea una nueva copia preparada para editar."
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and Financial Management"
-msgstr "Gestión contable y financiera"
-
-#. module: account
-#: field:account.automatic.reconcile,period_id:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement,period_id:0
-#: view:account.entries.report:0
-#: field:account.entries.report,period_id:0
-#: view:account.fiscalyear:0
-#: report:account.general.ledger_landscape:0
-#: view:account.invoice:0
-#: view:account.invoice.report:0
-#: field:account.journal.period,period_id:0
-#: view:account.move:0
-#: field:account.move,period_id:0
-#: view:account.move.line:0
-#: field:account.move.line,period_id:0
-#: view:account.period:0
-#: field:account.subscription,period_nbr:0
-#: field:account.tax.chart,period_id:0
-#: code:addons/account/account_move_line.py:985
-#: field:validate.account.move,period_id:0
-#, python-format
-msgid "Period"
-msgstr "Período"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Net Total:"
-msgstr "Base:"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
-msgid "Generic Reporting"
-msgstr "Informes genéricos"
-
-#. module: account
-#: field:account.move.line.reconcile.writeoff,journal_id:0
-msgid "Write-Off Journal"
-msgstr "Diario de desajuste"
-
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid "This payment term will be used instead of the default one for the current partner"
-msgstr "Este plazo de pago se utilizará en lugar del plazo por defecto para la empresa actual."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Compute Code for Taxes Included Prices"
-msgstr "Código para el cálculo de los impuestos en precios incluidos"
-
-#. module: account
-#: field:account.chart.template,property_account_income_categ:0
-msgid "Income Category Account"
-msgstr "Cuenta de la categoría de ingresos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Position Templates"
-msgstr "Plantillas de posiciones fiscales"
-
-#. module: account
-#: view:account.entries.report:0
-msgid "Int.Type"
-msgstr "Tipo interno"
-
-#. module: account
-#: field:account.move.line,tax_amount:0
-msgid "Tax/Base Amount"
-msgstr "Importe impuestos/base"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree3
-msgid "With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
-msgstr "Con las notas de credito (abonos) a clientes puede gestionar las devoluciones de sus clientes. Una nota de credito es un documento que abona una factura completa o parcialmente. Puede generar fácilmente notas de credito y conciliarlas directamente desde el formulario de factura."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_vat_declaration
-msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
-msgstr "Este menú imprime una declaración de IVA basada en facturas o pagos. Puede seleccionar uno o varios periodos del ejercicio fiscal. La información necesaria para la declaración de impuestos es generada por OpenERP a partir de las facturas (o pagos, en algunos países). Esta información se actualiza en tiempo real; lo cual es muy útil porque le permite previsualizar en cualquier momento los impuestos a pagar al principio y al final del mes o trimestre."
-
-#. module: account
-#: report:account.invoice:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: account
-#: field:account.account,company_currency_id:0
-msgid "Company Currency"
-msgstr "Divisa de la compañía"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Chart of Accounts"
-msgstr "Plan contable"
-
-#. module: account
-#: model:process.node,name:account.process_node_paymententries0
-#: model:process.transition,name:account.process_transition_reconcilepaid0
-msgid "Payment"
-msgstr "Pago"
-
-#. module: account
-#: help:account.bs.report,reserve_account_id:0
-msgid "This Account is used for transfering Profit/Loss (Profit: Amount will be added, Loss: Amount will be duducted), which is calculated from Profilt & Loss Report"
-msgstr "Esta cuenta se usa para transferir pérdidas/ganancias (Ganancia: El importe será añadido, Pérdida: El importe será deducido), que se calcula en el informe de pérdidas y ganancias."
-
-#. module: account
-#: help:account.move.line,blocked:0
-msgid "You can check this box to mark this journal item as a litigation with the associated partner"
-msgstr "Puede marcar esta opción para indicar este poliza como un litigio con la empresa asociada."
-
-#. module: account
-#: field:account.move.line,reconcile_partial_id:0
-#: view:account.move.line.reconcile:0
-msgid "Partial Reconcile"
-msgstr "Conciliación parcial"
-
-#. module: account
-#: help:account.chart,fiscalyear:0
-msgid "Keep empty for all open fiscal years"
-msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
-
-#. module: account
-#: model:ir.model,name:account.model_account_common_report
-msgid "Account Common Report"
-msgstr "Contabilidad. Informe común"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_filestatement0
-msgid "Automatic import of the bank sta"
-msgstr "Importación automática del extracto bancario"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_journal_view
-#: model:ir.ui.menu,name:account.menu_action_account_journal_view
-msgid "Journal Views"
-msgstr "Vistas de diario"
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_bank_reconcile
-msgid "Move bank reconcile"
-msgstr "Conciliar movimientos banco"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_type_form
-#: model:ir.ui.menu,name:account.menu_action_account_type_form
-msgid "Account Types"
-msgstr "Tipos de cuentas"
-
-#. module: account
-#: code:addons/account/invoice.py:905
-#, python-format
-msgid "Cannot create invoice move on centralised journal"
-msgstr "No se puede crear poliza factura en el diario centralizado"
-
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.move.line.reconcile:0
-#: view:account.move.line.reconcile.select:0
-#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
-#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
-#: model:process.node,name:account.process_node_reconciliation0
-#: model:process.node,name:account.process_node_supplierreconciliation0
-#, python-format
-msgid "Reconciliation"
-msgstr "Conciliación"
-
-#. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Cuenta a cobrar"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "CashBox Balance"
-msgstr "Saldo de caja"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscalyear_close_state
-msgid "Fiscalyear Close state"
-msgstr "Cerrar estado ejercicio fiscal"
-
-#. module: account
-#: field:account.invoice.refund,journal_id:0
-#: field:account.journal,refund_journal:0
-msgid "Refund Journal"
-msgstr "Diario reintegro"
-
-#. module: account
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger_landscape:0
-#: report:account.partner.balance:0
-msgid "Filter By"
-msgstr "Filtrar por"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree1
-msgid "With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers."
-msgstr "Con las facturas de cliente puede crear y gestionar las facturas de venta emitidas a sus clientes. OpenERP también puede generar automáticamente facturas borrador desde los pedidos o desde albaranes. Sólo deberá confirmarlas antes de ser enviadas a sus clientes."
-
-#. module: account
-#: view:account.entries.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_company_analysis_tree
-msgid "Company Analysis"
-msgstr "Análisis compañía"
-
-#. module: account
-#: help:account.invoice,account_id:0
-msgid "The partner account used for this invoice."
-msgstr "La cuenta de la empresa utilizada para esta factura."
-
-#. module: account
-#: field:account.tax.code,parent_id:0
-#: view:account.tax.code.template:0
-#: field:account.tax.code.template,parent_id:0
-msgid "Parent Code"
-msgstr "Código padre"
-
-#. module: account
-#: model:ir.model,name:account.model_account_payment_term_line
-msgid "Payment Term Line"
-msgstr "Línea de plazo de pago"
-
-#. module: account
-#: code:addons/account/account.py:2876
-#: code:addons/account/installer.py:452
-#, python-format
-msgid "Purchase Journal"
-msgstr "Diario de compras"
-
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr "Nota de credito: Crea la factura de abono, preparada para editarla."
-
-#. module: account
-#: field:account.invoice.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: account
-#: view:account.vat.declaration:0
-msgid "Print Tax Statement"
-msgstr "Imprimir declaración de impuestos"
-
-#. module: account
-#: view:account.model.line:0
-msgid "Journal Entry Model Line"
-msgstr "Línea de modelo de poliza"
-
-#. module: account
-#: view:account.invoice:0
-#: field:account.invoice,date_due:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,date_due:0
-#: field:report.invoice.created,date_due:0
-msgid "Due Date"
-msgstr "Fecha vencimiento"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_account_supplier
-#: model:ir.ui.menu,name:account.menu_finance_payables
-msgid "Suppliers"
-msgstr "Proveedores"
-
-#. module: account
-#: constraint:account.move:0
-msgid "You cannot create more than one move per period on centralized journal"
-msgstr "No puede crear más de un movimiento por periodo en un diario centralizado"
-
-#. module: account
-#: view:account.journal:0
-msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipo de cuentas permitidas (vacío para ningún control)"
-
-#. module: account
-#: view:res.partner:0
-msgid "Supplier Accounting Properties"
-msgstr "Propiedades de contabilidad del proveedor"
-
-#. module: account
-#: help:account.move.line,amount_residual:0
-msgid "The residual amount on a receivable or payable of a journal entry expressed in the company currency."
-msgstr "El importe residual de un apunte a cobrar o a pagar expresado en la moneda de la compañía."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  valuation: balance"
-msgstr "  valoración: saldo"
-
-#. module: account
-#: view:account.tax.code:0
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#. module: account
-#: field:account.analytic.chart,from_date:0
-#: field:project.account.analytic.line,from_date:0
-msgid "From"
-msgstr "Desde"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscalyear_close
-msgid "Fiscalyear Close"
-msgstr "Cierre ejercicio fiscal"
-
-#. module: account
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
-msgstr "¡El código de la cuenta debe ser único por compañía!"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
-msgid "Unpaid Invoices"
-msgstr "Facturas impagadas"
-
-#. module: account
-#: field:account.move.line.reconcile,debit:0
-msgid "Debit amount"
-msgstr "Importe debe"
-
-#. module: account
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_treasory_graph
-msgid "Treasury"
-msgstr "Tesorería"
-
-#. module: account
-#: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
-#: view:account.analytic.balance:0
-#: view:account.analytic.cost.ledger:0
-#: view:account.analytic.cost.ledger.journal.report:0
-#: view:account.analytic.inverted.balance:0
-#: view:account.common.report:0
-msgid "Print"
-msgstr "Imprimir"
-
-#. module: account
-#: view:account.journal:0
-msgid "Accounts Allowed (empty for no control)"
-msgstr "Cuentas permitidas (vacío para ningún control)"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
-#: model:ir.actions.act_window,name:account.action_account_analytic_chart
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-msgid "Chart of Analytic Accounts"
-msgstr "Plan de cuentas analíticas"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_configuration_misc
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: account
-#: help:res.partner,debit:0
-msgid "Total amount you have to pay to this supplier."
-msgstr "Importe total que debe pagar a este proveedor."
-
-#. module: account
-#: model:process.node,name:account.process_node_analytic0
-#: model:process.node,name:account.process_node_analyticcost0
-msgid "Analytic Costs"
-msgstr "Costes analíticos"
-
-#. module: account
-#: field:account.analytic.journal,name:0
-#: report:account.general.journal:0
-#: field:account.journal,name:0
-msgid "Journal Name"
-msgstr "Nombre del diario"
-
-#. module: account
-#: help:account.invoice,internal_number:0
-msgid "Unique number of the invoice, computed automatically when the invoice is created."
-msgstr "Número único de la factura, calculado automáticamente cuando se valida la factura."
-
-#. module: account
-#: constraint:account.bank.statement.line:0
-msgid "The amount of the voucher must be the same amount as the one on the statement line"
-msgstr "El importe del recibo debe ser el mismo importe que el de la línea del extracto"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1140
-#: code:addons/account/account_move_line.py:1223
-#, python-format
-msgid "Bad account!"
-msgstr "¡Cuenta incorrecta!"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_inverted_balance
-msgid "Account Analytic Inverted Balance"
-msgstr "Contabilidad. Balance invertido analítico"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1065
-#, python-format
-msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
-
-#. module: account
-#: help:account.move.line,amount_currency:0
-msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
-msgstr "El importe expresado en una otra divisa opcional si se trata de un poliza multi-divisa."
-
-#. module: account
-#: view:account.account:0
-#: report:account.analytic.account.journal:0
-#: field:account.bank.statement,currency:0
-#: report:account.central.journal:0
-#: view:account.entries.report:0
-#: field:account.entries.report,currency_id:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.invoice,currency_id:0
-#: field:account.invoice.report,currency_id:0
-#: field:account.journal,currency:0
-#: report:account.journal.period.print:0
-#: field:account.model.line,currency_id:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: field:account.move.line,currency_id:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: field:analytic.entries.report,currency_id:0
-#: model:ir.model,name:account.model_res_currency
-#: field:report.account.sales,currency_id:0
-#: field:report.account_type.sales,currency_id:0
-#: field:report.invoice.created,currency_id:0
-msgid "Currency"
-msgstr "Divisa"
-
-#. module: account
-#: help:account.bank.statement.line,sequence:0
-msgid "Gives the sequence order when displaying a list of bank statement lines."
-msgstr "Indica el orden de secuencia cuando se muestra una lista de líneas de extracto bancario."
-
-#. module: account
-#: model:process.transition,note:account.process_transition_validentries0
-msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr "El contable valida las polizas contables provenientes de la factura."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
-msgid "Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  would be referred to as FY 2011. You are not obliged to follow the actual calendar year."
-msgstr "Defina el ejercicio fiscal de su compañía de acuerdo a sus necesidades. Un ejercicio fiscal es un periodo al final del cual se cierran las cuentas (usualmente 12 meses). El ejercicio fiscal usualmente se referencia por el año en el que acaba. Por ejemplo, si el ejercicio fiscal de una compañía termina el 30 de noviembre de 2011, entonces todo lo que haya entre el 1 de diciembre de 2010 y el 30 de noviembre de 2011 se referencia como EF2011. No está obligado a seguir el año de calendario real."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
-msgid "Reconciled entries"
-msgstr "Polizas conciliadas"
-
-#. module: account
-#: field:account.invoice,address_contact_id:0
-msgid "Contact Address"
-msgstr "Dirección contacto"
-
-#. module: account
-#: help:account.invoice,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Invoice.             \n"
-"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have an invoice number.             \n"
-"* The 'Open' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice.             \n"
-"* The 'Paid' state is set automatically when invoice is paid.            \n"
-"* The 'Cancelled' state is used when user cancel invoice."
-msgstr " * El estado 'Borrador' se utiliza cuando un usuario está introduciendo una nueva factura sin confirmar.             \n"
-"* El estado 'Pro-forma' se utiliza cuando la factura es una Pro-forma sin número de factura.             \n"
-"* El estado 'Abierto' se utiliza cuando el usuario confirma una factura; se genera automáticamente un número de factura. Permanece en estado abierto mientras el usuario no paga la factura.             \n"
-"* El estado 'Pagado' se establece automáticamente cuando se paga la factura.            \n"
-"* El estado 'Cancelado' se utiliza cuando el usuario cancela la factura."
-
-#. module: account
-#: field:account.invoice.refund,period:0
-msgid "Force period"
-msgstr "Forzar período"
-
-#. module: account
-#: model:ir.model,name:account.model_account_partner_balance
-msgid "Print Account Partner Balance"
-msgstr "Imprimir balance contable de empresa"
-
-#. module: account
-#: field:res.partner,contract_ids:0
-msgid "Contracts"
-msgstr "Contratos"
-
-#. module: account
-#: field:account.cashbox.line,ending_id:0
-#: field:account.cashbox.line,starting_id:0
-#: field:account.entries.report,reconcile_id:0
-msgid "unknown"
-msgstr "desconocido"
-
-#. module: account
-#: field:account.fiscalyear.close,journal_id:0
-msgid "Opening Entries Journal"
-msgstr "Diario polizas de apertura"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_customerinvoice0
-msgid "Draft invoices are checked, validated and printed."
-msgstr "Facturas borrador son comprobadas, validadas e impresas."
-
-#. module: account
-#: help:account.chart.template,property_reserve_and_surplus_account:0
-msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report"
-msgstr "Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se calcula en el informe de Pérdidas y Ganancias."
-
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Reference Type"
-msgstr "Tipo de referencia"
-
-#. module: account
-#: view:account.analytic.cost.ledger.journal.report:0
-msgid "Cost Ledger for Period"
-msgstr "Resumen de costes por periodo"
-
-#. module: account
-#: help:account.tax,child_depend:0
-#: help:account.tax.template,child_depend:0
-msgid "Set if the tax computation is based on the computation of child taxes rather than on the total amount."
-msgstr "Indica si el cálculo de impuestos se basa en el cálculo de los impuestos hijos en lugar del importe total."
-
-#. module: account
-#: selection:account.tax,applicable_type:0
-msgid "Given by Python Code"
-msgstr "Calculado por código Python"
-
-#. module: account
-#: field:account.analytic.journal,code:0
-msgid "Journal Code"
-msgstr "Código diario"
-
-#. module: account
-#: help:account.tax.code,sign:0
-msgid "You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it."
-msgstr "Puede indicar aquí el coeficiente que se utilizará cuando se consolide el importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si desea sumar/restar el importe."
-
-#. module: account
-#: view:account.invoice:0
-#: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
-msgid "Residual Amount"
-msgstr "Importe residual"
-
-#. module: account
-#: field:account.invoice,move_lines:0
-#: field:account.move.reconcile,line_id:0
-msgid "Entry Lines"
-msgstr "Apuntes"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_open_journal_button
-#: model:ir.actions.act_window,name:account.action_validate_account_move
-msgid "Open Journal"
-msgstr "Abrir diario"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-msgid "KI"
-msgstr "KI"
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.journal:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "Period from"
-msgstr "Período desde"
-
-#. module: account
-#: code:addons/account/account.py:2899
-#: code:addons/account/installer.py:476
-#, python-format
-msgid "Sales Refund Journal"
-msgstr "Diario de abono de ventas"
-
-#. module: account
-#: code:addons/account/account.py:945
-#, python-format
-msgid "You cannot modify company of this period as its related record exist in Entry Lines"
-msgstr "No puede modificar la compañía de este periodo porqué ya hay apuntes en este período."
-
-#. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.payment.term:0
-msgid "Information"
-msgstr "Información"
-
-#. module: account
-#: model:process.node,note:account.process_node_bankstatement0
-msgid "Registered payment"
-msgstr "Pago registrado"
-
-#. module: account
-#: view:account.fiscalyear.close.state:0
-msgid "Close states of Fiscal year and periods"
-msgstr "Cerrar estados de ejercicio fiscal y periodos"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Product Information"
-msgstr "Información del producto"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: model:ir.ui.menu,name:account.next_id_40
-msgid "Analytic"
-msgstr "Analítico"
-
-#. module: account
-#: model:process.node,name:account.process_node_invoiceinvoice0
-#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: account
-#: field:account.installer,purchase_tax:0
-msgid "Purchase Tax(%)"
-msgstr "Impuesto compra (%)"
-
-#. module: account
-#: code:addons/account/invoice.py:795
-#, python-format
-msgid "Please create some invoice lines."
-msgstr "Cree algunas líneas de factura"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
-
-#. module: account
-#: view:account.installer.modules:0
-msgid "Configure Your Accounting Application"
-msgstr "Configure su aplicación de contabilidad"
-
-#. module: account
-#: code:addons/account/account.py:2902
-#: code:addons/account/installer.py:479
-#, python-format
-msgid "SCNJ"
-msgstr "AVENTA"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_analyticinvoice0
-msgid "Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices."
-msgstr "Los costes analíticos (hojas de servicios, algunos productos comprados, ...) provienen de las cuentas analíticas. Estos generan facturas borrador."
-
-#. module: account
-#: help:account.journal,view_id:0
-msgid "Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
-msgstr "Establece la vista usada cuando se escriben o consultan polizas en este diario. La vista le indica a OpenERP qué campos deben ser visibles, requeridos o de sólo lectura, y en qué orden. Puede crear su propia vista en cada diario para introducir apuntes más rápido."
-
-#. module: account
-#: field:account.period,date_stop:0
-#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
-msgid "End of Period"
-msgstr "Fin de período"
-
-#. module: account
-#: field:account.installer.modules,account_followup:0
-msgid "Followups Management"
-msgstr "Gestión de seguimientos"
-
-#. module: account
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.vat.declaration:0
-msgid "Start Period"
-msgstr "Periodo inicial"
-
-#. module: account
-#: code:addons/account/account.py:2395
-#, python-format
-msgid "Cannot locate parent code for template account!"
-msgstr "¡No se puede localizar código padre para plantilla de cuentas!"
-
-#. module: account
-#: field:account.aged.trial.balance,direction_selection:0
-msgid "Analysis Direction"
-msgstr "Dirección análisis"
-
-#. module: account
-#: field:res.partner,ref_companies:0
-msgid "Companies that refers to partner"
-msgstr "Compañías que se refieren a la empresa"
-
-#. module: account
-#: view:account.journal:0
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
-#: field:account.journal.view,name:0
-#: model:ir.model,name:account.model_account_journal_view
-msgid "Journal View"
-msgstr "Vista de diario"
-
-#. module: account
-#: view:account.bank.statement:0
-#: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1009
-#, python-format
-msgid "Total credit"
-msgstr "Total credit"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_suppliervalidentries0
-msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr "El contable valida las polizas contables provenientes de la factura. "
-
-#. module: account
-#: code:addons/account/invoice.py:1014
-#, python-format
-msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
-msgstr "¡No puede cancelar la factura que está pagada parcialmente! ¡Es necesario romper la conciliación de las polizas de pago relacionados!"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Best regards."
-msgstr "Atentamente,"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Unpaid"
-msgstr "Impagada"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Document: Customer account statement"
-msgstr "Documento: Estado contable del cliente"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:70
-#, python-format
-msgid "Current currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
-
-#. module: account
-#: code:addons/account/account.py:956
-#: code:addons/account/account.py:958
-#: code:addons/account/account.py:1199
-#: code:addons/account/account.py:1442
-#: code:addons/account/account.py:1447
-#: code:addons/account/account_cash_statement.py:250
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:797
-#: code:addons/account/account_move_line.py:799
-#: code:addons/account/account_move_line.py:802
-#: code:addons/account/account_move_line.py:804
-#: code:addons/account/account_move_line.py:1126
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:38
-#: code:addons/account/wizard/account_change_currency.py:59
-#: code:addons/account/wizard/account_change_currency.py:64
-#: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: account
-#: view:account.account.template:0
-msgid "Receivale Accounts"
-msgstr "Cuentas a cobrar"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Income Accounts)"
-msgstr "Pérdida y ganancias (cuentas de ingresos)"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
-
-#. module: account
-#: field:account.account,balance:0
-#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
-#: selection:account.account.type,close_method:0
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement,balance_end_cash:0
-#: report:account.central.journal:0
-#: field:account.entries.report,balance:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.move.line,balance:0
-#: report:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: field:report.account.receivable,balance:0
-#: field:report.aged.receivable,balance:0
-msgid "Balance"
-msgstr "Saldo pendiente"
-
-#. module: account
-#: model:process.node,note:account.process_node_supplierbankstatement0
-msgid "Manually or automatically entered in the system"
-msgstr "Introducido manualmente o automáticamente en el sistema"
-
-#. module: account
-#: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
-msgid "Display Account"
-msgstr "Mostrar cuenta"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "("
-msgstr "("
-
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify"
-msgstr "Modificar"
-
-#. module: account
-#: view:account.account.type:0
-msgid "Closing Method"
-msgstr "Método de cierre"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_partner_balance
-msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
-msgstr "Este informe es el análisis por empresa. Es un informe PDF que contiene una línea por empresa representando el saldo de crédito acumulativo."
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.entries.report,type:0
-msgid "Payable"
-msgstr "A pagar"
-
-#. module: account
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-#: view:report.hr.timesheet.invoice.journal:0
-msgid "This Year"
-msgstr "Este año"
-
-#. module: account
-#: view:board.board:0
-msgid "Account Board"
-msgstr "Tablero de contabilidad"
-
-#. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
-msgid "Legend"
-msgstr "Leyenda"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_sale
-msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account receivable\"."
-msgstr "Esta vista es usada por los contables para registrar polizas masivamente en OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y el periodo en la barra de herramientas de búsqueda. Luego, comience introduciendo la linea de la cuenta de ingresos. OpenERP le propondrá automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" de contrapartida."
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:391
-#, python-format
-msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr "¡No se puede eliminar extracto(s) bancario(s) que ya esté confirmado!"
-
-#. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#, python-format
-msgid "You must select accounts to reconcile"
-msgstr "Debe seleccionar las cuentas a conciliar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-msgid "Balance by Type of Account"
-msgstr "Saldo por tipo de cuenta"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_entriesreconcile0
-msgid "Accounting entries are the first input of the reconciliation."
-msgstr "Polizas contables son la primera entrada de la conciliación."
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_period_form
-msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period."
-msgstr "Aquí puede definir un periodo fiscal, un intervalo de tiempo dentro del ejercicio fiscal de su compañía. Un periodo contable típicamente es un mes o un trimestre. Usualmente corresponde a los periodos de la declaración de impuestos. Cree y gestione periodos aquí y decida qué periodo se debería cerrar o dejar abierto dependiendo de las actividades de su compañía en un periodo específico."
-
-#. module: account
-#: model:account.payment.term,name:account.account_payment_term
-#: model:account.payment.term,note:account.account_payment_term
-msgid "30 Days invoice date"
-msgstr "30 días fecha factura"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.journal.period.print:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Filters By"
-msgstr "Filtros por"
-
-#. module: account
-#: model:process.node,note:account.process_node_manually0
-#: model:process.transition,name:account.process_transition_invoicemanually0
-msgid "Manual entry"
-msgstr "Entrada manual"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: field:account.move.line,move_id:0
-#: field:analytic.entries.report,move_id:0
-msgid "Move"
-msgstr "Asiento"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1137
-#, python-format
-msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr "¡No se puede cambiar el impuesto, debe eliminar y recrear las líneas!"
-
-#. module: account
-#: report:account.central.journal:0
-msgid "A/C No."
-msgstr "Nº cuenta"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
-msgid "Bank statements"
-msgstr "Extractos bancarios"
-
-#. module: account
-#: help:account.addtmpl.wizard,cparent_id:0
-msgid "Creates an account with the selected template under this existing parent."
-msgstr "Crea una cuenta con la plantilla seleccionada debajo el padre existente."
-
-#. module: account
-#: selection:account.model.line,date_maturity:0
-msgid "Date of the day"
-msgstr "Fecha del día"
-
-#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#, python-format
-msgid "You have to define the bank account\n"
-"in the journal definition for reconciliation."
-msgstr "Debe definir la cuenta del banco\n"
-"en la definición del diario para conciliar."
-
-#. module: account
-#: view:account.move.line.reconcile:0
-msgid "Reconciliation Transactions"
-msgstr "Conciliación de transacciones"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_common_menu
-msgid "Common Report"
-msgstr "Informe común"
-
-#. module: account
-#: view:account.account:0
-#: field:account.account,child_consol_ids:0
-msgid "Consolidated Children"
-msgstr "Hijos consolidados"
-
-#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
-#, python-format
-msgid "The journal must have centralised counterpart without the Skipping draft state option checked!"
-msgstr "¡El diario debe tener una contrapartida centralizada sin la opción de omitir el estado borrador marcada!"
-
-#. module: account
-#: model:process.node,note:account.process_node_paymententries0
-#: model:process.transition,name:account.process_transition_paymentorderbank0
-#: model:process.transition,name:account.process_transition_paymentreconcile0
-msgid "Payment entries"
-msgstr "Polizas de pago"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: account
-#: view:account.account:0
-msgid "Chart of Accounts"
-msgstr "Plan contable"
-
-#. module: account
-#: field:account.subscription.line,subscription_id:0
-msgid "Subscription"
-msgstr "Polizas periódicos"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_balance
-msgid "Account Analytic Balance"
-msgstr "Contabilidad. Saldo analítico"
-
-#. module: account
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.vat.declaration:0
-msgid "End Period"
-msgstr "Periodo final"
-
-#. module: account
-#: field:account.aged.trial.balance,chart_account_id:0
-#: field:account.balance.report,chart_account_id:0
-#: field:account.bs.report,chart_account_id:0
-#: field:account.central.journal,chart_account_id:0
-#: field:account.common.account.report,chart_account_id:0
-#: field:account.common.journal.report,chart_account_id:0
-#: field:account.common.partner.report,chart_account_id:0
-#: field:account.common.report,chart_account_id:0
-#: field:account.general.journal,chart_account_id:0
-#: field:account.partner.balance,chart_account_id:0
-#: field:account.partner.ledger,chart_account_id:0
-#: field:account.pl.report,chart_account_id:0
-#: field:account.print.journal,chart_account_id:0
-#: field:account.report.general.ledger,chart_account_id:0
-#: field:account.vat.declaration,chart_account_id:0
-msgid "Chart of Accounts"
-msgstr "Plan contable"
-
-#. module: account
-#: field:account.move.line,date_maturity:0
-msgid "Due date"
-msgstr "Fecha vencimiento"
-
-#. module: account
-#: view:account.move.journal:0
-msgid "Standard Entries"
-msgstr "Polizas estándares"
-
-#. module: account
-#: model:ir.model,name:account.model_account_subscription
-msgid "Account Subscription"
-msgstr "Asiento periódico"
-
-#. module: account
-#: code:addons/account/invoice.py:725
-#, python-format
-msgid "Tax base different !\n"
-"Click on compute to update tax base"
-msgstr "¡Base de impuesto diferente!"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Entry Subscription"
-msgstr "Asiento periódico"
-
-#. module: account
-#: report:account.account.balance:0
-#: field:account.aged.trial.balance,date_from:0
-#: field:account.balance.report,date_from:0
-#: field:account.bs.report,date_from:0
-#: report:account.central.journal:0
-#: field:account.central.journal,date_from:0
-#: field:account.common.account.report,date_from:0
-#: field:account.common.journal.report,date_from:0
-#: field:account.common.partner.report,date_from:0
-#: field:account.common.report,date_from:0
-#: field:account.fiscalyear,date_start:0
-#: report:account.general.journal:0
-#: field:account.general.journal,date_from:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.installer,date_start:0
-#: report:account.journal.period.print:0
-#: report:account.partner.balance:0
-#: field:account.partner.balance,date_from:0
-#: field:account.partner.ledger,date_from:0
-#: field:account.pl.report,date_from:0
-#: field:account.print.journal,date_from:0
-#: field:account.report.general.ledger,date_from:0
-#: field:account.subscription,date_start:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: field:account.vat.declaration,date_from:0
-msgid "Start Date"
-msgstr "Fecha inicial"
-
-#. module: account
-#: model:process.node,name:account.process_node_supplierdraftinvoices0
-msgid "Draft Invoices"
-msgstr "Facturas borrador"
-
-#. module: account
-#: selection:account.account.type,close_method:0
-#: view:account.entries.report:0
-#: view:account.move.line:0
-msgid "Unreconciled"
-msgstr "No conciliado"
-
-#. module: account
-#: code:addons/account/invoice.py:812
-#, python-format
-msgid "Bad total !"
-msgstr "¡Total erróneo!"
-
-#. module: account
-#: field:account.journal,sequence_id:0
-msgid "Entry Sequence"
-msgstr "Secuencia del poliza"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_period_tree
-msgid "A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation."
-msgstr "Un periodo es una plazo de tiempo fiscal durante la cual se deben registrar en polizas las actividades relacionadas con la contabilidad. Lo normal es un periodo mensual pero, dependiendo del país y las necesidades de su compañía, podría usar también periodos trimestrales (por ejemplo en España las PYMES habitualmente usan periodos trimestrales). Cerrar un periodo impide registrar nuevos polizas, cualquier nuevo poliza deberá anotarse en el siguiente periodo abierto. Cierre un periodo cuando no vaya a escribir nuevos polizas y desee bloquear este periodo por motivos relacionados con el cálculo de impuestos."
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_analyticinvoice0
-#: model:process.transition,name:account.process_transition_supplieranalyticcost0
-msgid "From analytic accounts"
-msgstr "Desde cuentas analíticas"
-
-#. module: account
-#: field:account.installer.modules,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestión de los pagos a proveedores"
-
-#. module: account
-#: field:account.period,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: account
-#: report:account.analytic.account.quantity_cost_ledger:0
-msgid "Code/Date"
-msgstr "Código/Fecha"
-
-#. module: account
-#: field:account.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
-#: field:account.tax,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: account
-#: code:addons/account/invoice.py:353
-#, python-format
-msgid "Unknown Error"
-msgstr "Error desconocido"
-
-#. module: account
-#: code:addons/account/account.py:1185
-#, python-format
-msgid "You cannot validate a non-balanced entry !\n"
-"Make sure you have configured Payment Term properly !\n"
-"It should contain atleast one Payment Term Line with type \"Balance\" !"
-msgstr "¡ No se puede confirmar un poliza descuadrado !\n"
-"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
-"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" !"
-
-#. module: account
-#: help:res.partner,property_account_payable:0
-msgid "This account will be used instead of the default one as the payable account for the current partner"
-msgstr "Este cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a pagar para la empresa actual."
-
-#. module: account
-#: field:account.period,special:0
-msgid "Opening/Closing Period"
-msgstr "Período de apertura/cierre"
-
-#. module: account
-#: field:account.account,currency_id:0
-#: field:account.account.template,currency_id:0
-#: field:account.bank.accounts.wizard,currency_id:0
-msgid "Secondary Currency"
-msgstr "Divisa secundaria"
-
-#. module: account
-#: model:ir.model,name:account.model_validate_account_move
-msgid "Validate Account Move"
-msgstr "Validar movimiento contable"
-
-#. module: account
-#: field:account.account,credit:0
-#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.inverted.balance:0
-#: report:account.central.journal:0
-#: field:account.entries.report,credit:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.vat.declaration:0
-#: field:report.account.receivable,credit:0
-msgid "Credit"
-msgstr "Haber"
-
-#. module: account
-#: help:account.invoice.refund,journal_id:0
-msgid "You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice."
-msgstr "Puede seleccionar aquí el diario a usar para la nota de credito (abono) que se creará. Si deja este campo vacío, se usará el mismo diario que la factura actual."
-
-#. module: account
-#: view:account.general.journal:0
-#: model:ir.ui.menu,name:account.menu_account_general_journal
-msgid "General Journals"
-msgstr "Diarios generales"
-
-#. module: account
-#: view:account.model:0
-msgid "Journal Entry Model"
-msgstr "Modelo de poliza"
-
-#. module: account
-#: code:addons/account/wizard/account_use_model.py:44
-#, python-format
-msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n"
-"Please define partner on it!"
-msgstr "La fecha de vencimiento dla linea generado por la línea del modelo '%s' se basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
-
-#. module: account
-#: field:account.cashbox.line,number:0
-#: field:account.invoice,number:0
-#: field:account.move,name:0
-msgid "Number"
-msgstr "Número"
-
-#. module: account
-#: report:account.analytic.account.journal:0
-#: selection:account.analytic.journal,type:0
-#: selection:account.bank.statement.line,type:0
-#: selection:account.journal,type:0
-msgid "General"
-msgstr "General"
-
-#. module: account
-#: selection:account.aged.trial.balance,filter:0
-#: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
-#: selection:account.central.journal,filter:0
-#: view:account.chart:0
-#: selection:account.common.account.report,filter:0
-#: selection:account.common.journal.report,filter:0
-#: selection:account.common.partner.report,filter:0
-#: view:account.common.report:0
-#: selection:account.common.report,filter:0
-#: view:account.fiscalyear:0
-#: field:account.fiscalyear,period_ids:0
-#: selection:account.general.journal,filter:0
-#: field:account.installer,period:0
-#: selection:account.partner.balance,filter:0
-#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
-#: selection:account.print.journal,filter:0
-#: selection:account.report.general.ledger,filter:0
-#: report:account.vat.declaration:0
-#: view:account.vat.declaration:0
-#: selection:account.vat.declaration,filter:0
-#: code:addons/account/report/common_report_header.py:99
-#: model:ir.actions.act_window,name:account.action_account_period_form
-#: model:ir.ui.menu,name:account.menu_action_account_period_form
-#: model:ir.ui.menu,name:account.next_id_23
-#, python-format
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: account
-#: field:account.invoice.report,currency_rate:0
-msgid "Currency Rate"
-msgstr "Tipo de cambio"
-
-#. module: account
-#: help:account.payment.term.line,value_amount:0
-msgid "For Value percent enter % ratio between 0-1."
-msgstr "Para porcentajes introduzca valores % entre 0-1."
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: account
-#: view:account.move.line.reconcile.select:0
-msgid "Open for Reconciliation"
-msgstr "Abrir para conciliación"
-
-#. module: account
-#: field:account.account,parent_left:0
-msgid "Parent Left"
-msgstr "Padre izquierdo"
-
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid "Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled"
-msgstr "Nota de credito (abono) basada en este tipo. No puede modificar y cancelar si la factura ya está conciliada."
-
-#. module: account
-#: help:account.installer.modules,account_analytic_plans:0
-msgid "Allows invoice lines to impact multiple analytic accounts simultaneously."
-msgstr "Permite a las líneas de factura impactar múltiples cuentas analíticas simultáneamente."
-
-#. module: account
-#: field:account.installer,sale_tax:0
-msgid "Sale Tax(%)"
-msgstr "Impuesto venta (%)"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree2
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
-msgid "Supplier Invoices"
-msgstr "Facturas de proveedor"
-
-#. module: account
-#: view:account.analytic.line:0
-#: field:account.analytic.line,product_id:0
-#: view:account.entries.report:0
-#: field:account.entries.report,product_id:0
-#: field:account.invoice.line,product_id:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,product_id:0
-#: field:account.move.line,product_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,product_id:0
-#: field:report.account.sales,product_id:0
-#: field:report.account_type.sales,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_validate_account_move
-msgid "The validation of journal entries process is also called 'ledger posting' and is the process of transferring debit and credit amounts from a journal of original entry to a ledger book."
-msgstr "El proceso de validación de polizas, también llamado 'asentar', transfiere los importes del debe y haber de la anotación original a un libro mayor."
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid ")"
-msgstr ")"
-
-#. module: account
-#: model:ir.model,name:account.model_account_period
-msgid "Account period"
-msgstr "Período contable"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Remove Lines"
-msgstr "Eliminar líneas"
-
-#. module: account
-#: view:account.report.general.ledger:0
-msgid "This report allows you to print or generate a pdf of your general ledger with details of all your account journals"
-msgstr "Este informe le permite imprimir o generar un pdf de su libro mayor con el detalle de todos sus diarios contables."
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.entries.report,type:0
-msgid "Regular"
-msgstr "Regular"
-
-#. module: account
-#: view:account.account:0
-#: field:account.account,type:0
-#: view:account.account.template:0
-#: field:account.account.template,type:0
-#: field:account.entries.report,type:0
-msgid "Internal Type"
-msgstr "Tipo interno"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form_running
-msgid "Running Subscriptions"
-msgstr "Polizas periódicos en proceso"
-
-#. module: account
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-#: view:report.hr.timesheet.invoice.journal:0
-msgid "This Month"
-msgstr "Este mes"
-
-#. module: account
-#: view:account.analytic.Journal.report:0
-#: view:account.analytic.balance:0
-#: view:account.analytic.cost.ledger:0
-#: view:account.analytic.inverted.balance:0
-#: model:ir.actions.act_window,name:account.action_account_partner_ledger
-msgid "Select Period"
-msgstr "Seleccionar periodo"
-
-#. module: account
-#: view:account.entries.report:0
-#: selection:account.entries.report,move_state:0
-#: view:account.move:0
-#: selection:account.move,state:0
-#: view:account.move.line:0
-msgid "Posted"
-msgstr "Asentado"
-
-#. module: account
-#: report:account.account.balance:0
-#: field:account.aged.trial.balance,date_to:0
-#: field:account.balance.report,date_to:0
-#: field:account.bs.report,date_to:0
-#: report:account.central.journal:0
-#: field:account.central.journal,date_to:0
-#: field:account.common.account.report,date_to:0
-#: field:account.common.journal.report,date_to:0
-#: field:account.common.partner.report,date_to:0
-#: field:account.common.report,date_to:0
-#: field:account.fiscalyear,date_stop:0
-#: report:account.general.journal:0
-#: field:account.general.journal,date_to:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: field:account.installer,date_stop:0
-#: report:account.journal.period.print:0
-#: report:account.partner.balance:0
-#: field:account.partner.balance,date_to:0
-#: field:account.partner.ledger,date_to:0
-#: field:account.pl.report,date_to:0
-#: field:account.print.journal,date_to:0
-#: field:account.report.general.ledger,date_to:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: field:account.vat.declaration,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
-#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
-msgid "Cancel Opening Entries"
-msgstr "Cancelar polizas de apertura"
-
-#. module: account
-#: field:account.payment.term.line,days2:0
-msgid "Day of the Month"
-msgstr "Día del mes"
-
-#. module: account
-#: field:account.fiscal.position.tax,tax_src_id:0
-#: field:account.fiscal.position.tax.template,tax_src_id:0
-msgid "Tax Source"
-msgstr "Origen impuesto"
-
-#. module: account
-#: code:addons/account/report/account_balance_sheet.py:73
-#: code:addons/account/report/account_balance_sheet.py:118
-#: code:addons/account/report/account_balance_sheet.py:121
-#: code:addons/account/report/account_balance_sheet.py:122
-#: code:addons/account/report/account_profit_loss.py:74
-#: code:addons/account/report/account_profit_loss.py:133
-#, python-format
-msgid "Net Profit"
-msgstr "Beneficio neto"
-
-#. module: account
-#: view:ir.sequence:0
-msgid "Fiscal Year Sequences"
-msgstr "Secuencias ejercicios fiscales"
-
-#. module: account
-#: help:account.model,name:0
-msgid "This is a model for recurring accounting entries"
-msgstr "Este es un modelo para polizas contables recurrentes"
-
-#. module: account
-#: code:addons/account/account_analytic_line.py:99
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr "JNRL"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  value amount: 0.02"
-msgstr "  importe valor: 0.02"
-
-#. module: account
-#: view:account.fiscalyear:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.period:0
-msgid "States"
-msgstr "Estados"
-
-#. module: account
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.inverted.balance:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: view:account.analytic.line:0
-#: view:account.bank.statement:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
-#: field:report.account.sales,amount_total:0
-#: field:report.account_type.sales,amount_total:0
-#: field:report.invoice.created,amount_total:0
-msgid "Total"
-msgstr "Total"
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:97
-#, python-format
-msgid "Journal: All"
-msgstr "Diario: Todos"
-
-#. module: account
-#: field:account.account,company_id:0
-#: field:account.analytic.journal,company_id:0
-#: field:account.bank.statement,company_id:0
-#: field:account.bank.statement.line,company_id:0
-#: view:account.entries.report:0
-#: field:account.entries.report,company_id:0
-#: field:account.fiscal.position,company_id:0
-#: field:account.fiscalyear,company_id:0
-#: field:account.installer,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.invoice.line,company_id:0
-#: view:account.invoice.report:0
-#: field:account.invoice.report,company_id:0
-#: field:account.invoice.tax,company_id:0
-#: view:account.journal:0
-#: field:account.journal,company_id:0
-#: field:account.journal.period,company_id:0
-#: field:account.model,company_id:0
-#: field:account.move,company_id:0
-#: field:account.move.line,company_id:0
-#: field:account.period,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,company_id:0
-#: field:wizard.multi.charts.accounts,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_action_subscription_form
-msgid "Define Recurring Entries"
-msgstr "Definir polizas recurrentes"
-
-#. module: account
-#: field:account.entries.report,date_maturity:0
-msgid "Date Maturity"
-msgstr "Fecha vencimiento"
-
-#. module: account
-#: help:account.bank.statement,total_entry_encoding:0
-msgid "Total cash transactions"
-msgstr "Total transiciones de caja."
-
-#. module: account
-#: help:account.partner.reconcile.process,today_reconciled:0
-msgid "This figure depicts the total number of partners that have gone throught the reconciliation process today. The current partner is counted as already processed."
-msgstr "Esta cifra representa el número total de empresas que hoy han pasado a través del proceso de conciliación. La empresa actual se contabiliza como que ya se ha procesado."
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Create Monthly Periods"
-msgstr "Crear períodos mensuales"
-
-#. module: account
-#: field:account.tax.code.template,sign:0
-msgid "Sign For Parent"
-msgstr "Signo para padre"
-
-#. module: account
-#: model:ir.model,name:account.model_account_balance_report
-msgid "Trial Balance Report"
-msgstr "Informe de sumas y saldos"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
-msgid "Draft statements"
-msgstr "Extractos bancarios borrador"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_statemententries0
-msgid "Manual or automatic creation of payment entries according to the statements"
-msgstr "Creación manual o automática de polizas de pago acorde a los extractos"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Invoice lines"
-msgstr "Líneas de factura"
-
-#. module: account
-#: field:account.aged.trial.balance,period_to:0
-#: field:account.balance.report,period_to:0
-#: field:account.bs.report,period_to:0
-#: field:account.central.journal,period_to:0
-#: field:account.chart,period_to:0
-#: field:account.common.account.report,period_to:0
-#: field:account.common.journal.report,period_to:0
-#: field:account.common.partner.report,period_to:0
-#: field:account.common.report,period_to:0
-#: field:account.general.journal,period_to:0
-#: field:account.partner.balance,period_to:0
-#: field:account.partner.ledger,period_to:0
-#: field:account.pl.report,period_to:0
-#: field:account.print.journal,period_to:0
-#: field:account.report.general.ledger,period_to:0
-#: field:account.vat.declaration,period_to:0
-msgid "End period"
-msgstr "Periodo final"
-
-#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:809
-#: code:addons/account/installer.py:585
-#: code:addons/account/wizard/account_invoice_state.py:44
-#: code:addons/account/wizard/account_invoice_state.py:68
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#: code:addons/account/wizard/account_state_open.py:37
-#: code:addons/account/wizard/account_validate_account_move.py:39
-#: code:addons/account/wizard/account_validate_account_move.py:61
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: account
-#: help:product.category,property_account_expense_categ:0
-#: help:product.template,property_account_expense:0
-msgid "This account will be used to value outgoing stock for the current product category using cost price"
-msgstr "Esta cuenta se utilizará para valorar el stock saliente para la categoría de producto actual utilizando el precio de coste."
-
-#. module: account
-#: view:account.vat.declaration:0
-msgid "This menu prints a VAT declaration based on invoices. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
-msgstr "This menu prints a VAT declaration based on invoices. 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."
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Cierre"
-
-#. module: account
-#: model:process.node,note:account.process_node_paidinvoice0
-msgid "Invoice's state is Done"
-msgstr "El estado de la factura es Realizada"
-
-#. module: account
-#: model:ir.model,name:account.model_report_account_sales
-msgid "Report of the Sales by Account"
-msgstr "Informe de las ventas por cuenta"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Accounts Fiscal Position"
-msgstr "Contabilidad. Posición fiscal"
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: model:process.process,name:account.process_process_supplierinvoiceprocess0
-#: selection:report.invoice.created,type:0
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
-
-#. module: account
-#: field:account.account,debit:0
-#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
-#: report:account.analytic.account.balance:0
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.inverted.balance:0
-#: report:account.central.journal:0
-#: field:account.entries.report,debit:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.vat.declaration:0
-#: field:report.account.receivable,debit:0
-msgid "Debit"
-msgstr "Debe"
-
-#. module: account
-#: field:account.invoice,invoice_line:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: account
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
-
-#. module: account
-#: view:account.subscription:0
-msgid "Recurring"
-msgstr "Recurrente"
-
-#. module: account
-#: code:addons/account/account_move_line.py:799
-#, python-format
-msgid "Entry is already reconciled"
-msgstr "La poliza ya está conciliado"
-
-#. module: account
-#: model:ir.model,name:account.model_report_account_receivable
-msgid "Receivable accounts"
-msgstr "Cuentas a cobrar"
-
-#. module: account
-#: selection:account.model.line,date_maturity:0
-msgid "Partner Payment Term"
-msgstr "Plazo de pago de la empresa"
-
-#. module: account
-#: field:temp.range,name:0
-msgid "Range"
-msgstr "Intervalo"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1255
-#, python-format
-msgid "Can not create an automatic sequence for this piece !\n"
-"\n"
-"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
-msgstr "¡No se puede crear una secuencia automática para este poliza!\n"
-"\n"
-"Indique una secuencia en la definición de diario para la numeración automática o cree manualmente una secuencia para este poliza."
-
-#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
-msgid "With movements"
-msgstr "Con movimientos"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Account Data"
-msgstr "Datos de la cuenta"
-
-#. module: account
-#: view:account.tax.code.template:0
-msgid "Account Tax Code Template"
-msgstr "Plantilla códigos impuestos contables"
-
-#. module: account
-#: model:process.node,name:account.process_node_manually0
-msgid "Manually"
-msgstr "Manualmente"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
-#: model:ir.ui.menu,name:account.account_analytic_journal_print
-msgid "Print Analytic Journals"
-msgstr "Imprimir diarios analíticos"
-
-#. module: account
-#: view:account.analytic.line:0
-msgid "Fin.Account"
-msgstr "Cuenta fin."
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
-#: view:report.aged.receivable:0
-msgid "Aged Receivable"
-msgstr "A cobrar vencido"
-
-#. module: account
-#: field:account.tax,applicable_type:0
-msgid "Applicability"
-msgstr "Aplicación"
-
-#. module: account
-#: code:addons/account/wizard/account_move_journal.py:165
-#, python-format
-msgid "This period is already closed !"
-msgstr "¡Este período ya está cerrado!"
-
-#. module: account
-#: help:account.move.line,currency_id:0
-msgid "The optional other currency if it is a multi-currency entry."
-msgstr "La otra divisa opcional si es un poliza multi-divisa."
-
-#. module: account
-#: model:process.transition,note:account.process_transition_invoiceimport0
-msgid "Import of the statement in the system from a supplier or customer invoice"
-msgstr "Importación del extracto en el sistema desde una factura de proveedor o cliente"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
-msgid "Billing"
-msgstr "Facturación"
-
-#. module: account
-#: view:account.account:0
-msgid "Parent Account"
-msgstr "Cuenta padre"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_form
-msgid "Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchase journal, sales journal..."
-msgstr "Cree y gestione los periodos de su compañía desde este menú. Se utiliza un diario para registrar transacciones de todos los datos contables relativos al día a día del negocio de su compañía utilizando el sistema contable de doble entrada. Dependiendo de la naturaleza de sus actividades y el número de transacciones diarias, una compañía puede mantener diversos tipos de diarios especializados como un diario de caja, un diario de compra, un diario de venta, ..."
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_chart
-msgid "Account Analytic Chart"
-msgstr "Contabilidad. Plan analítico"
-
-#. module: account
-#: help:account.invoice,residual:0
-msgid "Remaining amount due."
-msgstr "Importe debido restante."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
-msgid "Statistic Reports"
-msgstr "Informes estadísticos"
-
-#. module: account
-#: field:account.installer,progress:0
-#: field:account.installer.modules,progress:0
-#: field:wizard.multi.charts.accounts,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: account
-#: view:account.fiscal.position.template:0
-msgid "Accounts Mapping"
-msgstr "Mapeo de cuentas"
-
-#. module: account
-#: code:addons/account/invoice.py:345
-#, python-format
-msgid "Invoice '%s' is waiting for validation."
-msgstr "La factura '%s' está esperando para validación."
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: account
-#: model:ir.model,name:account.model_account_installer_modules
-msgid "account.installer.modules"
-msgstr "cuenta.instalador.módulos"
-
-#. module: account
-#: help:account.invoice.line,account_id:0
-msgid "The income or expense account related to the selected product."
-msgstr "La cuenta de ingresos o gastos relacionada con el producto seleccionado."
-
-#. module: account
-#: code:addons/account/account_move_line.py:1126
-#, python-format
-msgid "The date of your Journal Entry is not in the defined period!"
-msgstr "¡La fecha de su poliza no está en el periodo definido!"
-
-#. module: account
-#: field:account.subscription,period_total:0
-msgid "Number of Periods"
-msgstr "Número de periodos"
-
-#. module: account
-#: report:account.general.journal:0
-#: model:ir.actions.report.xml,name:account.account_general_journal
-msgid "General Journal"
-msgstr "Diario general"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Search Invoice"
-msgstr "Buscar factura"
-
-#. module: account
-#: report:account.invoice:0
-#: view:account.invoice:0
-#: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
-#: view:account.invoice.report:0
-#: model:ir.actions.act_window,name:account.action_account_invoice_refund
-msgid "Refund"
-msgstr "Nota de credito"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,bank_accounts_id:0
-msgid "Bank Accounts"
-msgstr "Cuentas de banco"
-
-#. module: account
-#: field:res.partner,credit:0
-msgid "Total Receivable"
-msgstr "Total a cobrar"
-
-#. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move.line:0
-msgid "General Information"
-msgstr "Información general"
-
-#. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Accounting Documents"
-msgstr "Documentos contables"
-
-#. module: account
-#: model:ir.model,name:account.model_validate_account_move_lines
-msgid "Validate Account Move Lines"
-msgstr "Contabilidad. Validar líneas movimiento"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
-#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
-msgid "Cost Ledger (Only quantities)"
-msgstr "Costo contable (sólo cantidades)"
-
-#. module: account
-#: model:process.node,note:account.process_node_supplierpaidinvoice0
-msgid "Invoice's state is Done."
-msgstr "El estado de la factura es Realizada."
-
-#. module: account
-#: model:process.transition,note:account.process_transition_reconcilepaid0
-msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr "Tan pronto como la conciliación se realice, la factura estará pagada."
-
-#. module: account
-#: view:account.account.template:0
-msgid "Search Account Templates"
-msgstr "Buscar plantillas cuentas"
-
-#. module: account
-#: view:account.invoice.tax:0
-msgid "Manual Invoice Taxes"
-msgstr "Impuestos factura manual"
-
-#. module: account
-#: field:account.account,parent_right:0
-msgid "Parent Right"
-msgstr "Padre derecho"
-
-#. module: account
-#: model:ir.model,name:account.model_account_addtmpl_wizard
-msgid "account.addtmpl.wizard"
-msgstr "account.añadirplantilla.asistente"
-
-#. module: account
-#: field:account.aged.trial.balance,result_selection:0
-#: field:account.common.partner.report,result_selection:0
-#: report:account.partner.balance:0
-#: field:account.partner.balance,result_selection:0
-#: field:account.partner.ledger,result_selection:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "Partner's"
-msgstr "De empresas"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
-#: view:ir.sequence:0
-#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
-msgid "Fiscal Years"
-msgstr "Ejercicios fiscales"
-
-#. module: account
-#: help:account.analytic.journal,active:0
-msgid "If the active field is set to False, it will allow you to hide the analytic journal without removing it."
-msgstr "Si el campo activo se desmarca, permite ocultar el diario analítico sin eliminarlo."
-
-#. module: account
-#: field:account.analytic.line,ref:0
-msgid "Ref."
-msgstr "Ref."
-
-#. module: account
-#: field:account.use.model,model:0
-#: model:ir.model,name:account.model_account_model
-msgid "Account Model"
-msgstr "Modelo de poliza"
-
-#. module: account
-#: selection:account.entries.report,month:0
-#: selection:account.invoice.report,month:0
-#: selection:analytic.entries.report,month:0
-#: selection:report.account.sales,month:0
-#: selection:report.account_type.sales,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: account
-#: field:account.bank.accounts.wizard,bank_account_id:0
-#: view:account.chart.template:0
-#: field:account.chart.template,bank_account_view_id:0
-#: field:account.invoice,partner_bank_id:0
-#: field:account.invoice.report,partner_bank_id:0
-msgid "Bank Account"
-msgstr "Cuenta bancaria"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_central_journal
-#: model:ir.model,name:account.model_account_central_journal
-msgid "Account Central Journal"
-msgstr "Diario central contable"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Maturity"
-msgstr "Vencimiento"
-
-#. module: account
-#: selection:account.aged.trial.balance,direction_selection:0
-msgid "Future"
-msgstr "Futuro"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Search Journal Items"
-msgstr "Buscar líneas polizas"
-
-#. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
-#: help:account.tax.template,base_sign:0
-#: help:account.tax.template,ref_base_sign:0
-#: help:account.tax.template,ref_tax_sign:0
-#: help:account.tax.template,tax_sign:0
-msgid "Usually 1 or -1."
-msgstr "Normalmente 1 o -1."
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Template Account Fiscal Mapping"
-msgstr "Mapeo fiscal de modelo de cuenta"
-
-#. module: account
-#: field:account.chart.template,property_account_expense:0
-msgid "Expense Account on Product Template"
-msgstr "Cuenta de gastos en plantilla producto"
-
-#. module: account
-#: field:account.analytic.line,amount_currency:0
-msgid "Amount currency"
-msgstr "Moneda del importe"
-
-#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
-#, python-format
-msgid "You must enter a period length that cannot be 0 or below !"
-msgstr "¡Debe introducir una duración del período que no puede ser 0 o inferior!"
-
-#. module: account
-#: code:addons/account/account.py:511
-#, python-format
-msgid "You cannot remove an account which has account entries!. "
-msgstr "¡No puede eliminar una cuenta que contiene polizas contables! "
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_form
-msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
-msgstr "Cree y gestione las cuentas que necesite para codificar polizas en los diarios. Una cuenta es parte de un plan de cuentas que permite a su compañía registrar todo tipo de transacciones de crédito y débito. Las compañías presentan sus cuentas anuales en dos partes principales: El balance y la cuenta de pérdidas y ganancias. Las cuentas anuales de una compañía son requeridas por ley para que contengan cierta cantidad de información. Tienen que ser certificadas por un auditor externo anualmente."
-
-#. module: account
-#: help:account.move.line,amount_residual_currency:0
-msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
-msgstr "El importe residual de un apunte a cobrar o a pagar expresado en su moneda (puede ser diferente de la moneda de la compañía)."
-
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index bee5954b98a..e0b5085ca2d 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgstr "Origen de la cuenta"
 msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -701,18 +696,6 @@ msgstr ""
 "Para conciliar los asientos, la compañía debería ser la misma para todos los "
 "asientos"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por cobrar"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1697,11 +1680,6 @@ msgstr "Secuencias de diarios separadas"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2808,13 +2786,6 @@ msgstr "Configuración financiera para nueva compañía"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3217,8 +3188,8 @@ msgstr "Plantillas para el plan contable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar cuentas contables a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6455,11 +6426,6 @@ msgstr "¡Introduzca una fecha inicial!"
 msgid "Supplier Refund"
 msgstr "Reembolso del Proveedor:"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Panel de Control"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7039,11 +7005,6 @@ msgstr ""
 "%(date)s: Fecha actual\n"
 "Ejemplo: Mi modelo del %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7277,7 +7238,7 @@ msgstr "Plantilla cuenta padre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10943,6 +10904,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "¡No puede eliminar el movimiento validado: \"%s\"!"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -10977,6 +10941,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "cerrando balance introducido por el verificador de caja"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por cobrar"
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
@@ -11051,6 +11019,9 @@ msgstr ""
 #~ msgid "Include initial balances"
 #~ msgstr "Incluir balances iniciales"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
 #~ msgid "The optional quantity on entries"
 #~ msgstr "La cantidad opcional en los asientos"
 
@@ -11120,6 +11091,9 @@ msgstr ""
 #~ msgid "Tax codes"
 #~ msgstr "Códigos de impuestos"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid "Reference Number"
 #~ msgstr "Número de referencia"
 
@@ -11143,6 +11117,9 @@ msgstr ""
 #~ "¡No se ha definido un ejercicio fiscal para esta fecha!\n"
 #~ "Por favor, cree uno."
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generar cuentas contables a partir de una plantilla de plan contable"
+
 #, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
@@ -11362,6 +11339,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "¡La moneda actual no está configurada correctamente!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid ""
 #~ "Account Voucher module includes all the basic requirements of Voucher "
 #~ "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
@@ -11550,6 +11530,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Contabilidad. Informe de pérdida y ganancias"
 
+#~ msgid "Dashboard"
+#~ msgstr "Panel de Control"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valoración: porcentaje"
 
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
index f7428a5d082..6cf5ee551cd 100644
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -671,18 +666,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1644,11 +1627,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2701,13 +2679,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3090,7 +3061,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6219,11 +6190,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6763,11 +6729,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6982,7 +6943,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 854c2d9a65b..d82fac46838 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -91,7 +91,7 @@ msgstr "Aegunud nõuded kuni tänaseni"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Impordi arvetest või maksetest"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -179,11 +179,6 @@ msgstr "Konto allikas"
 msgid "All Analytic Entries"
 msgstr "Kõik analüütilised kirjed"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Viimase 15 päeva jooksul loodud arved"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -667,18 +662,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Nõuete kontod"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1640,11 +1623,6 @@ msgstr "Eraldatud päeviku järjekorrad"
 msgid "Responsible"
 msgstr "Vastutav"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Müügid konto järgi"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2690,13 +2668,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3079,8 +3050,8 @@ msgstr "Kontoplaani mallid"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Tekita kontoplaan kasutades plaani malli"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -3525,7 +3496,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Konto maks"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
@@ -4460,7 +4431,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr "Seadistused"
+msgstr "Seadistus"
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
@@ -5765,7 +5736,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Päevik-perioodi nimetus"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -5979,7 +5950,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Lisainfo"
 
 #. module: account
 #: field:account.chart,fiscalyear:0
@@ -6089,7 +6060,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr ""
+msgstr "Aste"
 
 #. module: account
 #: code:addons/account/account.py:3368
@@ -6211,11 +6182,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Tarnija hüvitis"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6755,11 +6721,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6974,7 +6935,7 @@ msgstr "Ülemkonto mall"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -9842,7 +9803,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Mahakandmine"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -10611,6 +10572,9 @@ msgstr ""
 #~ msgid "Positive"
 #~ msgstr "Postiivne"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Tekita kontoplaan kasutades plaani malli"
+
 #~ msgid "Gives the sequence order when displaying a list of account types."
 #~ msgstr "Annab järjekorra kui näidatakse konto nimelirja tüüpe."
 
@@ -10949,6 +10913,10 @@ msgstr ""
 #~ msgid "Delta Credit"
 #~ msgstr "Delta kreedit"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Nõuete kontod"
+
 #~ msgid "Generic Reports"
 #~ msgstr "Üldised aruanded"
 
@@ -11179,6 +11147,9 @@ msgstr ""
 #~ msgid "Create subscription entries"
 #~ msgstr "Koosta tellimus sissekanded"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Viimase 15 päeva jooksul loodud arved"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Kontod tüübi järgi"
 
@@ -11271,6 +11242,9 @@ msgstr ""
 #~ "Vale krediidi või deebeti arv mudelis ( Krediit + Deebet Peab olema suurem "
 #~ "kui \"0\" ) !"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Müügid konto järgi"
+
 #, python-format
 #~ msgid "You cannot deactivate an account that contains account moves."
 #~ msgstr "Sa ei saa deaktiveerida kontot mis sisaldab konto liikumisi."
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 26bbf7533b2..75e0295e9c2 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 27a811b557a..48864b71a0e 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 21081969e7e..2cadc9dbec6 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 4dd4d5153ae..d9bbdccd9c3 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgstr "Tilin lähde"
 msgid "All Analytic Entries"
 msgstr "Kaikki analyyttiset merkinnät"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Lasku muodostettu 15 päivän sisällä"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -677,18 +672,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 "Täsmäyttääksesi viennit yrityksen tulisi olla sama kaikille vienneille"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Saatavat tilit"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1653,11 +1636,6 @@ msgstr "Erotellut päiväkirjan sarjat"
 msgid "Responsible"
 msgstr "Vastuuhenkilö"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Myynti tilityypeittäin"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2717,13 +2695,6 @@ msgstr "Uuden yrityksen taloudelliset asetukset"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Myynnit tileittäin"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3115,8 +3086,8 @@ msgstr "Tilikarttamallit"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Luo tilikartta mallista"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6258,11 +6229,6 @@ msgstr "Syötä aloituspäivä !"
 msgid "Supplier Refund"
 msgstr "Toimittajan hyvitys"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Työpöytä"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6806,11 +6772,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Tulotilit"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7025,7 +6986,7 @@ msgstr "Ylätilin malli"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11414,6 +11375,9 @@ msgstr ""
 #~ msgid "Charts of Account"
 #~ msgstr "Tilikartat"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Luo tilikartta mallista"
+
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Määrittele tilikausi ja valitse tilikartat"
 
@@ -11561,6 +11525,10 @@ msgstr ""
 #~ "Tätä kenttää käytetään merkintöihin maksettavista ja saatavista. Voit "
 #~ "asettaa rajapäivämäärän merkintärivin maksulle."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Saatavat tilit"
+
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -11981,6 +11949,9 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Sisällytä suoritetut merkinnät"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Lasku muodostettu 15 päivän sisällä"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -12048,6 +12019,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Verokoodien testaus"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Myynti tilityypeittäin"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Virhe! Et voi määritellä päällekkäisiä kirjanpitovuosia"
 
@@ -12108,6 +12082,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Voitto ja tappiotilin raportti"
 
+#~ msgid "Dashboard"
+#~ msgstr "Työpöytä"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  arvoostus: prosenttia"
 
@@ -12194,6 +12171,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " päiväkirja"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Myynnit tileittäin"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Tilikirjan konfiguraatio"
 
@@ -12232,6 +12212,9 @@ msgstr ""
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Luo tilikarttasi mallipohjan perusteella"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Tulotilit"
+
 #, python-format
 #~ msgid "You can not have two open register for the same journal"
 #~ msgstr "Samalla päiväkirjalla ei voi olla kahta avointa kassaa"
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index c328c761933..b33ed370784 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-22 12:17+0000\n"
-"Last-Translator: Francois Degrave <Unknown>\n"
+"PO-Revision-Date: 2012-06-20 16:18+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) <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-05-24 11:08+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
@@ -253,11 +253,6 @@ msgstr "Source comptable"
 msgid "All Analytic Entries"
 msgstr "Toutes les écritures analytiques"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Factures créées au cours des 15 derniers jours"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -774,18 +769,6 @@ msgstr ""
 "Pour lettrer les écritures, la société doit être la même pour toutes les "
 "écritures."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Comptes clients"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1795,11 +1778,6 @@ msgstr "Séquences de journaux séparées"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventes par type de compte"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2921,13 +2899,6 @@ msgstr "Paramétrage financier de la nouvelle société"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configurez votre plan de comptes"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventes par compte"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3336,8 +3307,8 @@ msgstr "Modèles de plans de comptes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Générer le plan comptable à partir d'un modèle"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6623,11 +6594,6 @@ msgstr "Saisissez une date de début !"
 msgid "Supplier Refund"
 msgstr "Avoir fournisseur"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tableau de bord"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7215,11 +7181,6 @@ msgstr ""
 "\n"
 "par exmple : Mon modèle du %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Comptes de revenus"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7463,7 +7424,7 @@ msgstr "Modèle de compte parent"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Installer votre plan comptable"
 
 #. module: account
@@ -12641,6 +12602,9 @@ msgstr ""
 #~ msgid "asgfas"
 #~ msgstr "asgfas"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Comptes de revenus"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Comptes par type"
 
@@ -12695,6 +12659,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Aller au partenaire suivant"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventes par type de compte"
+
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
@@ -12772,6 +12739,9 @@ msgstr ""
 #~ "Pas de période définie pour cette date : %s !\n"
 #~ "Veuillez créer un exercice comptable."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventes par compte"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Paramétrage du plan comptable"
 
@@ -12846,6 +12816,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Rapport des pertes et profits comptables"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tableau de bord"
+
 #~ msgid "Your Bank and Cash Accounts"
 #~ msgstr "Vos comptes de banque et de liquidités"
 
@@ -13313,6 +13286,9 @@ msgstr ""
 #~ msgid "Fill this if the journal is to be used for refunds of invoices."
 #~ msgstr "À remplir si des avoirs doivent être comptabilisés dans ce journal."
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Générer le plan comptable à partir d'un modèle"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Générer votre plan comptable depuis un modèle de plan"
 
@@ -13361,6 +13337,16 @@ msgstr ""
 #~ "module \"account_voucher\" prend en charge les pièces justificatives.\n"
 #~ "    "
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Factures créées au cours des 15 derniers jours"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Comptes clients"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Installer votre plan comptable"
+
 #~ msgid "Unreconciliate transactions"
 #~ msgstr "Annuler le lettrage"
 
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index 10cfd1f33a4..c8c0459b3da 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2689,13 +2667,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3078,7 +3049,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6205,11 +6176,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6749,11 +6715,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6968,7 +6929,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index f5e0a410561..93cf9a7edfe 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgstr "Conta orixe"
 msgid "All Analytic Entries"
 msgstr "Todas as entradas Analíticas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas nos últimos 15 días"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -699,18 +694,6 @@ msgstr ""
 "Para conciliar os asentos da compañía debería ser o mesmo para todos os "
 "asentos"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas de Ventas"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1694,11 +1677,6 @@ msgstr "Secuencias Separadas de Diario"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por Tipo de Conta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2796,13 +2774,6 @@ msgstr "Nova Configuración Contable de Compañía"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por Conta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3203,8 +3174,8 @@ msgstr "Plantillas dos Plans de Contas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Xerar o Plan de Contas dende unha Plantilla de Contas"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6415,11 +6386,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6961,11 +6927,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7180,7 +7141,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10724,6 +10685,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "¡Non podes eliminar o movemento contabilizado: \"%s\"!"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas nos últimos 15 días"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -10755,6 +10719,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "o saldo de peche entrou polo verificador de caixa"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas de Ventas"
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡O estado do saldo é incorrecto!\n"
@@ -10838,6 +10806,9 @@ msgstr ""
 #~ "¡Valor do crédito ou débito incorrecto no modelo (Crédito + Débito debe ser "
 #~ "superior a \"0\")!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por Tipo de Conta"
+
 #, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "Ten que indicar unha conta para a entrada a cancelar"
@@ -10903,6 +10874,9 @@ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "O balance agardado(%.2f) é diferente do calculado: (%.2f)"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por Conta"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -10921,6 +10895,9 @@ msgstr ""
 #~ msgid "A/c Code"
 #~ msgstr "Código de Conta"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Xerar o Plan de Contas dende unha Plantilla de Contas"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Configuración do Plan de Contas"
 
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index f26e7260de8..481dee5a46e 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -61,7 +61,7 @@ msgstr ""
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "બાકી નીકળતી રકમ"
+msgstr ""
 
 #. module: account
 #: constraint:account.period:0
@@ -76,7 +76,7 @@ msgstr "ખાતાકીય ચલણ"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "આંતરીક વ્યાખ્યા"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
@@ -131,7 +131,7 @@ msgstr "મૂળ"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr ""
+msgstr "reconcile"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -171,17 +171,12 @@ msgstr ""
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "ખ૤ત૤કીય  સ્ત્રોત"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "તમામ વિશ્લેષક મુલ્યો"
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -211,7 +206,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "ખાતુ.વેરો"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10488,3 +10449,6 @@ msgstr ""
 
 #~ msgid "Are you sure ?"
 #~ msgstr "તમે ચોક્કસ છો?"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "છેલ્લા ૧૫ દિવસમા બનાવવામા આવેલ ભરતિયા"
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 49486650909..66f32672990 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 13d0bd32814..a292d43e286 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "खाता श्रोत"
 msgid "All Analytic Entries"
 msgstr "सभी विश्लेषणात्मक प्रविष्टियाँ"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 026bf3c805e..05c9c8e7052 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/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 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
+"PO-Revision-Date: 2012-06-20 16:19+0000\n"
 "Last-Translator: Goran Kliska <gkliska@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-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgstr "Iz konta"
 msgid "All Analytic Entries"
 msgstr "Sve analitičke stavke"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -686,18 +681,6 @@ msgstr "Period dnevnika"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Sve stavke zatvaranja moraju biti iz iste organizacije"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Potražna konta"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1676,11 +1659,6 @@ msgstr "Odvojeni brojači dnevnika"
 msgid "Responsible"
 msgstr "Odgovoran"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodaja po tipu konta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2774,13 +2752,6 @@ msgstr "Financijske postavke nove organizacije"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodaje po kontu"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3175,8 +3146,8 @@ msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generiraj kontni plan iz predloška"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -4495,7 +4466,8 @@ msgid ""
 "The real total does not match the computed total."
 msgstr ""
 "Molimo provjerite iznose na računu!\n"
-"Ukupna vrijednost se ne slaže sa izračunatom vrijednošću."
+"Ukupan iznos računa se ne slaže sa izračunatom vrijednošću.\n"
+"Provjerite polje \"Kontrola uk. iznosa\", stavke računa i poreze."
 
 #. module: account
 #: view:account.tax:0
@@ -6388,11 +6360,6 @@ msgstr "Upišite početni datum!"
 msgid "Supplier Refund"
 msgstr "Povrat URA"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Kokpit"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6971,11 +6938,6 @@ msgstr ""
 "\n"
 "npr. Knjiženje troškova plaće za %(month)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta prihoda"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7206,7 +7168,7 @@ msgstr "Predložak nadređenog  konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instalirajte kontni plan"
 
 #. module: account
@@ -10027,7 +9989,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Kontrola uk. iznosa"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -11396,6 +11358,9 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "Datum izrade računa"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
@@ -11509,6 +11474,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Knjiženja računa"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generiraj kontni plan iz predloška"
+
 #~ msgid "Account to reconcile"
 #~ msgstr "Konto za zatvaranje"
 
@@ -12001,6 +11969,10 @@ msgstr ""
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Saldo blagajne ne odgovara izračunatom saldu!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Potražna konta"
+
 #~ msgid "Next Partner to reconcile"
 #~ msgstr "Slijedeći partner za zatvaranje"
 
@@ -12066,6 +12038,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Test porezne grupe"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodaja po tipu konta"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Greška! Fiskalne godine se ne smiju preklapati"
 
@@ -12085,6 +12060,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Dnevnik"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodaje po kontu"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Postava kontnog plana"
 
@@ -12182,6 +12160,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  vrijednost: postotak"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta prihoda"
+
 #, python-format
 #~ msgid "You can not have two open register for the same journal"
 #~ msgstr "Ne možete otvoriti dvije blagajne u jednom dnevniku"
@@ -12466,6 +12447,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Kokpit"
+
 #, python-format
 #~ msgid ""
 #~ "Please define the Reserve and Profit/Loss account for current user company !"
@@ -12696,3 +12680,6 @@ msgstr ""
 
 #~ msgid "Liabilities"
 #~ msgstr "Pasiva"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalirajte kontni plan"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index ed742309114..a9d5e45b32f 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
-"X-Generator: Launchpad (build 15259)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgstr "Eredeti főkönyvi számla"
 msgid "All Analytic Entries"
 msgstr "Minden gyűjtőkód tétel"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Az elmúlt 15 napban készített számlák"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -696,18 +691,6 @@ msgstr "Könyvelési időszak"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Minden párosítandó tételnek ugyanahhoz a vállalathoz kell tartoznia."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Vevő számlák"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1693,11 +1676,6 @@ msgstr "Elkülönített napló sorszámok"
 msgid "Responsible"
 msgstr "Felelős"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Számlatípusonkénti értékesítés"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2791,13 +2769,6 @@ msgstr "Új vállalat könyvelési/pénzügyi beállítása"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Főkönyvi számlánkénti értékesítés"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3193,8 +3164,8 @@ msgstr "Számlatükör sablonok"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Számlatükör sablonból számlatükör előállítása"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6409,11 +6380,6 @@ msgstr "Adja meg a kezdő dátumot!"
 msgid "Supplier Refund"
 msgstr "Bejövő jóváíró számla"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Vezérlőpult"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6989,11 +6955,6 @@ msgstr ""
 "\n"
 "pl. %(date)s-i modell"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Árbevétel főkönyvi számlák"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7226,7 +7187,7 @@ msgstr "Gyűjtő főkönyvi számla sablon"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11198,6 +11159,10 @@ msgstr ""
 #~ msgid "Calculated Balance"
 #~ msgstr "Számított egyenleg"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Vevő számlák"
+
 #~ msgid "Next Partner to reconcile"
 #~ msgstr "Következő párosítandó partner"
 
@@ -11226,6 +11191,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "A következő partnerre lép"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Számlatípusonkénti értékesítés"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Nyitó egyenleg kiírása"
 
@@ -11261,6 +11229,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Hiba! Nem hozhat létre rekurzív kategóriákat!"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Főkönyvi számlánkénti értékesítés"
+
 #~ msgid "Reference Number"
 #~ msgstr "Hivatkozási szám"
 
@@ -11407,6 +11378,9 @@ msgstr ""
 #~ msgid "Balance Sheet (Liability Accounts)"
 #~ msgstr "Mérleg (forrás számlák)"
 
+#~ msgid "Dashboard"
+#~ msgstr "Vezérlőpult"
+
 #, python-format
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Nincs ilyen főkönyvi számla. Kérem, hozza létre!"
@@ -11422,6 +11396,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  értékelés: százalék"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Árbevétel főkönyvi számlák"
+
 #, python-format
 #~ msgid ""
 #~ "Can not find account chart for this company in invoice line account, Please "
@@ -11590,6 +11567,9 @@ msgstr ""
 #~ "Nem módosíthatja a napló vállalatát, mivel van kapcsolt rekordja a "
 #~ "tételsorokban."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Az elmúlt 15 napban készített számlák"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11727,6 +11707,9 @@ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "A várt egyenleg (%.2f) eltér a számított egyenlegtől (%.2f)."
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Számlatükör sablonból számlatükör előállítása"
+
 #, python-format
 #~ msgid ""
 #~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index af2092cacba..2f5be6ce13e 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-07 04:41+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgstr "Sumber Akun"
 msgid "All Analytic Entries"
 msgstr "Seluruh Ayat Analitik"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Invoice/Tagihan yang Dibuat dalam 15 Hari Terakhir"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -712,18 +707,6 @@ msgstr ""
 "Perusahaan harus merupakan entitas yang sama untuk merekonsiliasi seluruh "
 "catatan"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Akun Piutang"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1732,11 +1715,6 @@ msgstr "Urutan Jurnal yang terpisah"
 msgid "Responsible"
 msgstr "Bertanggung Jawab"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sales Berdasarkan tipe akun"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2832,13 +2810,6 @@ msgstr "Mengatur Keuangan Perusahaan Baru"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Penjualan menurut Akun"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3227,7 +3198,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6367,11 +6338,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6915,11 +6881,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Akun Penghasilan"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7139,7 +7100,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10928,6 +10889,9 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "Entri Akuntansi"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Invoice/Tagihan yang Dibuat dalam 15 Hari Terakhir"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr ""
@@ -10996,9 +10960,16 @@ msgstr ""
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr "Anda tidak dapat menggunakan akun umum ini di jurnal ini !"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Akun Piutang"
+
 #~ msgid "Description on invoices"
 #~ msgstr "Uraian pada tagihan"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Akun Penghasilan"
+
 #~ msgid "Period length (days)"
 #~ msgstr "Lama periode (hari)"
 
@@ -11183,6 +11154,9 @@ msgstr ""
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Akun ini tidak didefinisikan untuk direkonsiliasi!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sales Berdasarkan tipe akun"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! Anda tidak dapat menetapkan tumpang tindih tahun fiskal"
 
@@ -11229,5 +11203,8 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Jurnal"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Penjualan menurut Akun"
+
 #~ msgid "Reference Number"
 #~ msgstr "Nomor Referensi"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 19c69a3ca9f..21a69463045 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:12+0000\n"
+"PO-Revision-Date: 2012-06-20 16:27+0000\n"
 "Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.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-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgstr "Conto sorgente"
 msgid "All Analytic Entries"
 msgstr "Tutte le voci analitiche"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fatture create negli ultimi 15 giorni"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -704,18 +699,6 @@ msgstr ""
 "Per la riconciliazione si deve avere la stessa azienda per tutte le "
 "registrazioni."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Conti di Credito"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1702,11 +1685,6 @@ msgstr "Sequenze Separate per Sezionale"
 msgid "Responsible"
 msgstr "Responsabile"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendite per tipo di conto"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2802,13 +2780,6 @@ msgstr "Assetto finanziario della nuova azienda"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendite per conto"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3209,8 +3180,8 @@ msgstr "Template di piano dei conti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Genera un Piano dei Conti da un Template di Piano dei Conti"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6436,11 +6407,6 @@ msgstr "Inserire una data d'inizio!"
 msgid "Supplier Refund"
 msgstr "Resi a fornitore"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7001,11 +6967,6 @@ msgstr ""
 "\n"
 "Esempio: Il mio modello del %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Conti per entrate"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7222,7 +7183,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Installa un Piano dei Conti"
 
 #. module: account
@@ -11518,6 +11479,9 @@ msgstr ""
 #~ msgid "Generic Reports"
 #~ msgstr "Stampe generiche"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fatture create negli ultimi 15 giorni"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Conti per Tipo"
 
@@ -11564,6 +11528,9 @@ msgstr ""
 #~ msgid "J.C. or Move name"
 #~ msgstr "J.C. o nome movimento"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Genera un Piano dei Conti da un Template di Piano dei Conti"
+
 #~ msgid "wizard.company.setup"
 #~ msgstr "wizard.company.setup"
 
@@ -11719,6 +11686,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Vai al partner successivo"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendite per tipo di conto"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Errore! Non è possibile definire anni fiscali sovrapposti"
 
@@ -11750,6 +11720,9 @@ msgstr ""
 #~ msgid "  number of days: 30"
 #~ msgstr "  numero di giorni: 30"
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Il saldo cassa contanti non coincide con quello calcolato !"
@@ -11834,6 +11807,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "Spunta se l'utente può riconciliare registrazioni in questo conto."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendite per conto"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -11958,6 +11934,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "La valuta corrente non e' correttamente configurata"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Conti per entrate"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Errore ! Non è possibile creare membri associati ricorsivi."
 
@@ -12179,6 +12158,10 @@ msgstr ""
 #~ msgid "Cannot locate parent code for template account!"
 #~ msgstr "Non è possibile localizzare il codice padre del modello del conto!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Conti di Credito"
+
 #~ msgid ""
 #~ "Allows invoice lines to impact multiple analytic accounts simultaneously."
 #~ msgstr ""
@@ -12283,3 +12266,6 @@ msgstr ""
 #~ "registrazioni contabili create automaticamente dal sistema nella conferma "
 #~ "documenti (fatture, estratti conto bancari...) e saranno create con lo stato "
 #~ "di 'Pubblicate'."
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Installa un Piano dei Conti"
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 326f0a6f0b4..21c7bea93f3 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-12 01:28+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-06-20 16:18+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) <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-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "元アカウント"
 msgid "All Analytic Entries"
 msgstr "全ての分析エントリー"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "過去15日以内に作成済の請求書"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -679,18 +674,6 @@ msgstr "仕訳帳期間"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "エントリーを消し込みするために、会社は全てのエントリーに対して同じであるべきです。"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "売掛金"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1664,11 +1647,6 @@ msgstr "切り離された仕訳帳順序"
 msgid "Responsible"
 msgstr "担当"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "アカウントタイプ別売上"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2736,13 +2714,6 @@ msgstr "新会社の財務の設定"
 msgid "Configure Your Chart of Accounts"
 msgstr "勘定科目表の設定"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "アカウント別売上"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3130,8 +3101,8 @@ msgstr "勘定科目表テンプレート"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "チャートテンプレートから勘定科目表を生成"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6311,11 +6282,6 @@ msgstr "開始日を入力して下さい。"
 msgid "Supplier Refund"
 msgstr "仕入先返金"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "ダッシュボード"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6874,11 +6840,6 @@ msgstr ""
 "\n"
 "例えば、%(date)s の私のモデル"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "損益勘定"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7102,7 +7063,7 @@ msgstr "親アカウントテンプレート"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "会計表のインストール"
 
 #. module: account
@@ -9119,7 +9080,7 @@ msgstr "買掛金"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr "今年度"
+msgstr "今年"
 
 #. module: account
 #: view:board.board:0
@@ -10721,9 +10682,25 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Go to next partner"
 #~ msgstr "次のパートナへ"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "アカウントタイプ別売上"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "売掛金"
+
+#~ msgid "Sales by Account"
+#~ msgstr "アカウント別売上"
+
 #~ msgid "Tax codes"
 #~ msgstr "税金コード"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "チャートテンプレートから勘定科目表を生成"
+
+#~ msgid "Income Accounts"
+#~ msgstr "損益勘定"
+
 #~ msgid "Accounts by type"
 #~ msgstr "タイプ毎のアカウント"
 
@@ -10742,6 +10719,15 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Create an Account based on this template"
 #~ msgstr "このテンプレートに基づくアカウントの作成"
 
+#~ msgid "Dashboard"
+#~ msgstr "ダッシュボード"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "過去15日以内に作成済の請求書"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "会計表のインストール"
+
 #~ msgid "Open for bank reconciliation"
 #~ msgstr "銀行調整を開く"
 
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index d74695dae1b..a315d1da5b9 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index c874750fabc..1fed244473e 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 6bdb33f9a87..835f56db8a5 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "채권 계정"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "소득 계정"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10440,6 +10401,10 @@ msgstr ""
 #~ "defined !"
 #~ msgstr "공급자의 결제 조건에 정의된 결제 조건 라인 (결제)이 없습니다 !"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "채권 계정"
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "미결제 공급자 인보이스"
 
@@ -10466,5 +10431,8 @@ msgstr ""
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "계정이동 라인 \"%s\"은 유효하지 않습니다"
 
+#~ msgid "Income Accounts"
+#~ msgstr "소득 계정"
+
 #~ msgid "Accounts by type"
 #~ msgstr "타입 별 계정"
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index 2a10047977d..15b5489282c 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "ຕົ້້ນບັນຊີ"
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "ໃບເກັບເຍີນເຮັດຂຶ້ນຫຼັງຈາກ ໑໕ ວັນເເລ້ວນີ້"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10438,3 +10399,6 @@ msgstr ""
 
 #~ msgid "Positive"
 #~ msgstr "ສົມ"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "ໃບເກັບເຍີນເຮັດຂຶ້ນຫຼັງຈາກ ໑໕ ວັນເເລ້ວນີ້"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index c3199863018..0be0e9d6b28 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgstr "Sąskaitos šaltinis"
 msgid "All Analytic Entries"
 msgstr "Visi analitiniai įrašai"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Sukurtos sąskaitos per pastarąsias 15 dienų"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -671,18 +666,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debetinės sąskaitos"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1644,11 +1627,6 @@ msgstr "Atskiros žurnalo sekos"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2703,13 +2681,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3092,8 +3063,8 @@ msgstr "Sąskaitų plano šablonas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generuoti sąskaitų planą iš sąskaitų plano šablono"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6233,11 +6204,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Grąžinimas tiekėjui"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6778,11 +6744,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6997,7 +6958,7 @@ msgstr "Tėvinis sąskaitos šablonas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11054,6 +11015,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Didžiosios knygos įrašai"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generuoti sąskaitų planą iš sąskaitų plano šablono"
+
 #~ msgid "Open for reconciliation"
 #~ msgstr "Atverti sugretinimui"
 
@@ -11420,6 +11384,10 @@ msgstr ""
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Atidaryti gretinimo atšaukimui"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debetinės sąskaitos"
+
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Data nepatenka į pasirinktus fiskalinius metus."
@@ -11717,6 +11685,9 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Prašome nurodyti eiliškumą sąskaitų žurnale"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Sukurtos sąskaitos per pastarąsias 15 dienų"
+
 #~ msgid ""
 #~ "The Profit and Loss report gives you an overview of your company profit and "
 #~ "loss in a single document"
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 47f6ebafb0b..d8bd764ec46 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgstr "Konta Avots"
 msgid "All Analytic Entries"
 msgstr "Visi Analītiskie Ieraksti"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Rēķini, kas izveidoti pēdējās 15 dienās"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -696,18 +691,6 @@ msgstr "Žurnāla periods"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Kontējumu sasaisti var veikt tikai viena uzņēmuma ietvaros"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitoru Konti"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1692,11 +1675,6 @@ msgstr "Atsevišķa Žurnāla Numerācija"
 msgid "Responsible"
 msgstr "Atbildīgais"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Pārdošana pēc Konta tipa"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2785,13 +2763,6 @@ msgstr "Jauna uzņēmuma Grāmatvedības Uzstādījumi"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Pārdošanas dati pēc Konta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3187,8 +3158,8 @@ msgstr "Kontu Plāna Veidnes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Veidot Kontu plānu no Veidnes"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6369,11 +6340,6 @@ msgstr "Ievadiet Sākuma Datumu!"
 msgid "Supplier Refund"
 msgstr "Ienākošie Kredītrēķini"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Rīku panelis"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6945,11 +6911,6 @@ msgstr ""
 "\n"
 "piem., Mans %(date)s modelis"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Ieņēmumu Konti"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7165,7 +7126,7 @@ msgstr "Virskonta Veidne"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11185,6 +11146,9 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Neapstiprināti Ienākošie Rēķini"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Rēķini, kas izveidoti pēdējās 15 dienās"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11206,6 +11170,10 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Izraksta bilance ir kļūdaina!\n"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitoru Konti"
+
 #~ msgid "Total With Tax"
 #~ msgstr "Kopā ar Nodokli"
 
@@ -11255,6 +11223,9 @@ msgstr ""
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Konts nav atzīmēts, kā sasaistāms!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Pārdošana pēc Konta tipa"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Kļūda! Nav iespējams definēt fiskālos gadus, kuru periodi pārklājas."
 
@@ -11294,6 +11265,9 @@ msgstr ""
 #~ "Nav iespējams mainīt uzņēmumu žurnālam, jo tas satur grāmatojumus, kas "
 #~ "attiecas uz noteiktu uzņēmumu."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Pārdošanas dati pēc Konta"
+
 #~ msgid "Reference Number"
 #~ msgstr "Atsauces Nr."
 
@@ -11303,6 +11277,9 @@ msgstr ""
 #~ "Please create one."
 #~ msgstr "Attiecīgajam datumam nav definēts fiskālais gads! Tas ir jāizveido."
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Veidot Kontu plānu no Veidnes"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Kontu Plāna Konfigurācija"
 
@@ -11414,6 +11391,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Atmaksas Tips"
 
+#~ msgid "Dashboard"
+#~ msgstr "Rīku panelis"
+
 #~ msgid ""
 #~ "You cannot create entries on different periods/journals in the same move"
 #~ msgstr "Nevar vienlaicīgi veidot ierakstus dažādos periodos/žurnālos"
@@ -11473,6 +11453,9 @@ msgstr ""
 #~ msgid "Acc. Type Name"
 #~ msgstr "Konta Tips"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Ieņēmumu Konti"
+
 #~ msgid "Year :"
 #~ msgstr "Gads :"
 
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index d33ec56f1a3..27d80955567 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:50+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -31,7 +31,7 @@ msgstr "Системско плаќање"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Останати поставки"
+msgstr "Друга конфигурација"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -39,11 +39,13 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Одреди го редоследот на прикажување во извештајот 'Сметсководство \\ "
+"Известување \\ Општо известување \\ Даноци \\ Извештај за даноци'"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Порамнување на записи во Главна книга"
+msgstr "Порамни запис во картица"
 
 #. module: account
 #: view:account.account:0
@@ -51,43 +53,43 @@ msgstr "Порамнување на записи во Главна книга"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Статиски на сметки"
+msgstr "Статистики на конто"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Профактура/Отворени/Платени фактури"
+msgstr "Про-фактура/Отворени/Платени фактури"
 
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Остатоци"
+msgstr "Остаток"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Грешка! Траењето на периодот е невалиден. "
+msgstr "Грешка ! Времетраењето на периодот(ите) е/се погрешно. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "Валута на налогот"
+msgstr "Валута на конто"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Дефиниција на подкатегорија"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Ставката  \"%s\"  од дневникот не е валидна"
+msgstr "Ставката на картицата \"%s\" не е валидна."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Постари побарувања до денес"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -97,12 +99,12 @@ msgstr "Увези од фактура или плаќање"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Вкупно задолжување"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -110,6 +112,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Доколку не ги порамните трансакциите, мора да ги потврдите сите акции кои се "
+"поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
 
 #. module: account
 #: constraint:account.journal:0
@@ -117,6 +121,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Грешка конфигурација! Избраната валута исто така треба да биде споделена од "
+"страна на стандардните конта."
 
 #. module: account
 #: report:account.invoice:0
@@ -154,45 +160,42 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Доколку активното поле е подесено на Грешка, ќе ви овозможи да го сокриете "
+"рокот за плаќање без да го отстраните."
 
 #. module: account
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr "Предупредување!"
+msgstr "Внимание!"
 
 #. module: account
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Картица разно"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Извор на конто"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
 msgstr "Сите аналитички влезови"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Фактури направени во последните 15 дена"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr "Назив на колона"
+msgstr "Ознака на колона"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "Дневник: %s"
+msgstr "Картица: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -201,9 +204,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Го дава типот на аналитички дневник. Кога е потребно за документ (на пр. "
-"фактура) за да се креираат аналитички влезови, OpenERP ќе го побара "
-"соодветниот дневник од ист тип."
+"Го дава типот на аналитичката картица. Кога е потребно за некој документ (на "
+"пр. фактура) да се креираат аналитички записи, OpenERP ќе ја побара "
+"соодветната картица од ист тип."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -214,7 +217,7 @@ msgstr "Урнеци за данок"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "account.tax"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -228,28 +231,30 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Изберете го ова поле доколку не сакате ДДВ поврзан со овој даночен код да се "
+"појавува на фактурите"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1241
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "Фактурата '%s' е платена делумно: %s%s од %s%s (%s%s остануваат)"
+msgstr "Фактурата '%s' е платена делумно: %s%s од %s%s (%s%s преостанува)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Сметководствените записи се инпут од порамнувањето."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr "Белгиски извештај"
+msgstr "Белгиски извештаи"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "Не може да додавате/менувате записи во затворена книга"
+msgstr "Не можете да додавате/менувате влезови во затворена картица."
 
 #. module: account
 #: help:account.account,user_type:0
@@ -258,11 +263,14 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Типот на конто се користи само за информативни цели, за да генерира законски "
+"извештаи кои се специфични за земјата, и да ги подеси правилата за затварање "
+"на фискална година и генерирање на отворени записи."
 
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Вкупно :"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -284,7 +292,7 @@ msgstr "Дозволи отпишување"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Избери период за анализа"
+msgstr "Избери период за анализи"
 
 #. module: account
 #: view:account.move.line:0
@@ -300,7 +308,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Име на поле"
 
 #. module: account
 #: help:account.installer,charts:0
@@ -308,6 +316,9 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Ги инсталира локализираните контни планови за да се совпадне колку што е "
+"можно поблиску со сметководствените потреби на вашата компанија засновано на "
+"вашата земја."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -318,17 +329,21 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Не може да се пронајде картица на конто од %s тип за оваа компанија.\n"
+"\n"
+"Можете да ја креирате во менито: \n"
+"Конфигурација/Финансиско сметководство/Сметки/Картици."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Непорамнето конто"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Својства на набавката"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -337,11 +352,15 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Овде може да го подесите форматот во кој сакате овој извештај да биде "
+"прикажан. Доколку оставите автоматско форматирање, ќе биде пресметано врз "
+"основа на хиерархијата на финансиските извештаи (auto-computed field "
+"'level')."
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr "Конфигурирање"
+msgstr "Конфигурирај"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -350,7 +369,7 @@ msgstr "Конфигурирање"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Јуни"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -359,42 +378,46 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Овој преглед се користи од страна на сметководителите со цел масивно снимање "
+"на записи во OpenERP. Ставките од картицата се креираат од страна на OpenERP "
+"доколку користите изводи од банка, Готовински сметки, или плаќања од "
+"Клиентот/Добавувачот."
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Не може да креирате ставки на картица на конто од тип прегледај."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "account.tax.template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "Дата на креирање"
+msgstr "Датум на креирање"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Враќање на нарачка"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Отварање/Затварање на ситуација"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Валута која се користи за да се внесе извод"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -407,16 +430,18 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Ова поле содржи информации поврзани со нумерирањето на записите во оваа "
+"картица."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Стандарда дебитна сметка"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Вкупно кредит"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -429,12 +454,12 @@ msgstr ""
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Урнек на графикон"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Износ изразен во друга опциона валута."
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -448,6 +473,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Кога периодот на картицата е креиран. Состојбата е „Нацрт“. Доколку "
+"извештајот е испечатен доаѓа до состојба „Испечатено“. Кога сите трансакции "
+"за направени, доаѓа во состојба „Завршено“."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -486,7 +514,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr "Дневник"
+msgstr "Картица"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -501,7 +529,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Сметка која се користи во овој дневник"
+msgstr "Сметка која се користи во оваа картица"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -519,33 +547,33 @@ msgstr "Сметка која се користи во овој дневник"
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Избери контен план"
 
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "Името на компанијата мора да биде единствено!"
+msgstr "Името на компанијата мора да биде уникатно !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Враќање на фактура"
+msgstr "Повлекување на фактура"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Нема порамнети трансакции"
+msgstr "Не порамнети трансакции"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Соработник"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -563,7 +591,7 @@ msgstr "Затвори фискална година"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr "Сметководителот ја потврдува изјавата"
+msgstr "Сметководителот ја потврдува изјавата."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -577,12 +605,12 @@ msgstr "Сите"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr "Адреса на фактурата"
+msgstr "Адреса за фактурирање"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "3 месечно"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -590,11 +618,13 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Доколку не ги порамните трансакциите, мора да ги верификувате сите акции кои "
+"се поврзани со овие трансакции бидејќи тие нема да бидат исклучени"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr "   30 дена   "
+msgstr "   30 денови   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -605,39 +635,39 @@ msgstr "Секвенци"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Вредност на извештај"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "Мапирање на даноци"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Централизиран дневник"
+msgstr "Центализирана картица"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "Главната секвенца мора да биде различна од тековната!"
+msgstr "Главната секвенца мора да се разликува од тековната !"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr "Не е пронајден период или има повеќе од еден период за дадена дата."
+msgstr "Не е пронајден период или има повеќе од еден период за даден датум."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Конто на даночен код"
 
 #. module: account
 #: code:addons/account/account.py:3116
 #, python-format
 msgid "SAJ"
-msgstr ""
+msgstr "SAJ"
 
 #. module: account
 #: view:account.period:0
@@ -653,12 +683,12 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Период на отварање записи"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "Период на картица"
 
 #. module: account
 #: code:addons/account/account_move_line.py:750
@@ -666,18 +696,7 @@ msgstr ""
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
-
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
+"За да ги порамните записите компанијата мора да биде иста за сите влезови"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -685,41 +704,43 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Датумот на записот во картицата не е во дефинираниот период! Треба да го "
+"промените датумот или да го отстраните ова ограничување од картицата."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Извештај од главната книга"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr "Отвори повторно"
+msgstr "Повторно отварање"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "Дали сакате да креирате влезови?"
+msgstr "Дали сте сигурни дека сакате да креирате записи?"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr "Принтај фактура"
+msgstr "Печати фактура"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Партнери кои се порамнети денес"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "Картица за продажба во оваа година"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Прикажи подкатегории со хиерархија"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -737,18 +758,18 @@ msgstr "Графикони"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Аналитички влезови преку линија"
+msgstr "Аналитички записи по ставка"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr "Метод на рефундирање"
+msgstr "Метод на повлекување"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "Можете единствено да ја промените валутата за нацрт фактурата"
+msgstr "Можете да ја промените единствено валутата за Нацрт фактурата !"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
@@ -776,7 +797,7 @@ msgstr "Тип"
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr ""
+msgstr "Недостасуваат даноци! Притиснете на копчето пресметај даноци."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -786,12 +807,12 @@ msgstr ""
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Референца на партнерот од оваа фактура."
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Фактури и поврати на добавувач"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -799,17 +820,19 @@ msgstr ""
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Непорамнување"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
 msgstr ""
+"На 14 нето денови 2 проценти, преостанатиот износ на 30 денови до крај на "
+"месецот."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "Сметководствен аналитички дневник"
+msgstr "Аналитичка картица на конто"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
@@ -819,7 +842,7 @@ msgstr "Автоматско порамнување"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C./Име на движење"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -829,10 +852,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
-"Кога правите мулти-валутни трансакции, може да изгубите или добиете одредена "
-"сума како резултат на промените во девизниот курс. Ова мени ви дава "
-"предвидување на Добивката или Загубата која ќе ја реализирате доколку овие "
-"трансакции се заврѓат денеска.  Само за сметките кои имаат поставено "
+"Кога правите повеќе-валутни трансакции, може да загубите или добиете "
+"одредена сума како резултат на промените во девизниот курс. Ова мени ви дава "
+"предвидување на Добивката или Загубата која ќе ја остварите доколку овие "
+"трансакции беа завршени денес. Единствено за сметки кои имаат подесено "
 "секундарна валута."
 
 #. module: account
@@ -854,6 +877,7 @@ msgstr "денови"
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
+"Доколку означите, новиот контен план нема да го содржи ова стандардно."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:110
@@ -862,6 +886,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Не може да %s фактура која е веќе порамнета, фактурата мора да биде првин "
+"непорамнета. Можете единствено да ја повлечете оваа фактура"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -876,7 +902,7 @@ msgstr "Пресметка"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "Откажи: повлечи фактура и порамни"
+msgstr "Откажи: врати фактура и порамни"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -887,14 +913,14 @@ msgstr "Вредности"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Просечно одолжување за плаќање"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "Карта на даноци"
+msgstr "Графикон на даноци"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -913,6 +939,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Не може да го потврдите овој запис на картицата бидејќи сметката \"%s\" не "
+"припаѓа на контниот план \"%s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -951,32 +979,32 @@ msgstr "Консолидирање"
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr ""
+msgstr "Обврска"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Напредно пребарување"
+msgstr "Проширени филтри..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Централизиран дневник"
+msgstr "Централизирана картица"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Повлечи продажба"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Извод од банка"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr ""
+msgstr "Премести ставка"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -995,12 +1023,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Набавки"
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Модел на записи"
 
 #. module: account
 #: field:account.account,code:0
@@ -1017,7 +1045,7 @@ msgstr ""
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -1027,7 +1055,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Нема аналитичка картица !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1036,23 +1064,23 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr ""
+msgstr "Биланс на партнер"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Име на конто."
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "Конто Резерва и профит/Загуба"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Недела од годината"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
@@ -1066,16 +1094,18 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Не може да го промените типот на контото од '%s' во '%s' тип бидејќи содржи "
+"ставки во картицата!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Сортирај по"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Избери фискална година за затварање"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1083,6 +1113,8 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Овие типови се дефинирани спрема вашата земја. Типот содржи повеќе "
+"информации за контото и неговите особености."
 
 #. module: account
 #: code:addons/account/account_move_line.py:842
@@ -1090,45 +1122,46 @@ msgstr ""
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
 msgstr ""
+"Мора да обезбедите сметка за отпишување/промена на записот за разликата !"
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Опции за применливост"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Во спор"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "Благајнички регистри"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: view:account.analytic.account:0
 #: model:res.groups,name:account.group_account_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менаџер"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Генерирајте записи пред:"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Небалансирани ставки во картица"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1136,17 +1169,17 @@ msgstr ""
 #: code:addons/account/account.py:3003
 #, python-format
 msgid "Bank"
-msgstr ""
+msgstr "Банка"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "Почеток на период"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Потврди изјава"
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1154,22 +1187,24 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Вкупен износ (во секундарна валута) за трансакции направени во секундарната "
+"валута за оваа сметка."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "Замени данок"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Централизирање на кредит"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "Сите месечни продажби по тип"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1179,27 +1214,32 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Со фактурите на добавувачот може да внесете и менаџирате фактури издадени од "
+"вашите добавуавчи. OpenERP исто така може да денерира нацрт фактури "
+"автоматски од налозите за нарачка или приемниците. На овој начин, може да ја "
+"контролирате фактурата од вашиот добавувач според она што го нарачувате или "
+"примате."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Урнеци за даночни кодови"
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Откажи фактури"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Кодот ќе биде прикажан на извештаите."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Даноци користени при нарачките"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1207,22 +1247,22 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Даночен код"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Однос на излезни валути"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
-msgstr ""
+msgstr "Ситуација"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Движење на оваа ставка од записот."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -1231,11 +1271,13 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Не можете да го користите ова општо конто во оваа картица, проверете го "
+"јазичето 'Контроли на влезови' на соодветната картица !"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "# од трансакцијата"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1243,30 +1285,30 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr ""
+msgstr "Ознака на запис"
 
 #. module: account
 #: code:addons/account/account.py:1129
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr ""
+msgstr "Не можете да измените/избришете картица со влезови за овој период !"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Референца на документот кој ја произвел оваа фактура."
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr ""
+msgstr "Други"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Нацрт претплата"
 
 #. module: account
 #: view:account.account:0
@@ -1295,25 +1337,25 @@ msgstr ""
 #: model:ir.model,name:account.model_account_account
 #: field:report.account.sales,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Конто"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Вклучено во основната сума"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Анализа на влезови"
 
 #. module: account
 #: field:account.account,level:0
 #: field:account.financial.report,level:0
 msgid "Level"
-msgstr ""
+msgstr "Ниво"
 
 #. module: account
 #: report:account.invoice:0
@@ -1328,74 +1370,74 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Даноци"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:69
 #: code:addons/account/wizard/account_report_common.py:144
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Изберете период на започнување и завршување"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Профит и загуба"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Урнеци за сметки"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Барај урнек за данок"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr ""
+msgstr "Порамни влезови"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Задоцнети плаќања"
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Почетен биланс"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Ресетирај до нацрт"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr ""
+msgstr "Банкарски информации"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "Опции за извештај"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Анализи на ставки од картица"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Партнери"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1404,17 +1446,17 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Банкарски извод"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "Конто на побарувања"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Централна картица"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1422,12 +1464,12 @@ msgstr ""
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Со билансот не е еднакво на 0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Барај даноци"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1437,39 +1479,39 @@ msgstr ""
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "Креирај записи"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "# од ставки"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr ""
+msgstr "Максимален отпишан износ"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Пресметај даноци"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "# од броеви"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Прескокни 'Нацрт' Состојба за рачни записи"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Вкупно без данок"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1479,11 +1521,15 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Записот во картицата е составен од неклоку ставки на  картицата, од кои "
+"секоја е дебитна или кредитна трансакција. OpenERP автоматски креира еден "
+"запис на картицата по сметководствен документ: фактура, поврат, плаќање на "
+"добавувач, банкарски извод и др."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "# од влезови "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1491,17 +1537,19 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Преку отселектирање на активното поле, може да ја сокриете фискалната "
+"позиција без да ја отстраните."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Привремена табела која се користи за преглед на контролна табла"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Повлекувања на добавувач"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1512,48 +1560,48 @@ msgstr ""
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Затворено"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Повторување на записи"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Урнек за фискална позиција"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Порамнети трансакции"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Колони"
 
 #. module: account
 #: report:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr ""
+msgstr "и картици"
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Без данок"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -1563,30 +1611,30 @@ msgstr ""
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Барај банкарски изводи"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Необјавени ставки на картица"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "Платежна сметка"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr ""
+msgstr "Конто за поврат на данок"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Ставки на извод"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1598,23 +1646,29 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Банкарскиот извод е резиме на сите финансиски трансакции кои се појавуваат "
+"во текот на даден временски период на контото задолжување, кредитна картичка "
+"или било кој друг тип на финансиско конто. Почетниот биланс ќе биде "
+"предложен автоматски и завршниот биланс ќе се најде на вашиот извод. Кога "
+"сте во колоната плаќање од ставката, може да притиснете F1 за да го отворите "
+"формуларот за порамнување."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Датум/Код"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Општо конто"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Платежен лимит"
 
 #. module: account
 #: report:account.invoice:0
@@ -1624,18 +1678,18 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Фактура"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Да се фактурираат аналитички трошоци"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Секвенца на фискална година"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1645,12 +1699,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
+msgstr "Одговорен"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1658,34 +1707,36 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Откажи фактура: Креира повлечена фактура, ја потврдува и порамнува за да ја "
+"откаже тековната фактура."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Фактурирање"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Непознат партнер"
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Годишна сума"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1429
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Избравте единица мерка која не е компатибилна со производот."
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Овој волшебник ќе ја промени валутата на фактурата"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1694,16 +1745,19 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Го прикажува контниот план на вашата компанија по фискална година и филтер "
+"по период. Имате комплетен преглед на дрвото од сите ставки на картицата по "
+"код на контото со кликање на контото."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Чекам конта"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr ""
+msgstr "Даночна декларација"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1711,16 +1765,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Доколку активното поле е подесено на Грешка, ќе можете да го сокриете "
+"периодот на картицата без да го отстраните."
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "Задолжување на добавувачот"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Побарувања и обврски"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1730,49 +1786,49 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Сите партнери"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Аналитички контен план"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr ""
+msgstr "Мои записи"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Реф. на добавувач:"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Корисникот %s нема право на пристап до %s картица !"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Овие периоди може да се преклопат."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Нацрт изјава"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Даночна декларација: Белешки за кредит"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Кредитен износ"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1780,55 +1836,55 @@ msgstr ""
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Грешка!"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Погрешна кредитна или дебитна вредност во сметководствениот запис !"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Анализи на фактури"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Затвори период"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Конфигурирај фискална година"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Записи по ставка"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Засновано на"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Запис на картица"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Даночна декларација: фактури"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Вкупно"
 
 #. module: account
 #: view:account.account:0
@@ -1837,34 +1893,34 @@ msgstr ""
 #: model:ir.model,name:account.model_account_treasury_report
 #: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Анализи на трезор"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Грешка! Не може да креирате рекурсивни компании."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Картица за продажба/набавка"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Аналитичко конто"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "Потврдете дека контото е дефинирано во картицата."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Валидно"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -1875,12 +1931,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Категорија на производ"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -1889,18 +1945,21 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Оваа сметка се користи за пренесување на Профит/Загуба (Доколку е профит: "
+"износот ќе се додаде, Загуба : Износот ќе се одземе), како што е пресметано "
+"во Извештајот Профит и Загуба"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Споредба помеѓу сметководство и записи за плаќање"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr ""
+msgstr "Дефиниција на данок"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1908,6 +1967,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
+"Означете го ова поле доколку сакате да користите различна секвенца за секоја "
+"креирана картица. Во спротивно, сите ќе користат иста секвенца."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1916,6 +1977,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Додава колона за валута доколку валутата се разликува од валутата на "
+"компанијата"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1923,18 +1986,20 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Доколку е подесено на Точно не го прифаќајте записот доколку датумот на "
+"записот не е во датумите на периодот"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Мора да дефинирате аналитичка картица од типот '%s'!"
 
 #. module: account
 #: field:account.installer,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Слика"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1943,17 +2008,21 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Избраното конто од вашиот запис на картицата бара да се обезбеди секундарна "
+"валута. Треба да ја одстраните секундарната валута од контото или да "
+"изберете повеќе-валутен преглед на картицата."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
+"Прави генерички систем за полесно подготвување на финансиските извештаи."
 
 #. module: account
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Износ без данок"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1961,16 +2030,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Доколку активното поле е подесено на Грешка, ќе дозволи да го сокриете "
+"данокот без да го отстраните."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Ставки на аналитичка картица поврзани со продажна картица."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Италик текст (помал)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1983,44 +2054,44 @@ msgstr ""
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Нацрт"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
-msgstr ""
+msgstr "ДДВ декларација"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Ставки на парцијален запис"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Фискална година"
 
 #. module: account
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Отворени записи"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Конта за порамнување"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Увезување на изјава во системот од електронски фајл"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Увези од фактура"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2029,17 +2100,17 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Јануари"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Потврди"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Оваа фискална година"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -2052,12 +2123,14 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Погрешен период ! Некои периоди се преклопуваат или датумот на периодот не е "
+"во опсегот на фискалната година. "
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Треба да доделите аналитичка картица на '%s' картица!"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2065,7 +2138,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Про-фактура"
 
 #. module: account
 #: code:addons/account/account.py:1461
@@ -2073,7 +2146,7 @@ msgstr ""
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "Нема стандардно дебитно конто дефинирано на картицата  \"%s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2089,7 +2162,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "Барај урнеци на контен план"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1277
@@ -2099,6 +2172,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Не може да се креира автоматска секвенца за овој дел!\n"
+"Внесете секвенца во дефиницијата на картицата за автоматско нумерирање или "
+"креирајте секвенца рачно за овој дел."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2107,11 +2183,13 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Не може да промените компанија на оваа картица бидејќи нејзиниот поврзан "
+"рапис постои во ставките на картицата"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Код на клиентот"
 
 #. module: account
 #: view:account.installer:0
@@ -2120,6 +2198,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Стандардниот Контен план одговара на вашата избрана држава. Доколку не "
+"постои сертифициран контен план за вашата држава, ќе се инсталира "
+"генеричкиот и ќе биде избран стандардно."
 
 #. module: account
 #: view:account.account.type:0
@@ -2138,32 +2219,32 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Опис"
 
 #. module: account
 #: code:addons/account/account.py:3119
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Стартување"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Приходна сметка"
 
 #. module: account
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "Нема дефинирано Сметководствена картица од типот Продажба/Набавка!"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -2173,29 +2254,29 @@ msgstr ""
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Својства на сметководство"
 
 #. module: account
 #: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Записи сортирани по"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Промени во"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "# од количината на производот "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Урнек на производ"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2232,7 +2313,7 @@ msgstr ""
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Фискална година"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2251,12 +2332,12 @@ msgstr ""
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Чувај празно за целата отворена фискална година"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Ставка на конто"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2264,7 +2345,7 @@ msgstr ""
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "Нема стандардно кредитно конто дефинирано на картицата \"%s\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2273,11 +2354,14 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Подесете ги вашите сметководствени картици. За банкарските конта, подобро е "
+"да ја користите алатката 'Подесете ги вашите Банкарски конта' која "
+"автоматски ќе креира конта и картици за вас."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Запис на конто"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2287,7 +2371,7 @@ msgstr ""
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Главна секвенца"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:402
@@ -2296,6 +2380,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"За да избришете банкарски извод, прво мора да го откажете за да ги избриреше "
+"ставките на поврзаната картица."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2307,29 +2393,29 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Рок за плаќање"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "Фискална позиција"
 
 #. module: account
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Грешка ! Не моеже да креирате рекурсивни конта."
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "Обележете го ова поле"
 
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "Филтри"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2344,24 +2430,24 @@ msgstr ""
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Отвори"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Нацрт состојба на фактура"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Порамнување на партнер"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Код на данокот на контото"
 
 #. module: account
 #: code:addons/account/account_invoice.py:572
@@ -2372,23 +2458,27 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Не може да пронајде картица на конто од %s тип за оваа компанија.\n"
+"\n"
+"Можете да ја креирате во менито: \n"
+"Конфигурација\\Финансиско сметководство\\Конта\\Картици."
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% Однапред Крај 30 дена"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "Непорамнети записи"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Основен код"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
@@ -2401,7 +2491,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Знак за основен код"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2413,17 +2503,24 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ова мени ја печати ДДВ декларацијата заснована на фактури или плаќања. "
+"Изберете еден или неколку периоди од фискалната година. Информациите кои се "
+"потребни за даночната декларација автоматски се добиваат преку OpenERP од "
+"фактурите (или плаќањата, во некои земји). Овие податоци се ажурираат во "
+"реално време. Ова е мошне корисно бидејќи ви овозможува во било кое време да "
+"го прегледате данокот што го должите на почетокот и на крајот на месецот или "
+"кварталот."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Централизирање на задолжување"
 
 #. module: account
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Потврди нацрт фактури"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2432,12 +2529,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ден"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Сметки за обновување"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2448,17 +2545,17 @@ msgstr ""
 #: code:addons/account/account.py:3117
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "EXJ"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Даноци на добавувачот"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "записи"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2469,21 +2566,26 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Доколку користите рокови за плаќање, крајниот датум ќе биде пресметан "
+"автоматски при генерирањето на сметководствените записи. Доколку ги оставите "
+"рокот за плаќање и крајниот датум празни, тоа значи директно плаќање. Рокот "
+"за плаќање може да пресмета неколку крајни датуми, на пример 50% сега, 50% "
+"за еден месец."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr ""
+msgstr "Избери период"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Изјави"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Премести име"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2491,12 +2593,14 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Фискалната позиција ќе ги определи даноците и сметките кои се користат за "
+"партнерот."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Извештајот ви дава преглед на ситуацијата од одредена картица"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
@@ -2509,7 +2613,7 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Данок"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2520,7 +2624,7 @@ msgstr ""
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Аналитичко конто"
 
 #. module: account
 #: view:account.account:0
@@ -2533,52 +2637,52 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Конта"
 
 #. module: account
 #: code:addons/account/account_invoice.py:369
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Грешка конфигурација!"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "Датум:"
 
 #. module: account
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr ""
+msgstr "Ознака"
 
 #. module: account
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Сметководствени информации"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Специјално пресметување"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Банкарско порамнување"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Попуст(%)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2587,7 +2691,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr ""
+msgstr "Реф."
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -2598,27 +2702,29 @@ msgstr ""
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Погрешна кредитна или дебитна вредност во моделот, тие мора да бидат "
+"позитивни!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Автоматско порамнување"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Платено/Порамнето"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Повлечи основен код"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Точно"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2627,7 +2733,7 @@ msgstr ""
 #: view:account.move.line:0
 #: view:accounting.report:0
 msgid "Dates"
-msgstr ""
+msgstr "Датуми"
 
 #. module: account
 #: field:account.chart.template,parent_id:0
@@ -2644,7 +2750,7 @@ msgstr ""
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "Новата валута не е правилно конфигурирана !"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2652,6 +2758,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Автоматски генерира записи врз основа на тоа што е внесено во системот пред "
+"одреден датум."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2664,7 +2772,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Сметководствени записи"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -2674,7 +2782,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Попуст (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2685,35 +2793,33 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Означете го ова поле доколку не сакате новите записи на картицата да "
+"поминуваат преку состојбата 'нацрт' и наместо тоа да одат директно во "
+"состојба 'објавено' без било какво рачно потврдување.\n"
+"Забележете дека записите на картицата кои се автоматски креирани од страна "
+"на системот секогаш ја прескокнуваат оваа фаза."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Финансиско подесување на нова компанија"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
+msgstr "Конфигурирајте го вашиот контен план"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Овој волшебник ќе креира повторливи сметководствени записи"
 
 #. module: account
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "Нема дефинирано секвенца за картицата !"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -2721,7 +2827,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Треба да дефинирате аналитичка картица на  '%s' картица!"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2730,6 +2836,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Потребна ви е отворена картица со означена централизација за да го подесите "
+"почетнио биланс!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2741,20 +2849,20 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Нереализирани добивки и загуби"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Клиенти"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Период до"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2763,12 +2871,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Записите за плаќање се вториот инпут од порамнувањето."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2777,7 +2885,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Октомври"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2785,28 +2893,33 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Опциона количина изразена преку оваа ставка, на пр: број на продадени "
+"производи. Количината не е задолжително барање но е мошне корисна за некои "
+"извештаи."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Ставка 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Се бара"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Сметка за трошоци"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Оставете празно за да го употребите периодот од датумот на потврдата "
+"(фактура)."
 
 #. module: account
 #: help:account.bank.statement,account_id:0
@@ -2817,7 +2930,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Износ на основен код"
 
 #. module: account
 #: code:addons/account/account_invoice.py:392
@@ -2826,17 +2939,19 @@ msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
+"Не можете да избришете фактура која е отворена или платена. Ви сугерираме "
+"наместо тоа да ја повлечете."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Стандарден данок на продажба"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Фактурата  '%s' е потврдена."
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2845,16 +2960,19 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Датум на доспевање на генерираните записи за овој модел. Може да изберете "
+"помеѓу датумот на креирање или датумот на креирање на записите плус роковите "
+"за плаќање на партнерот."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Финансиско сметководство"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Профит и загуба"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2868,7 +2986,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Фискална позиција"
 
 #. module: account
 #: code:addons/account/account_invoice.py:735
@@ -2877,17 +2995,19 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Различна даночна основа!\n"
+"Притиснете пресметај за да ја ажурирате даночната основа."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Еден партнер по страна"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Children"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2895,7 +3015,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Фактура на клиент"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -2903,52 +3023,54 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Подесете доколку износот на данокот треба да биде вклучен во основниот износ "
+"пред пресметување на следните даноци."
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Корисник одговорен за оваа картица"
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Барај период"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Валута на фактура"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Извештаи за конто"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Рокови"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "Готовински трансакции"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Банкарска сметка"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Листа на урнеци на данок"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Картица за продажба/набавка"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -2959,55 +3081,60 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Ова ќе селектира како курсот на тековната валута за излезните трансакции е "
+"пресметан. Во најголемиот број земји законскиот метод е \"просек\" но само "
+"неколку софтверски системи се способни да го управуваат ова. Така ако "
+"увезете од друг софтверски систем може да го користите курсот на датумот. "
+"Влезните трансакции секогаш го користат курсот на датумот."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Број на цифри ки треба да се употребат за кодот на сметката"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Име на ставка"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Барај фискална година"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Секогаш"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месец-1"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Вкупна количина"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Отпиши конто"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Модел"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Даночни основи од даночната декларација."
 
 #. module: account
 #: selection:account.account,type:0
@@ -3015,44 +3142,44 @@ msgstr ""
 #: selection:account.entries.report,type:0
 #: selection:account.financial.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Преглед"
 
 #. module: account
 #: code:addons/account/account.py:3363
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
-msgstr ""
+msgstr "BNK"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr ""
+msgstr "Аналитички ставки"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Про-фактури"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Електронски фајл"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Кредит на клиентот"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Ден од месецот: 0"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Започнува на"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3062,7 +3189,7 @@ msgstr ""
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Го дава редоследот на секвенцата на колоната од картицата."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3070,6 +3197,7 @@ msgstr ""
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Ги принудува сите движења на ова конто да ја имаат оваа секундарна валута."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3077,22 +3205,25 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Овој волшебник ќе ги потврди сите записи на картицата од одредена картица и "
+"период. Откако еднаш се потврдени записите во картицата, не може повеќе да "
+"ги ажурирате."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Урнеци за конетн план"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Продажби по тип за овој месец"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3122,13 +3253,13 @@ msgstr ""
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "Нема дефинирано картица крај на година за фискалната година"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr ""
+msgstr "Остави празно за да употребите конто за тошоци"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3162,12 +3293,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr ""
+msgstr "Картици"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Преостанати партнери"
 
 #. module: account
 #: view:account.subscription:0
@@ -3184,7 +3315,7 @@ msgstr ""
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Нарачка"
 
 #. module: account
 #: view:account.installer:0
@@ -3195,42 +3326,42 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Износ на вредност: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Сметководствена контролна табла"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 #: field:account.treasury.report,starting_balance:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Почетен биланс"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1332
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "Нема дефинирано партнер !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Затвори период"
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Прикажи детали"
 
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "ДДВ:"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3243,53 +3374,55 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Износот изразен во поврзаната валута на контото не е еднаков со оној на "
+"компанијата."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Непорамнети записи"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "Не се печати во фактура"
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Графикон на данок"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Завршниот биланс треба да биде ист како пресметаниот биланс!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Барај картица на конто"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Чекам фактура"
 
 #. module: account
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 #: view:analytic.entries.report:0
 msgid "year"
-msgstr ""
+msgstr "година"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Даноци за набавка"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3297,26 +3430,29 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Сите селектирани записи на картицата ќе бидат потврдени и објавени. Тоа "
+"значи дека повеќе нема да можете да ги менувате нивните сметководствени "
+"полиња."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Трансфери"
 
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr ""
+msgstr "Контни планови"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Износ на данок"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Барај движење"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3328,7 +3464,7 @@ msgstr ""
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Нацрт фактура"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3337,58 +3473,60 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Селектираната фактура(и) не може да биде откажана бидејќи се наоѓа во "
+"состојба 'Откажано' или 'Завршено'!"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "Количина :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Должина на периодот (денови)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Печати картица за продажба/набавка"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Состојба на фактура"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Категорија на производ"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Креирај конто"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Извештај за продажби по тип на конто"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Непорамнети ставки од картица"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "Кодот на валутата мора да биде уникатен по компанија!"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Детали"
 
 #. module: account
 #: code:addons/account/account_invoice.py:839
@@ -3399,11 +3537,15 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Не може да се креира фактурата ! Поврзаниот рок на плаќање е најверојатно "
+"лошо конфигуриран бидејќи го дава пресметаниот износ поголем од вкупно "
+"фактурираниот износ. Последната ставка од вашиот рок за плаќање мор да биде "
+"од типот 'биланс' за да го избегнете заокружувањето."
 
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "ДДВ :"
 
 #. module: account
 #: report:account.central.journal:0
@@ -3416,12 +3558,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Контен план"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(Ако не изберете период ќе ги земе во предвид сите отворени периоди)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3432,22 +3574,24 @@ msgstr ""
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "Не може да креирате ставки на картица на конто за \"преглед\" %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Процес на порамнување партнер по партнер"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Ако не изберете фискална година ќе ги земе во предвид сите отворени "
+"фискални години)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3486,18 +3630,18 @@ msgstr ""
 #: selection:accounting.report,filter_cmp:0
 #: field:analytic.entries.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Датум"
 
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Објави"
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Непорамнето"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3507,12 +3651,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Корисник"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Урнек за контен план"
 
 #. module: account
 #: code:addons/account/account.py:2280
@@ -3527,17 +3671,17 @@ msgstr ""
 #: code:addons/account/account_move_line.py:837
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr ""
+msgstr "Некои записи се веќе порамнети !"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Данок на конто"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Буџети"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3556,17 +3700,17 @@ msgstr ""
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr ""
+msgstr "Нема филтри"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Про-фактури"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Историја"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3575,6 +3719,8 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Доколку не е применливо (пресметано преку кодот Python), данокот нема да се "
+"појави на фактурата."
 
 #. module: account
 #: view:account.tax:0
@@ -3586,75 +3732,77 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Количина"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Име на адреса на контакт"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Судски спор"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Барај аналитички ставки"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Конто за плаќања"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "Налог за плаќање"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Изберете ја оваа опција доколку сакате корисникот да ги порамни записите во "
+"ова конто."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Биланс на конто"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Единечна цена"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Аналитички ставки"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "Не може да се промени данокот !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#Записи"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "Креирај нацрт Повлечи"
 
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Отворена фактура"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3664,7 +3812,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Мапирање"
 
 #. module: account
 #: code:addons/account/account_invoice.py:921
@@ -3686,7 +3834,7 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "Име"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -3697,29 +3845,29 @@ msgstr ""
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "Не можете да креирате ставки на картица на затворено конто %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "Ефективен датум"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Подесете ги вашите банкарски сметки"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "Стандардно кодирање"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Картица за аналитички записи"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -3740,6 +3888,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Избраните Фискална година, периоди и контен план треба да припаѓаат на иста "
+"компанија."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3750,12 +3900,12 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Сметководство"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Записи на картица со период во тековната година"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3766,6 +3916,8 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Печати извештај со колона за валута доколку валутата е различна од валутата "
+"на компанијата"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -3773,16 +3925,18 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Вредност на Загубата или Добивката како резултат на промените во девизниот "
+"курс кога правите повеќе-валутни трансакции."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Општо сметководство"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "Биланс :"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3797,29 +3951,29 @@ msgstr ""
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "наслов"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Подеси на нацрт"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Повторливи ставки"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Прикажи партнери"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr ""
+msgstr "Потврди"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3827,58 +3981,58 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Главна книга на трошоци"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Средства"
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Потврди фактури"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Просечна стапка"
 
 #. module: account
 #: field:account.balance.report,display_account:0
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Прикажи конта"
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Фактурата не треба да биде порамнета доколку сакате да ја отворите)"
 
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Почетен период"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "Име на данок"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 #: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr ""
+msgstr "30 дена Крај на месец"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr ""
+msgstr "Аналитички биланс"
 
 #. module: account
 #: help:account.account,active:0
@@ -3886,42 +4040,46 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Доколку активното поле е подесено на Грешка, ќе ви дозволи да го сокриете "
+"контото без да го отстраните."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Објавени ставки од картица"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Барај урнеци за данок"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Нацрт записи"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  Ден од месецот= -1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  Број на денови: 30"
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Кратенка"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
 msgstr ""
+"Грешка! Почетниот датум на фискалната година мора да биде пред нејзиниот "
+"краен датум."
 
 #. module: account
 #: view:account.account:0
@@ -3937,12 +4095,12 @@ msgstr ""
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Тип на конто"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Сопственик на банкарска сметка"
 
 #. module: account
 #: report:account.account.balance:0
@@ -3951,12 +4109,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Пробен биланс"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Откажи ги селектираните фактури"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3969,7 +4127,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: code:addons/account/account_move_line.py:97
@@ -3978,6 +4136,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Немате доставено доволно аргументи за да го пресметате почетниот биланс, "
+"изберете период и картица во контекстот."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3985,11 +4145,13 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Аналитичките трошоци (распореди, некои нарачани производи, ...) доаѓаат од "
+"аналитичките конта. Овие генерираат нацрт фактури на добавувачот.)"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Затвори каса"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4000,7 +4162,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Тип на конто"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4011,7 +4173,7 @@ msgstr ""
 #: field:report.account.sales,month:0
 #: field:report.account_type.sales,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1216
@@ -4021,6 +4183,10 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Не можете да ја направите оваа промена на потврден запис! Мора првин да "
+"промените некои задолжителни полиња или треба првин да ги откажете записите "
+"во картицата!\n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4030,13 +4196,13 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Референтна ЕМ"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "Белешка"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -4053,33 +4219,33 @@ msgstr ""
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Биланс на состојба (Конто за обврски)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Оставете празно за да го употребите тековниот датум"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Даночни ставки"
 
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Основен код на контото"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:93
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Нема дефинирано конто за трошоци за овој производ: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr ""
+msgstr "Својства на сметководството на клиентот"
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4107,49 +4273,49 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Сите објавени записи"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Изјавата %s е потврдена, ставките во картицата се креирани."
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Месечен опсег"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Означете доколку сакате да ги прикажете Контата со 0 биланс."
 
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Код за пресметување"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Стандардни даноци"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "Запис за крај на фискална година"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Периодично обработување"
 
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Не може да креирате аналитичка ставка на конто преглед."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4157,58 +4323,60 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Кога е креирана ставка ново движење состојбата ќе биде 'Нацрт'. * Кога сите "
+"плаќања се направени ќе биде во состојба 'validno'."
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Мод на прикажување"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Извод од фактура или плаќање"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Контен план"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Главен наслов 1 (здебелено, подвлечено)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Име на сметка"
 
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Дај име на нови записи"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Статистики на фактури"
 
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Девизен курс"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Банкарските изводи се внесени во системот"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Порамни отпишување"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -4219,38 +4387,38 @@ msgstr ""
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_cash:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Завршен биланс"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "Не е имплементирано"
 
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Може ли да биде видливо?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Избери картица за конто"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Кредитни белешки"
 
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Името на периодот мора да биде уникатно по компанија!"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4269,13 +4437,13 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Креирај записи од моделите"
 
 #. module: account
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Дозволи порамнување"
 
 #. module: account
 #: code:addons/account/account.py:1077
@@ -4283,64 +4451,67 @@ msgstr ""
 msgid ""
 "You can not modify company of this period as some journal items exists."
 msgstr ""
+"Не може да ја промените компанијата за овој период бидејќи постојат некои "
+"ставки во картицата."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Статистки на аналитичко конто"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Based On"
-msgstr ""
+msgstr "Засновано на"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Данокот е вклучен во цената"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
 msgstr ""
+"Конто на главна книга на аналитички трошоци за извештајот на картицата"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Модели на повторување"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "Кодирање на грешка"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Change"
-msgstr ""
+msgstr "Промени"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Банка и чекови"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Контроли на тип"
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Дејствува како стандардно конто за кредитниот износ"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4348,24 +4519,24 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Објави записи на картица"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Откажано"
 
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Завршен биланс заснован на каса"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Example"
-msgstr ""
+msgstr "Пример"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
@@ -4374,37 +4545,39 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
+"Потврдете ја цената на фактурата !\n"
+"Реалното вкупно не соодветстува со пресметаното вкупно."
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Оставете празно за да употребите конто за приходи"
 
 #. module: account
 #: code:addons/account/account.py:3299
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Данок на набавка %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Генерирај записи"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Избери графикон на даноци"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Мапирање на конто"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4413,17 +4586,17 @@ msgstr ""
 #: code:addons/account/account_invoice.py:337
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "Клиент"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Потврдено"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Откажи фактура"
 
 #. module: account
 #: code:addons/account/account.py:1567
@@ -4433,16 +4606,19 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Не може да креира движење со валута различна од секундарната валута на "
+"контото \"%s - %s\". Избришете го полето на секундарната валута од "
+"дефиницијата на контото доколку сакате да ги прифатите сите валути."
 
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Ново"
 
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Датум на операција"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -4453,7 +4629,7 @@ msgstr ""
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Повлечи даночен код"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4461,11 +4637,14 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
+"Сите нацрт записи на контото во оваа картица и период ќе бидат потврдени. "
+"Тоа значи дека повеќе нема да може да ги менувате нивните сметководствени "
+"полиња."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Конфигурација"
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
@@ -4475,29 +4654,30 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Конто на приходи на урнек за производ"
 
 #. module: account
 #: code:addons/account/account.py:3120
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "MISC"
 
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
 msgstr ""
+"Датум на кој сметководствените записи на партнерот беа последен пат порамнети"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Нова фискална година"
 
 #. module: account
 #: view:account.invoice:0
@@ -4509,17 +4689,17 @@ msgstr ""
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Фактури"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Мои фактури"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Означи"
 
 #. module: account
 #: view:account.invoice:0
@@ -4527,22 +4707,22 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Продавач"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Фактурирано"
 
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Објавени записи на картица"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr ""
+msgstr "Употреби модел"
 
 #. module: account
 #: help:account.invoice,partner_bank_id:0
@@ -4551,27 +4731,30 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Број на банкарска сметка на која фактурата ќе биде платена. Банкарската "
+"сметка на Компанијата доколку е Фактура на клиент или Повлекување на "
+"добавувач, во спротивно бројот на банкарската сметка на Партнерот."
 
 #. module: account
 #: view:account.state.open:0
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Даночни основи од даночната декларација."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Додади"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Платено"
 
 #. module: account
 #: view:account.period.close:0
@@ -4581,12 +4764,12 @@ msgstr ""
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Банкарски извод употребен за банкарско порамнување"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Нацрт фактурите се потврдени. "
 
 #. module: account
 #: constraint:account.account.template:0
@@ -4600,23 +4783,23 @@ msgstr ""
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Период на отварање"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Записи во картица за преглед"
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "Пресметај"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Даночна пријава"
 
 #. module: account
 #: view:account.move:0
@@ -4641,7 +4824,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Ставки во картица"
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -4666,7 +4849,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:150
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -4675,12 +4858,12 @@ msgstr ""
 #: field:account.analytic.inverted.balance,date2:0
 #: field:account.analytic.journal.report,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Крај на период"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Банкарски детали"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -4688,6 +4871,9 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Овој извештај е анализиран од страна на партнер. Тоа е PDF извештај кој "
+"содржи една ставка по партнер која го претставува кумулативниот кредитен "
+"биланс."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4695,26 +4881,28 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
+"За да испринтате аналитичка (или трошоци) картичка за даден период. Периодот "
+"дава код, име на движење, број на конто, општ износ и аналитички износ."
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Бројот на фактурата мора да биде уникатен по компанија!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Биланс по тип на конто"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Генерира отворени записи за фискалната година"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Сметководител"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -4726,44 +4914,44 @@ msgstr ""
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Групирај ставки од фактура"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr ""
+msgstr "Затвори"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Движења"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "Картица за продажба за овој месец"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
+msgstr "ДДВ декларација за конто"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Цена"
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Да се затвори"
 
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Датум на започнување на период"
 
 #. module: account
 #: code:addons/account/account.py:1351
@@ -4773,16 +4961,19 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
+"Не може да менувате објавен запис од оваа картица !\n"
+"Треба да ја подесите картицата за да дозволи откажување на записи доколку "
+"сакате да го правите тоа."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Урнеци"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Опис на данок"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -4793,7 +4984,7 @@ msgstr ""
 #: code:addons/account/account.py:1090
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Почетниот период мора да биде помал од крајниот период"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -4802,11 +4993,13 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
+"Означи го ова доколку цената на производот и фактурите го вклучува овој "
+"данок."
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Аналитички биланс -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4843,19 +5036,19 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 нето денови"
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Тип на период"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Плаќања"
 
 #. module: account
 #: view:account.tax:0
@@ -4865,7 +5058,7 @@ msgstr ""
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Запис"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -4877,7 +5070,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Рокови за плаќање"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -4892,18 +5085,18 @@ msgstr ""
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Извештај за конто"
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Име на колона"
 
 #. module: account
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "Овој извештај ви дава преглед на состојбата од општите картици"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4914,44 +5107,44 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Година"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Отварање на каса"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Линија 1:"
 
 #. module: account
 #: code:addons/account/account.py:1307
 #, python-format
 msgid "Integrity Error !"
-msgstr ""
+msgstr "Грешка интегритет !"
 
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Внатрешно име"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "месец"
 
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Следен партнер за порамнување"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr ""
+msgstr "Даночно конто"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -4962,23 +5155,23 @@ msgstr ""
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Биланс"
 
 #. module: account
 #: 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
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Означи датум во периодот"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Сметководствени извештаи"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4986,29 +5179,29 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
 #: model:ir.actions.act_window,name:account.action_move_line_form
 msgid "Entries"
-msgstr ""
+msgstr "Записи"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Овој период"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "ЕМ"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Нема пронајдено период на фактурата!"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Код за пресметка (доколку тип=код)"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5019,12 +5212,12 @@ msgstr ""
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Продажба"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Извештај"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5039,7 +5232,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Износ"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5049,7 +5242,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Потврдување"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5060,12 +5253,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Урнек за даночна фискална позиција"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Дозволи откажување на записи"
 
 #. module: account
 #: field:account.tax.code,sign:0
@@ -5075,17 +5268,17 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "Аналитички конта со поминат краен рок."
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Сметка/Партнер) Име"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Трансакција"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -5097,32 +5290,32 @@ msgstr ""
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Користете го овој код за ДДВ декларацијата."
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Напредок"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Статистика на аналитички записи"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Готовина и банки"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.installer"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Вклучено во основниот износ"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5130,22 +5323,25 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Бројот на денови да се додаде пред пресметувањето на денот од месецот. "
+"Доколку датумот=15/01, Бројот на денови=22, Ден од месецот=-1, тогаш "
+"крајниот датум е 28/02."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Пресметување на износ"
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Контроли на записи"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Чувајте празно за да ја отворите тековната состојба)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5154,7 +5350,7 @@ msgstr ""
 #: field:account.analytic.inverted.balance,date1:0
 #: field:account.analytic.journal.report,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Почеток на период"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5165,31 +5361,33 @@ msgstr ""
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr ""
+msgstr "Комуникација"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Аналитичко сметководство"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Вклучува почетни биланси"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Повлекување на клиент"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Не може да креирате повеќе оод едно движење по период на централизирана "
+"картица"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5197,17 +5395,17 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Знак за даночен код"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Извештај за фактурите креирани во последните 15 дена"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  Број на денови: 14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -5225,12 +5423,12 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Грешка конфигурација !"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Износ за плаќање"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5239,6 +5437,9 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Ова се преостанатите партнери за кои треба да проверите дали има нешто за "
+"порамнување или не. Оваа бројка веќе го смета тековниот партнер како "
+"порамнет."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5248,7 +5449,7 @@ msgstr ""
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Количина на производ"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5257,42 +5458,42 @@ msgstr ""
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Необјавено"
 
 #. module: account
 #: view:account.change.currency:0
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr ""
+msgstr "Промени валута"
 
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "Оваа акција ќе ги избрише даноците"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "Сметководствени записи."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Датум на плаќање"
 
 #. module: account
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Аналитички конта"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Фактури и поврати на клиент"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5300,7 +5501,7 @@ msgstr ""
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Валута на износот"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5309,11 +5510,13 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
+"Специфицираната картица нема записи за движење на контото во нацрт состојба "
+"за овој период"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr ""
+msgstr "Ставки за порамнување"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5328,27 +5531,27 @@ msgstr ""
 #: field:report.account.sales,quantity:0
 #: field:report.account_type.sales,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Количина"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Број (Движење)"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "Аналитички записи во последните 7 дена"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Нормален текст"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Опции за повлекување фактура"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5363,19 +5566,21 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Полето секвенца се користи за да се наредат ставките за роковите за плаќање "
+"од најниските секвенци до највисоките"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Урнек за фискална позиција"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Отвори графикони"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5385,6 +5590,11 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Доколку нема дополнителни записи кои треба да бидат снимени во фискалната "
+"година, може да ја затворите од овде. Тоа ќе ги затвори сите отворени "
+"периоди во оваа година што ќе оневозможи снимање на нов запис. Затворете ја "
+"фискалната година кога треба дефинитивно да ги финализирате резултатите на "
+"крајот од годината. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5394,17 +5604,17 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr ""
+msgstr "Со валута"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "Отвори каса"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Автоматско форматирање"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5413,77 +5623,79 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Нема дефинирано фискална година за овој датум !\n"
+"Креирајте ја од конфигурација на менито за сметководство."
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Порамни со отпишување"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Фиксен износ"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Валидно најмногу до"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Датум на фактурирање"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Автоматско порамнување на конто"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Ставка на картица"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr ""
+msgstr "Премести картица"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Генерирај записи за отварање"
 
 #. module: account
 #: code:addons/account/account_move_line.py:759
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "Веќе порамнето!"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Метод на пресметување за износот на данокот."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Пресметување на краен датум"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Креирај датум"
 
 #. module: account
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Аналитички картици"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5494,25 +5706,25 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Премести име (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 #: code:addons/account/account_move_line.py:857
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Отпиши"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Вкупно побарувања"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
 #: model:account.financial.report,name:account.account_financial_report_income0
 msgid "Income"
-msgstr ""
+msgstr "Приход"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -5521,7 +5733,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:339
 #, python-format
 msgid "Supplier"
-msgstr ""
+msgstr "Добавувач"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -5530,33 +5742,33 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Урнек за конто"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT"
-msgstr ""
+msgstr "ДДВ"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Бр. на конто"
 
 #. module: account
 #: code:addons/account/account_invoice.py:88
 #, python-format
 msgid "Free Reference"
-msgstr ""
+msgstr "Слободна референца"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Проценка"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5566,33 +5778,33 @@ msgstr ""
 #: code:addons/account/report/account_partner_balance.py:301
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Конта побарувања и плаќања"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Фискално мапирање"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "Состојба на конто Отворено"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Макс. количина:"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Повлечи фактура"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Адреса на фактура"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5609,6 +5821,10 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
+"Дефиницијата на даночниот код зависи од даночната декларација на вашата "
+"земја. OpenERP ви дозволува да ја дефинирате даночната структура и да ја "
+"менаџирате преку ова мени. Можете да дефинирате и нумерички и алфанумарички "
+"даночни кодови."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5616,6 +5832,9 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Ви го пакажува напредокот кој е направен денес во процесот за порамнување. \n"
+"Дадено преку \n"
+"Партнери порамнети денес \\ (Преостанати партнери + Партнери порамнети денес)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5624,6 +5843,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Изберете го типот на проценка поврзан со оваа ставка на рокот за плаќање. "
+"Забележете дека треба да ја имате последната линија со тип 'Биланс' за да "
+"осигурате дека целиот износ ќе биде третиран."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5631,13 +5853,13 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Принуден период"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# од ставки"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5656,13 +5878,13 @@ msgstr ""
 #: field:accounting.report,filter:0
 #: field:accounting.report,filter_cmp:0
 msgid "Filter by"
-msgstr ""
+msgstr "Филтрирај по"
 
 #. module: account
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Имате погрешен израз \"%(...)s\" во вашиот модел !"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
@@ -5674,7 +5896,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1238
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr ""
+msgstr "Не можете да користите неактивна сметка!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:830
@@ -5686,30 +5908,32 @@ msgstr ""
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
 msgstr ""
+"Билансот е пресметан врз основа на Почетниот Биланс и ставките на "
+"трансакцијата"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "Сегашната валута не е конфигурирана правилно !"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Конто за данок на фактури"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Општа картица на конто"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Број на денови"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:402
@@ -5717,57 +5941,57 @@ msgstr ""
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Грешка акција !"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "Период: %s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "Прегледајте ги вашите финансиски картици"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Името ќе биде прикажано на извештаите"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Датум на печатење"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr ""
+msgstr "Никој"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Денови  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Поврати на клиентот"
 
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Надворешен биланс"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Име на картица-период"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -5778,12 +6002,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:150
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "не е имплементирано"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Компанија поврзана со оваа картица"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5792,6 +6016,8 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"Селектираните Фактура(и) не може да бидат потврдени бидејќи не се наоѓаат во "
+"состојба 'Нацрт' или 'Про-фактура'!"
 
 #. module: account
 #: view:account.subscription:0
@@ -5801,19 +6027,19 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Забелешка за фискална позиција :"
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Анализи на аналитички записи"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Минато"
 
 #. module: account
 #: constraint:account.account:0
@@ -5829,17 +6055,19 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Оваа картица ќе биде автоматски креирана за оваа банкарска сметка кога ќе го "
+"зачувате извештајот"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Аналитички запис"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Порака за задоцнети плаќања"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -5853,17 +6081,17 @@ msgstr ""
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Датум на креирање"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(задржи празно за да се употреби тековниот период)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -5871,6 +6099,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Веднаш штом се направи порамнувањето, статусот на фактурата во системот се "
+"променува во “завршено“ (т.е. платено)."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5881,27 +6111,27 @@ msgstr ""
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Датум на последно порамнување"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Аналитичка ставка"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Даноци на клиентот"
 
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Ова е модел за повторливи сметководствени записи"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Данок на продажби(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5912,19 +6142,19 @@ msgstr ""
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Конфигурација за известување"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Тип на данок"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Урнеци за конта"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,complete_tax_set:0
@@ -5938,17 +6168,17 @@ msgstr ""
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Даночна изјава"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Отворени и платени фактури"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -5962,16 +6192,18 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Не можете да отстраните/деактивирате конто кое е подесено на клиент или "
+"добавувач"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Избери фискална година за затварање"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
+msgstr "Листа на сите даноци кои треба да бидат инсталирани од волшебникот"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -5981,17 +6213,17 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Додаток за информации"
 
 #. module: account
 #: field:account.chart,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Фискална година"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Парцијално порамнети записи"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6033,7 +6265,7 @@ msgstr ""
 #: view:validate.account.move.lines:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Откажи"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6041,52 +6273,52 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr ""
+msgstr "Побарување"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Компанијата мора да биде иста за нејзината поврзана сметка и период."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Други информации"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Стандардно кредитно конто"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Поврзаната валута на сметката не е еднаква со онаа на компанијата."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Тековен"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr ""
+msgstr "Каса"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr ""
+msgstr "Капитал"
 
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Процент"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Картица и партнер"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6097,18 +6329,18 @@ msgstr ""
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Не може да генерира неупотребен код на картица."
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Види аналитички ставки на конто"
 
 #. module: account
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Број на фактура"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6116,27 +6348,29 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Покажува дали износот на данокот треба да биде вклучен во основната сума за "
+"пресметување на следните даноци"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Порамнување: Оди на следниот партнер"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Обратен аналитички биланс"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Тип кој може да се примени"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr ""
+msgstr "Референца на фактура"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6151,13 +6385,13 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Ликвидност"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Ставки на аналитичка картица"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6170,7 +6404,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Банка и каса"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6184,12 +6418,12 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Името на картицата мора да биде уникатно по компанија !"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Креирај опционо"
 
 #. module: account
 #: code:addons/account/account.py:664
@@ -6198,12 +6432,14 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Не можете да ја промените компанијата сопственик на сметката која содржи "
+"ставки во картицата."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Внеси почетен датум !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6211,22 +6447,17 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
+msgstr "Поврати на добавувач"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
-msgstr ""
+msgstr "Ставки на запис"
 
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Централизација"
 
 #. module: account
 #: view:account.account:0
@@ -6249,22 +6480,22 @@ msgstr ""
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Групирај по..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Може само да се чита"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  Проценка: Биланс"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Единица мерка"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6272,16 +6503,18 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
 msgstr ""
+"Процентите за ставката Рок за плаќање мора да бидат помеѓу 0 и 1, На пример: "
+"0.02 за 2% "
 
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Има стандардна компанија"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr ""
+msgstr "account.sequence.fiscalyear"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -6292,45 +6525,46 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Аналитичка картица"
 
 #. module: account
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
 msgstr ""
+"Не можете да деактивирате конто кое содржи некои ставки во картицата."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Порамнето"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr ""
+msgstr "Основа"
 
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr ""
+msgstr "Име на модел"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Конто на категорија трошоци"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Готовински трансакции"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr ""
+msgstr "Фактурата е веќе порамнета"
 
 #. module: account
 #: view:account.account:0
@@ -6343,41 +6577,41 @@ msgstr ""
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Белешки"
 
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Статистики на аналитички записи"
 
 #. module: account
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "Не можете да отстраните конто кое содржи ставки во картицата."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
 #: code:addons/account/account_move_line.py:933
 #, python-format
 msgid "Entries: "
-msgstr ""
+msgstr "Записи: "
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Креирајте рачно повторливи записи во избрана картица."
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Валута на поврзаната картица на контото."
 
 #. module: account
 #: code:addons/account/account.py:1563
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr ""
+msgstr "Не можете да креирате движење помеѓу различни компании"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6396,7 +6630,7 @@ msgstr ""
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Биланс на состојба (Конто за средства)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6405,29 +6639,32 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Банкарско порамнување составено од верификување дека вашиот банкарски извод "
+"соодветстваува со записите или (извештаите) од таа сметка во вашиот "
+"сметководствен систем."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "Состојбата е нацрт"
 
 #. module: account
 #: view:account.move.line:0
 #: code:addons/account/account_move_line.py:1043
 #, python-format
 msgid "Total debit"
-msgstr ""
+msgstr "Вкупно задолжување"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr ""
+msgstr "Записот \"%s\" не е валиден !"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Факс :"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -6435,6 +6672,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Ова автоматски ќе ги конфигурира вашиот контен план, банкарските сметки, "
+"даноците и картиците според избраниот урнек"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6442,6 +6681,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Ова конто ќе се употреби наместо стандардното како конто на побарувања за "
+"тековен партнер"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6452,12 +6693,12 @@ msgstr ""
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr ""
+msgstr "Код Python"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Записи во картица со период во тековен период"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6465,23 +6706,25 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Означете го ова поле доколку сакате да дозволите откажување на записите "
+"поврзани со оваа картица или на фактурата поврзана со оваа картица"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr ""
+msgstr "Креирај"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr ""
+msgstr "Креирај запис"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Профит & Загуба (Конто за трошоци)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6512,12 +6755,12 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Грешка !"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Стил на финансиски извештај"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -6529,29 +6772,29 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Извештај за даноци"
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Испечатено"
 
 #. module: account
 #: code:addons/account/account_move_line.py:584
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "Error :"
-msgstr ""
+msgstr "Грешка :"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr ""
+msgstr "Проектна ставка"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr ""
+msgstr "Рачно"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -6567,7 +6810,7 @@ msgstr ""
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Да се прегледа"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -6577,6 +6820,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Доколку сте избрале да филтрирате по датум или период, ова поле ќе ви "
+"дозволи да додадете ред за прикажување на износот на "
+"долгот/кредитот/билансот кој му претходи на филтерот кој сте го подесиле."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6585,12 +6831,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Записи во картица"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Прикажува извештај од главна книга со еден партнер по страна"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1218
@@ -6600,6 +6846,9 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Не можете да ја направите оваа промена на порамнет запис! Мора првин да "
+"промените некои задолжителни полиња или треба првин да ги отпорамните!\n"
+"%s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6607,7 +6856,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
-msgstr ""
+msgstr "JRNL"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6616,6 +6865,8 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
+"Овој извештај е анализа направена од партнер. Тоа е PDF извештај кој содржи "
+"една ставка по партнер претставувајќи го кумулативниот кредитен биланс"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6623,6 +6874,8 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Избраните ставики на записот немаат записи за движење на контото ви нацрт "
+"состојба"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6645,18 +6898,19 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr ""
+msgstr "Сите записи"
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Грешка: Стандардната ЕМ и ЕМ на нарачката мора да бидат од иста категорија."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Избери картица"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6664,17 +6918,17 @@ msgstr ""
 #: code:addons/account/account.py:432
 #, python-format
 msgid "Opening Balance"
-msgstr ""
+msgstr "Отварање на биланс"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Порамнување на сметка"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Даночна фискална позиција"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6685,12 +6939,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr ""
+msgstr "Генерална главна книга"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Налогот за плаќање е пратен во банката."
 
 #. module: account
 #: view:account.balance.report:0
@@ -6699,6 +6953,9 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Овој извештај ви дозволува да испечатите или генерирате PDF од вашиот пробен "
+"биланс дозволувајќи ви брзо да го проверите билансот на секое од вашите "
+"конта во единечен извештај"
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6706,17 +6963,20 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Означете го ова поле доколку не сте сигурни за записот во картицата и "
+"доколку сакате да го означите како 'да биде прегледано' од страна на експерт "
+"за сметководство"
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Комплетен сет на даноци"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Својства"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
@@ -6741,7 +7001,7 @@ msgstr ""
 #: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 msgid "Total:"
-msgstr ""
+msgstr "Вкупно:"
 
 #. module: account
 #: code:addons/account/account.py:2229
@@ -6757,15 +7017,10 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Референца на документот кој го генерирал овој извештај за фактура."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6776,36 +7031,36 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "Даноци кои се користат во продажбите"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Недоволно податоци !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Фактури на клиентот"
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Отпишан износ"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Продажби"
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr ""
+msgstr "Колона на картица"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6813,7 +7068,7 @@ msgstr ""
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Завршено"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
@@ -6827,7 +7082,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Изводот со рачни записи станува нацрт извод."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6844,13 +7099,13 @@ msgstr ""
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Изворен документ"
 
 #. module: account
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "Не можете да избришете објавен запис на картица \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -6858,27 +7113,27 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Непорамнети записи"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Порамнување на изводи"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Сметководствен извештај"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Даноци:"
 
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "За даноци од типот процент, внесете % однос помеѓу 0-1."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6892,14 +7147,14 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Хиерархија на финансиски извештаи"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr ""
+msgstr "ЕМ на производ"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6916,23 +7171,25 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
+"Овој датум ќе биде употребен како датум на фактура за Повлечи фактура и "
+"Периодот ќе биде избран соодветно!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Месечен обрт"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Аналитички ставки"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Ставки"
 
 #. module: account
 #: view:account.tax.template:0
@@ -6942,12 +7199,12 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Дали сакате да отворите записи на картица?"
 
 #. module: account
 #: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Дали сакате да ја отворите оваа фактура ?"
 
 #. module: account
 #: code:addons/account/account_invoice.py:528
@@ -6957,6 +7214,8 @@ msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
+"Не може да се пронајде контен план, треба да го креирате од конфигурацијата "
+"во менито сметководство."
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
@@ -6967,7 +7226,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:999
 #, python-format
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Сметководствени записи"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -6976,7 +7235,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -6985,12 +7244,12 @@ msgstr ""
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr ""
+msgstr "Извод"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Дејствува како стандардно конто за задолжениот износ"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7002,12 +7261,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Објавени записи"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "За процент внесете сооднос помеѓу 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7015,33 +7274,33 @@ msgstr ""
 #: field:account.invoice,date_invoice:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Датум на фактура"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Групирај по годината од датумот на фактурата"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Вкупна сума кој ви ја должи клиентот."
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Икона"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.use.model:0
 msgid "Ok"
-msgstr ""
+msgstr "ОК"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -7059,12 +7318,12 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Затворено на"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Ставка од Банкарски извод"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7074,7 +7333,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Стандарден данок за набавки"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
@@ -7084,7 +7343,7 @@ msgstr ""
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirm"
-msgstr ""
+msgstr "Потврди"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -7098,32 +7357,32 @@ msgstr ""
 #: code:addons/account/account.py:1088
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Треба да изберете периоди кои припаѓааат на иста компанија"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "Прегледајте ги термините за плаќање"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr ""
+msgstr "Име на нови записи"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Креирај записи"
 
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Информации за банката"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Известување"
 
 #. module: account
 #: code:addons/account/account_move_line.py:759
@@ -7135,29 +7394,29 @@ msgstr ""
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Договори/Аналитички конта"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Затварање на каса"
 
 #. module: account
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Картица на конто"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Платена фактура"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7166,28 +7425,31 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Ова поле ви го покажува следниот партнер кој автоматски ќе биде избран од "
+"системот за да помине преку процесот на порамнување, врз основа на "
+"последниот ден кога бил порамнет."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Коментар"
 
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Домен"
 
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Употреби модел"
 
 #. module: account
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Неможност да се усвои почетен биланс (негативна вредност)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7203,12 +7465,12 @@ msgstr ""
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Ставка од фактура"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Повлекувања на клиенти и добавувачи"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7219,7 +7481,7 @@ msgstr ""
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "Периоди за генерирање на отворени записи не се пронајдени"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7230,52 +7492,52 @@ msgstr ""
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "ПРО-ФАКТУРА"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Небалансирано"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Нормално"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Е-маил урнеци"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Опциони информации"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:84
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr ""
+msgstr "Картицата мора да има стандардно кредитно и дебитно конто"
 
 #. module: account
 #: report:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr ""
+msgstr "На датум"
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -7287,35 +7549,35 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Повеќе-валути"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Датум на доспевање"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
 #, python-format
 msgid "Bad account !"
-msgstr ""
+msgstr "Грешка сметка !"
 
 #. module: account
 #: code:addons/account/account.py:3108
 #, python-format
 msgid "Sales Journal"
-msgstr ""
+msgstr "Продажна картица"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Отвори ставки на картица !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Данок на фактура"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1277
@@ -7327,7 +7589,7 @@ msgstr ""
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Хиерархија на извештаи од сметка"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7342,18 +7604,18 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Необјавени записи на картица"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Својства на продажби"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Рачно порамнување"
 
 #. module: account
 #: report:account.overdue:0
@@ -7364,32 +7626,34 @@ msgstr ""
 #: field:account.analytic.chart,to_date:0
 #: field:project.account.analytic.line,to_date:0
 msgid "To"
-msgstr ""
+msgstr "До"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Подесување на валута"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to close"
-msgstr ""
+msgstr "Фискална година за затварање"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Откажи ги селектираните фактури"
 
 #. module: account
 #: help:account.account.type,report_type:0
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Ова поле се користи за генерирање на законски извештаи: профит и загуба, "
+"биланс."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7407,7 +7671,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Мај"
 
 #. module: account
 #: view:account.account:0
@@ -7426,11 +7690,12 @@ msgstr ""
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
+"Глобалните даноци се дефинирани, но не се вклучени во ставките на фактурата !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr ""
+msgstr "Урнеци за контен план"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -7443,22 +7708,22 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr ""
+msgstr "Case Code"
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Објави записи од картица"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Даноци на продажба"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Име на извештај"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7469,13 +7734,13 @@ msgstr ""
 #: code:addons/account/account.py:3003
 #, python-format
 msgid "Cash"
-msgstr ""
+msgstr "Готовина"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Дестинација на конто"
 
 #. module: account
 #: code:addons/account/account.py:1431
@@ -7492,12 +7757,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Грешка корисник"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Плаќање на фактури"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7512,17 +7777,17 @@ msgstr ""
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Секвенца"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Грешка ! Не може да креирате рекурсивни категории."
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "Опциона количина на записи."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7532,22 +7797,22 @@ msgstr ""
 #. module: account
 #: view:account.state.open:0
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Продажби по тип на конто"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Линк до автоматски генерирани ставки на картица."
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Месечно"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7562,17 +7827,17 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Средство"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Денови    "
 
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Пресметан биланс"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7591,12 +7856,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Законски извештаи"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Периодична сума"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -7609,7 +7874,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Ставка од каса"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7619,12 +7884,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "Главна книга на партнер"
 
 #. module: account
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Фиксно"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -7641,12 +7906,12 @@ msgstr ""
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Внимание !"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Состојба на преместена ставка"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
@@ -7682,36 +7947,36 @@ msgstr ""
 #: model:ir.model,name:account.model_res_partner
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
 
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Изберете валута за да ја примените на фактурата"
 
 #. module: account
 #: code:addons/account/account.py:3446
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "Банкарската сметка дефинирана на селектираниот контен план нема код."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Не може %s нацрт/про-фактура/откажи фактура."
 
 #. module: account
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Нема ставки во фактурата !"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Тип на извештај"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -7732,7 +7997,7 @@ msgstr ""
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr ""
+msgstr "Состојба"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -7740,11 +8005,13 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Tax Use In"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:315
@@ -7753,12 +8020,14 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Билансот на изводот не е точен !\n"
+"Очекуваниот биланс (%.2f) е различен од пресметаниот. (%.2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr ""
+msgstr "The account entries lines are not in valid state."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -7770,27 +8039,33 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Deferral Method"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "Фактурата '%s' е платена."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Автоматски запис"
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Грешка ! Не може да креирате рекурсивни даночни кодови."
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -7798,12 +8073,16 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Доколку ова поле е означено, системот ќе проба да ги групира "
+"сметководствените ставки кога ги генерира од фактурите."
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Означете го ова поле  доколку контото дозволува порамнување на ставките од "
+"картицата."
 
 #. module: account
 #: help:account.period,state:0
@@ -7811,11 +8090,13 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Кога се креираат месечни периоди. Состојбата е 'Нацрт'. На крајот од "
+"месечниот период е во состојба 'завршено'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "Inverted Analytic Balance -"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -7826,29 +8107,29 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Аналитички записи"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "Месечни продажби по тип"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Поврзан партнер"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1332
 #, python-format
 msgid "You must first select a partner !"
-msgstr ""
+msgstr "Мора првин да изберете партнер !"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Дополнителни информации"
 
 #. module: account
 #: help:account.invoice,state:0
@@ -7863,18 +8144,27 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice.             \n"
+"* The 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' state is used when user cancel invoice."
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Вкупно преостанато"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "Статусот на фактурата е Отворена"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7883,6 +8173,9 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
@@ -7890,42 +8183,43 @@ msgstr ""
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
 msgstr ""
+"Не може да се пронајде контен план за оваа компанија, треба да креирате нов."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Про-фактура"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "J.C. /Move name"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Избери фискална година"
 
 #. module: account
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Картица повлечи нарачка"
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "For Tax Type percent enter % ratio between 0-1."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Тековно конто"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Групирај по датумот на фактурата"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7933,6 +8227,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Измени фактура: Ја откажува тековната фактура и креира нова копија од неа "
+"готова за изменување"
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -7957,7 +8253,7 @@ msgstr ""
 #: field:account.treasury.report,period_id:0
 #: field:validate.account.move,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #. module: account
 #: help:account.account,adjusted_balance:0
@@ -7965,21 +8261,23 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Вкупен износ (во валута на компанијата) за трансакции направени во "
+"секундарна валута за ова конто."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Вкупно нето:"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Генеричко известување"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Картица отпиши"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -7987,6 +8285,7 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Овој рок за плаќање ќе биде употребен наместо стандардниот за тековен партнер"
 
 #. module: account
 #: view:account.tax.template:0
@@ -8000,37 +8299,39 @@ msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Income Category Account"
 
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Adjusted Balance"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Урнеци за фискална позиција"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Основен тип"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Данок/Основен износ"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Вреднување: Процент"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8040,6 +8341,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"With Customer Refunds you can manage the credit notes for your customers. A "
+"refund is a document that credits an invoice completely or partially. You "
+"can easily generate refunds and reconcile them directly from the invoice "
+"form."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8051,16 +8356,23 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ова мени ја печати ДДВ декларацијата засновано на фактури или плаќања. "
+"Можете да изберете еден или неколку периоди од фискалната година. Потребните "
+"информации за даночната декларација автоматски се генерираат преку OpenERP "
+"од фактурите (или плаќањата во некои земји. Овие податоци се ажурирани во "
+"реално време. Тоа е мошне корисно бидејќи ви овозможува да го прегледате во "
+"било кое време данокот што го должите на почетокот и крајот од месецот или "
+"кварталот."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Тел. :"
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Валута на компанијата"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8078,19 +8390,19 @@ msgstr ""
 #: field:account.vat.declaration,chart_account_id:0
 #: field:accounting.report,chart_account_id:0
 msgid "Chart of Account"
-msgstr ""
+msgstr "Контен план"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Плаќање"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Завршен биланс"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8098,28 +8410,30 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Делумно порамнување"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Account Analytic Inverted Balance"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Account Common Report"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "тековен месец"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8128,34 +8442,36 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"Нема дефинирано перод за овој датум: %s !\n"
+"Креирајте период."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Автоматско увезување на банкарски извод"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr ""
+msgstr "Прегледи на картици"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Move bank reconcile"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Типови на сметки"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Value amount: n.a"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8169,13 +8485,13 @@ msgstr ""
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr ""
+msgstr "Порамнување"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "Receivable Account"
 
 #. module: account
 #: view:account.invoice:0
@@ -8187,16 +8503,22 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Fiscalyear Close state"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Картица повлечи"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8206,7 +8528,7 @@ msgstr ""
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Филтрирај по"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8216,6 +8538,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"sales orders or deliveries. You should only confirm them before sending them "
+"to your customers."
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8223,67 +8549,69 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Со цел да затворите период, мора првин да ги објавите поврзаните записи на "
+"картицата."
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Анализи на компанија"
 
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr ""
+msgstr "Сметка на партнерот употребена за оваа фактура."
 
 #. module: account
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Данок %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr ""
+msgstr "Контакти"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: view:account.tax.code.template:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Parent Code"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Ставка рок на плаќање"
 
 #. module: account
 #: code:addons/account/account.py:3109
 #, python-format
 msgid "Purchase Journal"
-msgstr ""
+msgstr "Картица за набавки"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr ""
+msgstr "Повлечи фактура: Креира повлечена фактура, готова за изменување."
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Вкупно"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Печати даночна декларација"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Journal Entry Model Line"
 
 #. module: account
 #: view:account.invoice:0
@@ -8292,23 +8620,23 @@ msgstr ""
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Краен датум"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Добавувачи"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Дозволени типови на сметки (празно за без контрола)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "Supplier Accounting Properties"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8316,50 +8644,52 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Статистики"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
 #: field:project.account.analytic.line,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Од"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Затвори фискална година"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Кодот на сметката мора да биде единствен по компанија !"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Неплатени фактури"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr ""
+msgstr "Рокот на плаќање на добавувачот нема ставка рок на плаќање!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Debit amount"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Трезор"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -8370,60 +8700,60 @@ msgstr ""
 #: view:account.analytic.journal.report:0
 #: view:account.common.report:0
 msgid "Print"
-msgstr ""
+msgstr "Печати"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Дозволени сметки (празно за без контрола)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Template Account Fiscal Mapping"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Нацрт фактури на клиент"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Разно"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Вкупна сума која треба да му ја платите на овој добавувач."
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Аналитички трошоци"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Име на картица"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Next Partner Entries to reconcile"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Најмал текст"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Фактурирање и плаќања"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8431,6 +8761,8 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
 
 #. module: account
 #: constraint:account.bank.statement.line:0
@@ -8443,18 +8775,18 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
-msgstr ""
+msgstr "Трошок"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Чувај празно за сите отворени фискални години"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "The account move (%s) for centralisation has been confirmed!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8462,6 +8794,8 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -8471,6 +8805,9 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"You can not validate a non-balanced entry !\n"
+"Make sure you have configured payment terms properly !\n"
+"The latest payment term line should be of the type \"Balance\" !"
 
 #. module: account
 #: view:account.account:0
@@ -8500,18 +8837,21 @@ msgstr ""
 #: field:report.invoice.created,currency_id:0
 #: field:res.partner.bank,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Валута"
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
+"Gives the sequence order when displaying a list of bank statement lines."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
+"Сметководителот ги потврдува сметководствените записи кои произлегуваат од "
+"фактурата."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8524,33 +8864,40 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
+"Дефинирај финансиска година на вашата компанија според потребите. Финансиска "
+"година е период на чиј крај се прават сметките на компанијата (вообичаено 12 "
+"месеци). Финансиската година вообичаено се поврзува со датумот на кој "
+"завршува. На пример, доколку финансиската година на компанијата завршува на "
+"30 ноември 2011, тогаш се помеѓу 01 декември 2010 и 30 ноември 2011 ќе се "
+"поврзе со финансиската година 2011. Не сте обврзани да ја следите актуелната "
+"календарска година."
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Порамнети записи"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Контакт адреса"
 
 #. module: account
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Погрешен модел !"
 
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Force period"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Print Account Partner Balance"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8561,11 +8908,16 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Договори"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
@@ -8573,19 +8925,19 @@ msgstr ""
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
 msgid "unknown"
-msgstr ""
+msgstr "непознато"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 #: code:addons/account/account.py:3113
 #, python-format
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Opening Entries Journal"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Нацрт фактурите се проверени, потврдени и испечатени."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8594,12 +8946,15 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss: Amount will be deducted.), Which is calculated from "
+"Profilt & Loss Report"
 
 #. module: account
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Дефинирајте секвенца на картицата поврзана со оваа фактура."
 
 #. module: account
 #: view:account.move:0
@@ -8607,12 +8962,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Внатрешна белешка"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Продажби по тип оваа година"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8626,16 +8981,18 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Given by Python Code"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Код на картица"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8644,70 +9001,73 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Residual Amount"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr ""
+msgstr "Entry Lines"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Прегледај ги финансиските сметки"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr ""
+msgstr "Отвори картица"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Период од"
 
 #. module: account
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Картица повлечи продажби"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Информации"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Регистрирано плаќање"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Затвори состојби на фискална година и периоди"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Информации за производ"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8715,40 +9075,40 @@ msgstr ""
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr ""
+msgstr "Аналитика"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Креирај фактура"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Данок на нарачки(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Креирајте ставки на фактурата."
 
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Почитуван Господине/Госпоѓо,"
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Прикажи детали"
 
 #. module: account
 #: code:addons/account/account.py:3118
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8756,6 +9116,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
+"Аналитички тошоци (распореди, некои нарачани производи, ...) доаѓаат од "
+"аналитичките конта. Овие генерираат нацрт фактури."
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8765,12 +9127,16 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
 
 #. module: account
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr ""
+msgstr "Крај на период"
 
 #. module: account
 #: field:account.account,financial_report_ids:0
@@ -8781,7 +9147,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Финансиски извештаи"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8809,17 +9175,17 @@ msgstr ""
 #: field:accounting.report,period_from:0
 #: field:accounting.report,period_from_cmp:0
 msgid "Start Period"
-msgstr ""
+msgstr "Започни период"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Насоки за анализи"
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Компании кои се однесуваат на партенрот"
 
 #. module: account
 #: view:account.journal:0
@@ -8828,44 +9194,46 @@ msgstr ""
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr ""
+msgstr "Преглед на картица"
 
 #. module: account
 #: view:account.move.line:0
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "Total credit"
-msgstr ""
+msgstr "Вкупно кредит"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
+"Сметководителот ги потврдува сметководствените записи кои доаѓаат од "
+"фактурата. "
 
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr ""
+msgstr "Најдобри поздрави."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Неплатено"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Урнек за даночен код"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Document: Customer account statement"
 
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "P&L / BS Category"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8875,18 +9243,22 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Receivale Accounts"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "Банкарски изводи"
 
 #. module: account
 #: field:account.account,balance:0
@@ -8912,23 +9284,23 @@ msgstr ""
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Биланс"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Рачно или автоматски внесено во системот"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
 msgid "Display Account"
-msgstr ""
+msgstr "Прикажи сметка"
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "Метод на затварање"
 
 #. module: account
 #: selection:account.account,type:0
@@ -8936,30 +9308,30 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr ""
+msgstr "Побарување"
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Оваа година"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Account Board"
 
 #. module: account
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr ""
+msgstr "Легенда"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Датум на договор"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8970,17 +9342,22 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr ""
+msgstr "Морате да селектирате сметки за порамнување"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Сметководствените записи се прв инпут од поравмнувањето."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8992,18 +9369,24 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Овде може да дефинирате финансиски период, временски интервал во "
+"финансиската година на вашата компанија. Сметководствениот период обично е "
+"месец или квартал. Вообичаено тој кореспондира со периодите од даночната "
+"декларација. Креирајте и менаџирајте ги периодите од овде и одлучете дали "
+"периодот треба да биде затворен или да биде оставен отворен во зависност од "
+"активностите на вашата компанија во текот на одреден период."
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Филтрирај по"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Рачен запис"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9013,39 +9396,42 @@ msgstr ""
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Премести"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
+"Не можете да го промените данокот, треба да отстраните и повторно да "
+"креирате ставки !"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Аналитички записи од послените 365 денови"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "A/C No."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr ""
+msgstr "Банкарски изводи"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
+"Creates an account with the selected template under this existing parent."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
-msgstr ""
+msgstr "Date of the day"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -9053,7 +9439,7 @@ msgstr ""
 msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
-msgstr ""
+msgstr "Треба да дефинирате банкарска сметка"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9063,13 +9449,13 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Општ извештај"
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Consolidated Children"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:87
@@ -9078,18 +9464,20 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Фактури од клиент и добавувач"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Payment entries"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9098,22 +9486,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Јули"
 
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr ""
+msgstr "Контен план"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "Subscription"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Аналитички биланс на конто"
 
 #. module: account
 #: code:addons/account/account.py:412
@@ -9122,6 +9510,8 @@ msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
 msgstr ""
+"Нема дефинирано период на отварање/затварање, креирајте период за да го "
+"подесите почетниот биланс!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9149,12 +9539,12 @@ msgstr ""
 #: field:accounting.report,period_to:0
 #: field:accounting.report,period_to_cmp:0
 msgid "End Period"
-msgstr ""
+msgstr "Заврши период"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Краен датум"
 
 #. module: account
 #: view:account.move.journal:0
@@ -9170,21 +9560,26 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Account Subscription"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "Maturity date"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Entry Subscription"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9214,7 +9609,7 @@ msgstr ""
 #: field:accounting.report,date_from:0
 #: field:accounting.report,date_from_cmp:0
 msgid "Start Date"
-msgstr ""
+msgstr "Почетен датум"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -9222,31 +9617,33 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr ""
+msgstr "Нацрт фактури"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Непорамнето"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Грешка вкупно !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr ""
+msgstr "Entry Sequence"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9259,27 +9656,34 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Чекам"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Од аналитичките сметки"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Име на период"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Код/Датум"
 
 #. module: account
 #: field:account.account,active:0
@@ -9289,18 +9693,18 @@ msgstr ""
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Споредување"
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Непозната грешка"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9308,23 +9712,25 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Период на отварање/затварање"
 
 #. module: account
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr ""
+msgstr "Секундарна валута"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Потврди движење на сметка"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9348,7 +9754,7 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Кредит"
 
 #. module: account
 #: help:account.invoice.refund,journal_id:0
@@ -9357,13 +9763,16 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"You can select here the journal to use for the refund invoice that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Профит & Загуба (Приходна сметка)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9372,11 +9781,14 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Journal Entry Model"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9386,13 +9798,16 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr ""
+msgstr "Број"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9400,12 +9815,12 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr ""
+msgstr "Општо"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Аналитички записи од последните 30 денови"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9436,19 +9851,19 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Периоди"
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Currency Rate"
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Стандардни даноци"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9457,22 +9872,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Април"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Профит (Загуба) за известување"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Отворено за порамнување"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Parent Left"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
@@ -9480,17 +9895,19 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
+"Refund invoice base on this type. You can not Modify and Cancel if the "
+"invoice is already reconciled"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Наслов 2 (задебелено)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Фактури на добавувач"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9506,7 +9923,7 @@ msgstr ""
 #: field:report.account.sales,product_id:0
 #: field:report.account_type.sales,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Производ"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -9515,6 +9932,9 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9522,16 +9942,18 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Account period"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr ""
+msgstr "Отстрани ставки"
 
 #. module: account
 #: view:account.report.general.ledger:0
@@ -9539,13 +9961,15 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Регуларно"
 
 #. module: account
 #: view:account.account:0
@@ -9554,19 +9978,19 @@ msgstr ""
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Внатрешен тип"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Running Subscriptions"
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Month"
-msgstr ""
+msgstr "Овој месец"
 
 #. module: account
 #: view:account.analytic.balance:0
@@ -9575,7 +9999,7 @@ msgstr ""
 #: view:account.analytic.journal.report:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr ""
+msgstr "Избери период"
 
 #. module: account
 #: view:account.entries.report:0
@@ -9584,7 +10008,7 @@ msgstr ""
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr ""
+msgstr "Posted"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9613,52 +10037,52 @@ msgstr ""
 #: field:accounting.report,date_to:0
 #: field:accounting.report,date_to_cmp:0
 msgid "End Date"
-msgstr ""
+msgstr "Краен датум"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "Откажи отварање на записи"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr ""
+msgstr "Ден од месецот"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr ""
+msgstr "Извор на данок"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Секвенци на фискална година"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Нема детали"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Нема приходна сметка дефинирано за овој производ: \"%s\" (id:%d)"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Не може да креирате ставки на картица на затворена сметка."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "НЕреализирана добивка или загуба"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9666,17 +10090,17 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.period:0
 msgid "States"
-msgstr ""
+msgstr "Состојби"
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Auto-email confirmed invoices"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Verification Total"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -9689,13 +10113,13 @@ msgstr ""
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Вкупно"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Картица: Сите"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9740,22 +10164,22 @@ msgstr ""
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компанија"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Define Recurring Entries"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Датум на доспевање"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "Вкупно готовински трансакции"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9764,57 +10188,61 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Креирај месечни периоди"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Sign For Parent"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Trial Balance Report"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Draft statements"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Manual or automatic creation of payment entries according to the statements"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Празни сметки ? "
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Избраните картица и период треба да припаѓаат на иста компанија."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr ""
+msgstr "Ставки на фактура"
 
 #. module: account
 #: field:account.chart,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Заврши период"
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Кодот на картицата мора да биде единствен по компанија !"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9827,7 +10255,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Generate Your Chart of Accounts from a Chart Template"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -9836,27 +10264,30 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Write-Off Move"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Invoice's state is Done"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Извештај за продажби по сметка"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Фискална позиција на сметки"
 
 #. module: account
 #: report:account.invoice:0
@@ -9866,7 +10297,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Фактура на добавувач"
 
 #. module: account
 #: field:account.account,debit:0
@@ -9890,32 +10321,32 @@ msgstr ""
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Debit"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Наслов 3 (задебелено, помало)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Ставки на фактура"
 
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Error ! You can not create recursive account templates."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Број на запис на картица"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Recurring"
 
 #. module: account
 #: code:addons/account/account.py:642
@@ -9924,32 +10355,34 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains journal items!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
 #, python-format
 msgid "Entry is already reconciled"
-msgstr ""
+msgstr "Записот е скоро порамнет"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Receivable accounts"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Рок за плаќање на партнерот"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Опсег"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Ставки на аналитичка картица поврзани со картица за набавки."
 
 #. module: account
 #: help:account.account,type:0
@@ -9960,28 +10393,33 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "With movements"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr ""
+msgstr "Податоци за сметка"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Account Tax Code Template"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Рачно"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9990,62 +10428,63 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Декември"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Печати аналитички картици"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Групирај по месец од датумот на фактура"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.Account"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Aged Receivable"
 
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Applicability"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
 #, python-format
 msgid "This period is already closed !"
-msgstr ""
+msgstr "Овој период е веќе затворен !"
 
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Друга опциона валута доколку ова е повеќе-валутен запис."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
+"Import of the statement in the system from a supplier or customer invoice"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Billing"
 
 #. module: account
 #: view:account.account:0
 #: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Parent Account"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -10057,6 +10496,12 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
 
 #. module: account
 #: view:account.payment.term:0
@@ -10066,29 +10511,29 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Account Analytic Chart"
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Remaining amount due."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Статистички извештаи"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
 #: code:addons/account/account_move_line.py:1238
 #, python-format
 msgid "Bad account!"
-msgstr ""
+msgstr "Грешка сметка!"
 
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Записи сортирани по"
 
 #. module: account
 #: help:account.move,state:0
@@ -10099,17 +10544,22 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"All manually created new journal entries are usually in the state "
+"'Unposted', but you can set the option to skip that state on the related "
+"journal. In that case, they will be behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' state."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Accounts Mapping"
 
 #. module: account
 #: code:addons/account/account_invoice.py:364
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "Фактурата '%s' чека за потврдување."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10118,33 +10568,33 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноември"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Измени: повлечи фактура, порамни и крирај нова нацрт фактура"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
+msgstr "The income or expense account related to the selected product."
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr ""
+msgstr "Број на периоди"
 
 #. module: account
 #: 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
 msgid "Search Invoice"
-msgstr ""
+msgstr "Барај фактура"
 
 #. module: account
 #: report:account.invoice:0
@@ -10153,7 +10603,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr ""
+msgstr "Повлечи"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10228,16 +10678,85 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+"       | Invoice number: *${object.number}*\n"
+"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Invoice date: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Банкарски сметки"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr ""
+msgstr "Total Receivable"
 
 #. module: account
 #: view:account.account:0
@@ -10245,54 +10764,54 @@ msgstr ""
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Општи информации"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Сметководствени документи"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Validate Account Move Lines"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr ""
+msgstr "Cost Ledger (Only quantities)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Invoice's state is Done."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Штом биде завршено порамнувањето, фактурата може да се плати."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Барај урнеци за сметка"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr ""
+msgstr "Manual Invoice Taxes"
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Parent Right"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -10303,14 +10822,14 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Partner's"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Фискални години"
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -10318,17 +10837,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Доколку активното поле е подесено на Грешка, ќе ви дозволи да ја сокриете "
+"аналитичката картица без да ја отстраните."
 
 #. module: account
 #: field:account.analytic.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "Реф."
 
 #. module: account
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Модел на сметка"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10337,7 +10858,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Февруари"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -10346,6 +10867,9 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10354,28 +10878,28 @@ msgstr ""
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Банкарска сметка"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Account Central Journal"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Доспевање"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Иднина"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Барај ставки од картица"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10387,19 +10911,19 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "Вообичаено 1 или -1."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Аналитички контен план"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Expense Account on Product Template"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -10407,12 +10931,15 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
+"Мора да внесете должина на период која не може да биде 0 или подолу !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -10425,6 +10952,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor annually."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -10432,6 +10966,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
 
 #, python-format
 #~ msgid ""
@@ -10443,3 +10979,76 @@ msgstr ""
 
 #~ msgid "Voucher Management"
 #~ msgstr "Водење на ваучери"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Фактури креирани во изминатите 15 дена"
+
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "Отворено за непорамнување"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Конта за побарувања"
+
+#~ msgid "Go to next partner"
+#~ msgstr "Оди на следен партнер"
+
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажби по тип на конто"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Продажби по конто"
+
+#~ msgid "Tax codes"
+#~ msgstr "Даночни кодови"
+
+#~ msgid "Accounts by type"
+#~ msgstr "Конта по тип"
+
+#~ msgid "Unreconciliate transactions"
+#~ msgstr "Непорамнети трансакции"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "Непорамнети трансакции"
+
+#~ msgid "Are you sure ?"
+#~ msgstr "Дали сте сигурни ?"
+
+#~ msgid "Reconciliation result"
+#~ msgstr "Резултат од порамнувањето"
+
+#~ msgid "Create an Account based on this template"
+#~ msgstr "Креирај конто базирано на овој урнек"
+
+#~ msgid "Dashboard"
+#~ msgstr "Конторлна табла"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Конта за приходи"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Инсталирајте го контниот план"
+
+#~ msgid "Open for bank reconciliation"
+#~ msgstr "Отворено за банкарско порамнување"
+
+#~ msgid "Compute Code for Taxes included prices"
+#~ msgstr "Compute Code for Taxes included prices"
+
+#~ msgid "Reference Type"
+#~ msgstr "Тип на референца"
+
+#~ msgid "Cost Ledger for period"
+#~ msgstr "Cost Ledger for period"
+
+#~ msgid "Reconciliation transactions"
+#~ msgstr "Трансакции за порамнување"
+
+#~ msgid "Standard entries"
+#~ msgstr "Стандардни записи"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "Опис на фактури"
+
+#~ msgid "Amount currency"
+#~ msgstr "Валута на сметката"
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index e6a632bce99..8bd96eba63e 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgstr "Эх данс"
 msgid "All Analytic Entries"
 msgstr "Бүх аналитик бичилтүүд"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -200,7 +195,7 @@ msgstr "Баганын Шошго"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Журнал: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -209,6 +204,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Аналитик журналын төрлийг сонгоно уу. Энэ нь аналитик журналын бичилт үүсгэх "
+"үед хэрэглэгдэнэ. Жишээ нь нэхэмжлэл дээр аналитик журнал сонгох үед зөвхөн "
+"ижил төрлийн журналуудаас сонгох боломжтой."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -224,7 +222,7 @@ msgstr "Татвар"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Бичилт сонгож холбох"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -250,7 +248,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr ""
+msgstr "Белги тайлан"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
@@ -265,6 +263,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Дансны төрөл нь тухайн улс орны хуулиас хамаарсан тайлангуудыг "
+"боловсруулахад хэрэглэгдэхээс гадна санхүүгийн жил өндөрлөх үеийн автомат "
+"бичилтүүдийн дүрэм болж хэрэглэгдэнэ."
 
 #. module: account
 #: report:account.overdue:0
@@ -276,7 +277,7 @@ msgstr "Нийлбэр :"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Давтан гүйлгээ үүсгэх"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -286,7 +287,7 @@ msgstr "Санхүүгийн жил хаах"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Зөрүүг хаах"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -316,6 +317,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Тухайн орон нутгын дансны модыг танай байгуулагад тохирох хувилбараар "
+"суулгах боломжтой."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -400,7 +403,7 @@ msgstr "Худалдан авалтын буцаалт"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Нээх / Хаах Нөхцөл"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -451,7 +454,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Харьцуулах боломжтой"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -513,7 +516,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Данс энэ журнальд хэрэглэгдсэн"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -557,7 +560,7 @@ msgstr "Гүйцээгдээгүй гүйлгээнүүд"
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Эсрэг тал"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -589,7 +592,7 @@ msgstr "Бүх"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Нэхэмжлэлийн хаягийн нэр"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -619,7 +622,7 @@ msgstr "Дараалал"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Тайлангийн утга"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -681,18 +684,6 @@ msgstr "Журналын мөчлөг"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Авлагын данс"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -718,7 +709,7 @@ msgstr "Та гүйлгээ үүсгэхдээ итгэлтэй байна уу?
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл хэвлэх"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -756,7 +747,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Нөхөн олгох арга"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -767,7 +758,7 @@ msgstr "Та зөвхөн ноорог нэхэмжлэлийн валютыг 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Санхүүгийн тайлан"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -1654,11 +1645,6 @@ msgstr "Журналын дугаарлалтыг салгах"
 msgid "Responsible"
 msgstr "Хариуцагч"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Борлуулалт дансны төрлөөр"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2730,13 +2716,6 @@ msgstr "Шинэ байгууллагын санхүүгийн тохиргоо"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Борлуулалт дансаар"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3129,8 +3108,8 @@ msgstr "Дансны модны загвар"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Загвар ашиглан дансны төлөвлөгөө үүсгэх"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -3910,7 +3889,7 @@ msgstr "Дундаж ханшаар"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Дансдыг Харуулах"
 
 #. module: account
 #: view:account.state.open:0
@@ -6303,11 +6282,6 @@ msgstr "Эхлэх огноог оруулна уу !"
 msgid "Supplier Refund"
 msgstr "Нийлүүлэгчийн буцаалт"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Хянах самбар"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6793,6 +6767,8 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Энэ нь тайлан нь шалгах балансыг хэвлэх буюу pdf-р гаргаж данс бүрийг нэг "
+"тайлан дээр шалгах боломжийг өгдөг."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6853,11 +6829,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Орлогын данс"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7078,7 +7049,7 @@ msgstr "Эцэг загвар"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -9675,6 +9646,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Энэ нь тайлан нь шалгах балансыг хэвлэх буюу pdf-р гаргаж ерөнхий дэвтэрийг "
+"бүх журналийн дэлгэрэнгүйгээр гаргадаг."
 
 #. module: account
 #: selection:account.account,type:0
@@ -10695,6 +10668,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Гүйлгээний нэхэмжлэл"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Загвар ашиглан дансны төлөвлөгөө үүсгэх"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Албан ёсны мэдээ тайлан"
 
@@ -11602,6 +11578,9 @@ msgstr ""
 #~ msgid "Statement Process"
 #~ msgstr "Бримтын үйл явц"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Орлогын данс"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Дансны төрлөөр"
 
@@ -11817,6 +11796,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "Мөнгө хариуцагчийн оруулсан хаалтын үлдэгдэл"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Авлагын данс"
+
 #~ msgid "logo"
 #~ msgstr "лого"
 
@@ -12072,6 +12055,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Энэ компанид дансны мод алга, Данс үүсгэнэ үү."
 
+#~ msgid "Dashboard"
+#~ msgstr "Хянах самбар"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Орлого зарлагын тайлан"
 
@@ -12220,6 +12206,12 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Та батлагдсан гүйлгээг устгах боломжгүй: \"%s\"!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Борлуулалт дансны төрлөөр"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Борлуулалт дансаар"
+
 #, python-format
 #~ msgid ""
 #~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -12266,3 +12258,6 @@ msgstr ""
 
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Нийцүүлсэн бичилтүүдийг хамруулах"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 196ac0b7253..bd20a4fa589 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "forrige måned"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -182,11 +182,6 @@ msgstr "Kontokilde"
 msgid "All Analytic Entries"
 msgstr "Alle analytiske registreringer"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fakturaer Opprettet innefor de siste 15 dager"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -541,7 +536,7 @@ msgstr "Velg kontoplan"
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Firmanavn må være unikt !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -687,18 +682,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 "For å avstemme oppføringene bør firma være det samme for alle oppføringer"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitorkonti"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1663,11 +1646,6 @@ msgstr "Separate journalsekvenser"
 msgid "Responsible"
 msgstr "Ansvarlig"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Salg pr kontotype"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2717,13 +2695,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Salg pr. konto"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3111,8 +3082,8 @@ msgstr "Kontoplanmal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Opprett kontoplan fra mal"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6251,11 +6222,6 @@ msgstr "Legg inn en startdato !"
 msgid "Supplier Refund"
 msgstr "Kreditnota"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Konsoll"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6799,11 +6765,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Inntektskonto"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7018,7 +6979,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10502,6 +10463,9 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negativ"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fakturaer Opprettet innefor de siste 15 dager"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -10545,6 +10509,10 @@ msgstr ""
 #~ msgid "Calculated Balance"
 #~ msgstr "Kalkulert balanse"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitorkonti"
+
 #~ msgid "Due date Computation"
 #~ msgstr "Forfallsdato beregning"
 
@@ -10588,6 +10556,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Gå til neste partner"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Salg pr kontotype"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Include initial balances"
 
@@ -10617,6 +10588,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "Kryss av hvis bruker skal kunne avstemme posteringer på denne konto."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Salg pr. konto"
+
 #~ msgid "Tax codes"
 #~ msgstr "Avgiftskoder"
 
@@ -10628,6 +10602,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Referansenummer"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Opprett kontoplan fra mal"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Kontokonfigurasjon"
 
@@ -10765,12 +10742,18 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Kredittype"
 
+#~ msgid "Dashboard"
+#~ msgstr "Konsoll"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Opprett kontoplanen din fra en kontoplanmal"
 
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Resultatrapport"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Inntektskonto"
+
 #~ msgid "9"
 #~ msgstr "9"
 
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 7b10a787857..a4909ed21bd 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
+"PO-Revision-Date: 2012-06-20 16:17+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <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-05-11 04:48+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -192,11 +192,6 @@ msgstr "Bron grootboekrekening"
 msgid "All Analytic Entries"
 msgstr "Alle kostenplaatsboekingen"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturen gemaakt binnen de laatste 15 dagen"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -242,7 +237,7 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Vink dit aan als u geen enkele aan deze belastingcode gerelateerde BTW op "
+"Vink dit aan als u geen enkele aan deze belastingrubriek gerelateerde BTW op "
 "facturen wilt."
 
 #. module: account
@@ -497,8 +492,8 @@ msgid ""
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
 "De belastingstructuur is een boomweergave van de verschillende "
-"belastingcodes, en toont de belastingsituatie van dit moment. De bedragen in "
-"de belastingstructuur komen overeen met de onderdelen van de "
+"belastingrubrieken, en toont de belastingsituatie van dit moment. De "
+"bedragen in de belastingstructuur komen overeen met de onderdelen van de "
 "belastingaangifte van uw land. De hiërarchische structuur kan naar uw wensen "
 "worden aangepast."
 
@@ -661,7 +656,7 @@ msgstr "Toewijzing belastingen"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Gecentraliseerd dagboek"
+msgstr "Dagboek samenvatting"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -716,18 +711,6 @@ msgstr ""
 "Om de boekingen af te kunnen letteren moeten alle boekingen onder hetzelfde "
 "bedrijf vallen."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debiteuren"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1020,7 +1003,7 @@ msgstr "Uitgebreide filters..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Gecentraliseerd dagboek"
+msgstr "Dagboek samenvatting"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1044,9 +1027,10 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
-"Als de belastingrekening een belastingcoderekening betreft is, dan zal dit "
-"veld het bedrag aan belasting bevatten. Als de belasting een grondslagcode "
-"is, dan zal dit veld het bedrag bevatten waarover belasting wordt berekend."
+"Als de belastingrekening een belastingrubriek rekening betreft is, dan zal "
+"dit veld het bedrag aan belasting bevatten. Als de belasting een "
+"grondslagcode is, dan zal dit veld het bedrag bevatten waarover belasting "
+"wordt berekend."
 
 #. module: account
 #: code:addons/account/account.py:2596
@@ -1258,7 +1242,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "Belastingcode sjablonen"
+msgstr "Belastingrubriek sjablonen"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1281,7 +1265,7 @@ msgstr "Belastingen gebruikt bij inkopen"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Belastingcode"
+msgstr "Belastingrubriek"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -1384,7 +1368,7 @@ msgstr "Opgenomen in grondslag"
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr "Analyse boekingen"
+msgstr "Journaalpost analyse"
 
 #. module: account
 #: field:account.account,level:0
@@ -1734,11 +1718,6 @@ msgstr "Afzonderlijke dagboek reeksen"
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkopen per rekeningtype"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2499,7 +2478,7 @@ msgstr "Afletteren per relatie"
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Belastingcode"
+msgstr "Belastingrubriek"
 
 #. module: account
 #: code:addons/account/account_invoice.py:572
@@ -2600,7 +2579,7 @@ msgstr "IKB"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Voorheffing"
+msgstr "Inkoopbelastingen"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2747,7 +2726,7 @@ msgstr "Ref"
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
-"De rekening kan ofwel een grondslagcode- ofwel een belastingcoderekening "
+"De rekening kan ofwel een grondslagcode- ofwel een belastingrubriek rekening "
 "zijn."
 
 #. module: account
@@ -2861,13 +2840,6 @@ msgstr "Nieuwe financiële regeling configureren voor dit bedrijf"
 msgid "Configure Your Chart of Accounts"
 msgstr "Grootboekschema instellen"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkopen per grootboekrekening"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3273,8 +3245,8 @@ msgstr "Grootboekrekening sjablonen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Genereer grootboekschema vanuit een sjabloon"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -3357,7 +3329,7 @@ msgstr "Laat leeg om de kostenrekening te gebruiken"
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr "Dagboeken"
+msgstr "Overige dagboeken"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
@@ -3486,7 +3458,7 @@ msgstr "Jaar"
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "Voorheffing"
+msgstr "Inkoopbelastingen"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -4709,7 +4681,7 @@ msgstr "Niet-afgeletterde transacties"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Credit belastingcode"
+msgstr "Credit belastingrubriek"
 
 #. module: account
 #: view:validate.account.move:0
@@ -5243,7 +5215,7 @@ msgstr "Balans"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "Algemene dagboeken"
+msgstr "Dagboek totalen"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5448,7 +5420,7 @@ msgstr "Communicatie"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Kostenplaatsen"
+msgstr "Kostenplaats dagboeken"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -5477,7 +5449,7 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "Belastingcode teken (+/-)"
+msgstr "Belastingrubriek teken (+/-)"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
@@ -5569,7 +5541,7 @@ msgstr "Betaaldatum"
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Kostenplaats rekeningen"
+msgstr "Kostenplaatsen"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5905,10 +5877,10 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
-"De balastingcode definitie hangt af van de belastingopgave van uw land. "
+"De balastingrubriek definitie hangt af van de belastingopgave van uw land. "
 "OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingstructuur "
-"te beheren. Het is mogelijk om numerieke en alfanumerieke belastingcodes te "
-"gebruiken."
+"te beheren. Het is mogelijk om numerieke en alfanumerieke belastingrubrieken "
+"te gebruiken."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -6165,7 +6137,7 @@ msgstr ""
 "registreren in OpenERP. Indien u een leveranciersfactuur wilt registreren, "
 "start dan met het registreren van een regel voor kostenrekening. OpenERP zal "
 "vervolgens automatisch de belasting, gerelateerd aan deze rekening "
-"voorstellen, alsmede de tegenrekening \"Te betalen\"."
+"voorstellen, alsmede de tegenrekening \"Crediteuren\"."
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -6549,11 +6521,6 @@ msgstr "Geef een startdatum in!"
 msgid "Supplier Refund"
 msgstr "Credit inkoopfactuur"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6736,7 +6703,7 @@ msgstr ""
 "een rekening wordt gebruikt bij een dagboek. De afsluitmethode van een "
 "categorie bepaald de verwerking van de jaarlijkse afsluiting. Rapporten "
 "zoals de balans en de winst&verlies rekening gebruiken de categorie "
-")Winst/verlies of balans). Bijvoorbeeld, de categoriesoort kan zijn "
+"(Winst/verlies of balans). Bijvoorbeeld, de categoriesoort kan zijn "
 "gekoppeld aan een activa rekening, kostenrekening of een te betalen "
 "rekening. In dit scherm kunt u de categorieën aanmaken of wijzigen."
 
@@ -7147,11 +7114,6 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Opbrengsten rekeningen"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7392,7 +7354,7 @@ msgstr "Bovenliggerde grootboekkaart template"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Installeer uw rekeningschema"
 
 #. module: account
@@ -7464,7 +7426,7 @@ msgstr "Akkoord"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "Basis belastingcode"
+msgstr "Basis belastingrubriek"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -8249,7 +8211,7 @@ msgstr "Automatische boeking"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Fout! U kunt geen herhalende belastingcodes maken"
+msgstr "Fout! U kunt geen herhalende belastingrubrieken maken"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -9412,7 +9374,7 @@ msgstr "Onbetaald"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Belastingcode sjabloon"
+msgstr "Belastingrubriek sjabloon"
 
 #. module: account
 #: report:account.overdue:0
@@ -9497,7 +9459,7 @@ msgstr "Afsluit methode"
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "Te betalen"
+msgstr "Crediteuren"
 
 #. module: account
 #: view:report.account.sales:0
@@ -10247,7 +10209,7 @@ msgstr "Dag van de maand"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Belastingcode"
+msgstr "Belastingrubriek"
 
 #. module: account
 #: view:ir.sequence:0
@@ -10611,7 +10573,7 @@ msgstr "Boekhoudgegevens"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Belastingcode sjabloon"
+msgstr "Belastingrubriek sjabloon"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -11437,9 +11399,6 @@ msgstr ""
 #~ msgid "Total write-off"
 #~ msgstr "Totaal afgeboekt"
 
-#~ msgid "Tax codes"
-#~ msgstr "Belastingcodes"
-
 #~ msgid "New Analytic Account"
 #~ msgstr "Nieuwe kostenplaats"
 
@@ -12084,6 +12043,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Kosten en opbrengsten per dagboek (Deze maand)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debiteuren"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Open voor verrekening"
 
@@ -12676,6 +12639,9 @@ msgstr ""
 #~ msgid "Year :"
 #~ msgstr "Jaar :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturen gemaakt binnen de laatste 15 dagen"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Rekeningen per soort"
 
@@ -12888,6 +12854,9 @@ msgstr ""
 #~ msgid "Customer Invoices to Approve"
 #~ msgstr "Klantfacturen goed te keuren"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkopen per rekeningtype"
+
 #~ msgid "Fill this if the journal is to be used for refunds of invoices."
 #~ msgstr ""
 #~ "A.u.b. invullen indien het dagboek gebruikt wordt voor het crediteren van "
@@ -12899,6 +12868,9 @@ msgstr ""
 #~ msgid "Your Reference"
 #~ msgstr "Uw referentie"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkopen per grootboekrekening"
+
 #~ msgid "A/c Code"
 #~ msgstr "Rek. code"
 
@@ -13032,12 +13004,24 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Maak een rekening gebaseerd op dit sjabloon"
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Omschrijving op facturen"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Installeer uw rekeningschema"
+
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Genereer grootboekschema vanuit een sjabloon"
+
 #~ msgid "Cost Ledger for period"
 #~ msgstr "Kosten grootboek voor periode"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Opbrengsten rekeningen"
+
 #~ msgid "Consider reconciled entries"
 #~ msgstr "Afgeletterde boekingen meenemen"
 
@@ -13195,3 +13179,6 @@ msgstr ""
 #~ msgstr ""
 #~ "De Account Voucher module bevat diverse functies om met bonnen te werken; "
 #~ "Inkoopbonnen, Verkoopbonnen, etc. "
+
+#~ msgid "Tax codes"
+#~ msgstr "Belastingrubrieken"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index a45345d4ba9..1808aff32cc 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,14 +13,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "vorige maand"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -38,6 +38,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Bepaalt de volgorde in het rapport 'Boekhouding \\ Rapportering \\ Algemene "
+"rapportering \\ Btw \\ Btw-aangifte'"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -55,7 +57,7 @@ msgstr "Rekeningstatistieken"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "Proforma/Openstaande/Betaalde facturen"
 
 #. module: account
 #: field:report.invoice.created,residual:0
@@ -81,7 +83,7 @@ msgstr "Instellen onderliggende"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Boekingslijn \"%s\" is niet geldig."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -118,6 +120,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Configuratiefout: de gekozen munt moet door de standaardrekeningen worden "
+"gedeeld."
 
 #. module: account
 #: report:account.invoice:0
@@ -168,7 +172,7 @@ msgstr "Waarschuwing!"
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Diversendagboek"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -181,15 +185,10 @@ msgstr "Bronrekening"
 msgid "All Analytic Entries"
 msgstr "Alle analytische boekingen"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturen van de afgelopen 15 dagen"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Kolomkop"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -264,6 +263,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Het rekeningtype wordt informatief gebruikt om landspecifieke wettelijke "
+"rapporten te maken. Verder bepaalt het de regels voor de afsluiting van een "
+"boekjaar en het maken van openingsboekingen."
 
 #. module: account
 #: report:account.overdue:0
@@ -350,6 +352,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Hier kunt u het formaat kiezen voor deze record. Automatische formattering "
+"is gebaseerd op de hiërarchie van de financiële rapporten (automatisch "
+"berekend veld 'niveau')."
 
 #. module: account
 #: view:account.installer:0
@@ -380,6 +385,7 @@ msgstr ""
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"U kunt geen boekingslijnen maken voor een rekening van het type Weergave."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -456,7 +462,7 @@ msgstr "Het bedrag uitgedrukt in een optionele andere munt."
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Vergelijking mogelijk maken"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -548,7 +554,7 @@ msgstr "Boekhoudplan kiezen"
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "De firmanaam moet uniek zijn"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -631,7 +637,7 @@ msgstr "Volgorden"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Rapportwaarde"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -653,6 +659,7 @@ msgstr "Hoofdvolgorde mag niet gelijk zijn aan de huidige volgorde."
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
+"Geen periode gevonden, of meer dan een periode voor de gekozen datum."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -695,24 +702,14 @@ msgstr ""
 "Om de boekingen te kunnen afpunten, moeten alle boekingen tot hetzelfde "
 "bedrijf behoren."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Klanten"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"De datum van uw boeking ligt niet in de gedefinieerde periode. Verander de "
+"datum of schakel de optie op het journaal uit."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -742,12 +739,12 @@ msgstr "Vandaag afgepunte relaties"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "Verkoopdagboek huidig jaar"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Onderliggende records met hiërarchie tonen"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -770,7 +767,7 @@ msgstr "Analytische boekingen per lijn"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Crediteermethode"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -781,7 +778,7 @@ msgstr "U kunt alleen de munt van voorlopige facturen wijzigen."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Financieel rapport"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -805,6 +802,8 @@ msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Er ontbreekt btw.\n"
+"Klik op de knop \"Berekenen\"."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -819,7 +818,7 @@ msgstr "Relatiereferentie van factuur"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Aankoopfacturen en -creditnota's"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -833,6 +832,7 @@ msgstr "Afpunten ongedaan maken"
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
 msgstr ""
+"Twee procent netto binnen 14 dagen, restbedrag binnen 30 dagen einde maand."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
@@ -857,6 +857,9 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"Bij transacties in vreemde munten komen er koersverschillen voor. In dit "
+"menu ziet u Winst of verlies mochten deze transacties vandaag worden "
+"afgesloten. Enkel voor rekeningen met een secundaire munt."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -902,7 +905,7 @@ msgstr "Berekening"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "Annuleren: crediteren en afpunten"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -939,6 +942,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"U kunt deze boeking niet valideren omdat \"%s\" niet tot het boekhoudplan "
+"\"%s\" behoort."
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -947,6 +952,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Deze rekening kan niet worden afgepunt. U moet dit instellen voor deze "
+"rekening."
 
 #. module: account
 #: view:account.invoice:0
@@ -975,7 +982,7 @@ msgstr "Consolidatie"
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr ""
+msgstr "Passiva"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1017,7 +1024,7 @@ msgstr ""
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Kan hoofdcode voor sjabloonrekening niet vinden."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1093,11 +1100,13 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"U kunt het rekeningtype niet wijzigen van '%s' in '%s' omdat er al boekingen "
+"zijn."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Sorteren op"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
@@ -1118,7 +1127,7 @@ msgstr ""
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
-msgstr ""
+msgstr "U moet een rekening opgeven voor de afschrijvingsboeking"
 
 #. module: account
 #: view:account.tax:0
@@ -1157,7 +1166,7 @@ msgstr "Boekingen genereren voor:"
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Boekingen niet in evenwicht"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1183,6 +1192,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totaalbedrag (in secundaire munt) voor transacties in secundaire munt voor "
+"deze rekening."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1198,7 +1209,7 @@ msgstr "Creditcentralisering"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "Alle verkopen van de maand per type"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1227,12 +1238,12 @@ msgstr "Facturen annuleren"
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Deze code wordt op de rapporten getoond."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Btw gebruikt voor aankopen"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1264,6 +1275,8 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"U kunt deze grootboekrekening niet gebruiken in dit journaal. Kijk het "
+"tabblad 'Boekingscontrole' na voor het journaal."
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1301,7 +1314,7 @@ msgstr "Overige"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Voorlopige abonnementsboeking"
 
 #. module: account
 #: view:account.account:0
@@ -1375,7 +1388,7 @@ msgstr "Begin- en eindperiode kiezen"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Winst en verlies"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1529,6 +1542,8 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Door het veld Actief uit te schakelen, kunt u een fiscale positie verbergen "
+"zonder dat u deze verwijdert."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1606,7 +1621,7 @@ msgstr "Rekeninguittreksels zoeken"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Ongeboekte lijnen"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1690,11 +1705,6 @@ msgstr "Afzonderlijke journaalnummering"
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkopen per rekeningtype"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -1746,7 +1756,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Wachtende rekeningen"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1830,7 +1840,7 @@ msgstr "Creditbedrag"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fout!"
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1862,7 +1872,7 @@ msgstr "Boekingen per lijn"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Op basis van"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1897,7 +1907,7 @@ msgstr "U kunt niet dezelfde bedrijven maken."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Aankoop/verkoopdagboek"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1939,6 +1949,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Deze rekening wordt gebruikt voor overgedragen winst/verlies (bij winst "
+"wordt het bedrag opgeteld, bij verlies wordt het bedrag afgetrokken) op "
+"basis van Winst– en verliesrapport."
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1983,7 +1996,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "U moet een analytisch journaal instellen van het type '%s'."
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1998,11 +2011,15 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"De gekozen rekening van uw boeking vereist een secundaire munt. U moet de "
+"secundaire munt van de rekening verwijderen of een multivalutaweergave "
+"kiezen voor het journaal."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
+"Biedt een generiek systeem om makkelijk financiële rapporten te maken."
 
 #. module: account
 #: view:account.invoice:0
@@ -2022,12 +2039,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Analytische boekingen voor het verkoopdagboek."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Schuine tekst (kleiner)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2045,7 +2062,7 @@ msgstr "Voorlopig"
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
-msgstr ""
+msgstr "Btw-aangifte"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -2116,7 +2133,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "U moet een analytisch dagboek toekennen aan het '%s' journaal."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2166,6 +2183,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Kan geen volgnummer toekennen aan dit stuk.\n"
+"Stel een boekingsreeks in voor het journaal of maak zelf een boekingsreeks "
+"voor dit stuk."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2174,11 +2194,13 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"U kunt de firma van dit journaal niet wijzigen, omdat er al een boekingslijn "
+"bestaat."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Klantencode"
 
 #. module: account
 #: view:account.installer:0
@@ -2238,7 +2260,7 @@ msgstr "Er is geen aankoop- of verkoopjournaal ingesteld."
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "Het IBAN-nummer is niet geldig"
 
 #. module: account
 #: view:product.category:0
@@ -2326,7 +2348,7 @@ msgstr "Leeg laten voor alle geopende boekjaren"
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Rekeninglijn"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2345,6 +2367,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Journalen instellen. Bankjournalen stelt u beter in via 'Stel uw "
+"bankjournalen in', waarmee bankrekeningen en journalen automatisch voor u "
+"worden gemaakt."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2354,7 +2379,7 @@ msgstr "Boeking"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "U kunt niet dezelfde verenigingsleden maken."
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2368,6 +2393,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Als u een uittreksel wilt verwijderen, moet u eerst de gekoppelde "
+"boekingslijnen verwijderen."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2453,7 +2480,7 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% voorschot einde 30 dagen"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2540,7 +2567,7 @@ msgstr "Leveranciers-btw"
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2590,7 +2617,7 @@ msgstr "Met dit rapport krijgt u een overzicht van een specifiek journaal"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Afpunten boekingslijnen (afschrijving)"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2676,7 +2703,7 @@ msgstr "Korting(%)"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr "Ref"
+msgstr "Ref."
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -2686,7 +2713,7 @@ msgstr "De rekening kan betrekking hebben op een basisvak of een btw-vak."
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
-msgstr ""
+msgstr "Verkeerde credit– of debetwaarde in het model; moet positief zijn."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2721,7 +2748,7 @@ msgstr "Datums"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Hoofdplansjabloon"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2733,7 +2760,7 @@ msgstr "Hoofd btw-rekening"
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "De nieuwe munt is niet juist ingesteld."
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2760,7 +2787,7 @@ msgstr "Boekingen"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Communicatietype"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2791,14 +2818,7 @@ msgstr "Nieuwe firma instellen"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkopen per rekening"
+msgstr "Stel uw boekhoudplan in"
 
 #. module: account
 #: view:account.use.model:0
@@ -2826,6 +2846,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"U moet een openingsjournaal maken met Centraliseren ingesteld om de "
+"openingsbalans te boeken."
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2837,7 +2859,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Niet-gerealiseerde winst en verlies"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2927,6 +2949,8 @@ msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
+"U kunt een openstaande of betaalde factuur niet verwijderen. U maakt het "
+"best een creditnota."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2937,7 +2961,7 @@ msgstr "Standaard verkoop-btw"
 #: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Factuur '%s' is goedgekeurd."
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2981,6 +3005,8 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Verschil in btw.\n"
+"Klik op berekenen om de btw bij te werken."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -3029,7 +3055,7 @@ msgstr "Munt van de factuur"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Boekhoudkundige rapporten"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3054,7 +3080,7 @@ msgstr "Lijst btw-sjablonen"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Aankoop/verkoopdagboeken"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3096,7 +3122,7 @@ msgstr "Altijd"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Maand-1"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3143,7 +3169,7 @@ msgstr "Analytische lijnen"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proformafacturen"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3158,7 +3184,7 @@ msgstr "Klantencredit"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Dag van de maand: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3199,13 +3225,13 @@ msgstr "Sjablonen boekhoudplan"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Boekhoudplan maken op basis van sjabloon"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Verkopen van deze maand per type"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3215,7 +3241,7 @@ msgstr "Rekening afpunten/afpunten ongedaan maken"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr ""
+msgstr "De omschrijving moet uniek zijn per firma."
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3317,7 +3343,7 @@ msgstr "Boekhouding instellen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Waarde bedrag: 0,02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3347,7 +3373,7 @@ msgstr "Periode afsluiten"
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Details tonen"
 
 #. module: account
 #: report:account.overdue:0
@@ -3357,7 +3383,7 @@ msgstr "Btw:"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ongeldige gestructureerde mededeling"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3391,7 +3417,7 @@ msgstr "Btw-plan"
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Het eindsaldo moet gelijk zijn aan het berekende saldo."
 
 #. module: account
 #: view:account.journal:0
@@ -3469,17 +3495,17 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "Hoeveelheid:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Lengte periode (dagen)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Aankoop/verkoopdagboek afdrukken"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3506,12 +3532,12 @@ msgstr "Verkopen per rekeningtype"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Niet-afgepunte boekingen"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "De munt moet uniek zijn per firma."
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3527,6 +3553,11 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Kan geen factuur maken.\n"
+"De gekoppelde betalingstermijn is wellicht foutief ingesteld omdat het "
+"berekende bedrag groter is dan het totale factuurbedrag. De laatste lijn van "
+"uw betalingstermijn moet van het type 'Saldo' zijn, om afrondingsproblement "
+"te vermijden."
 
 #. module: account
 #: report:account.invoice:0
@@ -3561,7 +3592,7 @@ msgstr "Gecentraliseerde tegenboeking"
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "U kunt niet boeken op een weergaverekening %s %s."
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3620,7 +3651,7 @@ msgstr "Datum"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Boeken"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3693,7 +3724,7 @@ msgstr "Geen filters"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Proformafacturen"
 
 #. module: account
 #: view:res.partner:0
@@ -3783,7 +3814,7 @@ msgstr "#Boekingen"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "Maak een creditnota"
 
 #. module: account
 #: view:account.state.open:0
@@ -3808,6 +3839,9 @@ msgid ""
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"U kunt geen factuur boeken in een gecentraliseerd dagboek. Schakel het "
+"veldje Gecentraliseerde tegenboeking uit in het betrokken journaal (via "
+"Instellingen)."
 
 #. module: account
 #: field:account.account,name:0
@@ -3831,7 +3865,7 @@ msgstr "Ageingbalans"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "U kunt niet boeken op een afgesloten rekening %s %s."
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3842,7 +3876,7 @@ msgstr "Boekingsdatum"
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Uw bankrekeningen instellen"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3874,6 +3908,7 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Boekjaar, perioden of boekhoudplan moeten tot dezelfde firma behoren."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3889,7 +3924,7 @@ msgstr "Boekhouding"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Boekingen met de periode in het huidige jaar."
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3907,6 +3942,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Winst of verlies door wisselkoersverschillen bij transacties in "
+"verschillende munten."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3986,7 +4023,7 @@ msgstr "Gemiddelde koers"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Getoonde rekeningen"
 
 #. module: account
 #: view:account.state.open:0
@@ -4029,7 +4066,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Geboekte lijnen"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4044,12 +4081,12 @@ msgstr "Voorlopige boekingen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  Dag van de maand= -1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  Aantal dagen: 30"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4060,7 +4097,7 @@ msgstr "Snelkoppeling"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "De begindatum van het boekjaar moet voor de einddatum liggen."
 
 #. module: account
 #: view:account.account:0
@@ -4081,7 +4118,7 @@ msgstr "Rekeningtype"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Eigenaar bankrekening"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4119,6 +4156,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"U heeft onvoldoende argumenten gegeven om de beginbalans te berekenen. Kies "
+"een periode en een journaal."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4164,11 +4203,15 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"U kunt een bevestigde boeking niet wijzigen. U kunt alleen bepaalde niet-"
+"wettelijke velden veranderen. Anders moet u de bevestiging van de boeking "
+"eerst ongedaan maken.\n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal-rekening"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4184,7 +4227,7 @@ msgstr "Opmerking"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Balansteken omdraaien"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4196,7 +4239,7 @@ msgstr "Vervallen rekening"
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Balans (passief)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4228,7 +4271,7 @@ msgstr "Boekhoudeigenschappen klanten"
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
-msgstr ""
+msgstr "Paypal-gebruikersnaam (doorgaans e-mail) voor on line betalingen."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4293,7 +4336,7 @@ msgstr "Periodieke verwerking"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "U kunt niet analytisch boeken op een weergaverekening."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4322,7 +4365,7 @@ msgstr "Boekhoudplan"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Hoofdtitel 1 (vet, onderlijnd)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4343,7 +4386,7 @@ msgstr "Factuurstatistieken"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Wisselkoers"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4376,7 +4419,7 @@ msgstr "Niet geïmplementeerd"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Kan zichtbaar zijn?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4391,7 +4434,7 @@ msgstr "Creditnota's"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "De code van de periode moet uniek zijn per firma."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4411,6 +4454,9 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Schakel dit uit als u deze sjabloon niet actief wilt gebruiken in de wizard "
+"die het boekhoudplan maakt van sjabloon. Dit is handig als u enkel "
+"rekeningen wilt maken bij het laden van deze onderliggende sjabloon."
 
 #. module: account
 #: view:account.use.model:0
@@ -4429,6 +4475,7 @@ msgstr "Afpunten toelaten"
 msgid ""
 "You can not modify company of this period as some journal items exists."
 msgstr ""
+"U kunt de firma van deze periode niet wijzigen, omdat er boekingen bestaan."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4461,7 +4508,7 @@ msgstr "Boekingsmodellen"
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "Coderingsfout"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4511,7 +4558,7 @@ msgstr "Eindsaldo van kas"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Example"
-msgstr ""
+msgstr "Voorbeeld"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
@@ -4533,7 +4580,7 @@ msgstr "Leeg laten voor opbrengstenrekening"
 #: code:addons/account/account.py:3299
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Aankoop-btw %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -4588,7 +4635,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4634,12 +4681,12 @@ msgstr "Inkomstenrekening van productsjabloon"
 #: code:addons/account/account.py:3120
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "DIV"
 
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Factuur (Ref. ${object.number or 'nvt' })"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4668,7 +4715,7 @@ msgstr "Facturen"
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Mijn facturen"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4691,7 +4738,7 @@ msgstr "Gefactureerd"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Definitieve boekingen"
 
 #. module: account
 #: view:account.use.model:0
@@ -4705,6 +4752,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Bankrekeningnummer waarop de factuur zal worden betaald. Een firmabank als "
+"het een verkoopfactuur of aankoopcreditnota is, anders het rekeningnummer "
+"van een relatie."
 
 #. module: account
 #: view:account.state.open:0
@@ -4749,17 +4799,20 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Configuratiefout \n"
+"U kunt geen onderliggende rekeningen maken voor een rekening met een intern "
+"type dat niet gelijk is aan \"Weergave\". "
 
 #. module: account
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Openingsperiode"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Te bekijken boekingen"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4858,7 +4911,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Factuurnummer moet uniek zijn per bedrijf"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -4873,7 +4926,7 @@ msgstr "Openingsboekingen maken"
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Boekhouder"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -4881,6 +4934,8 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Via deze weergave ziet u een analyse van uw thesaurie. Het is de som van het "
+"saldo van elke boeking op financiële rekeningen per periode."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4901,7 +4956,7 @@ msgstr "Bewegingen"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "Verkoopdagboek huidige maand"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4922,7 +4977,7 @@ msgstr "Af te sluiten"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Begin van periode"
 
 #. module: account
 #: code:addons/account/account.py:1351
@@ -5006,7 +5061,7 @@ msgstr "Doelbewegingen"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 dagen netto"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5049,13 +5104,16 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Hiermee kiest u of u de gebruiker de btw-percentages laat ingeven of laat "
+"kiezen uit een lijst van btw-codes. Voor de laatste optie moeten de btw-"
+"instellingen voor deze sjabloon volledig zijn."
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Boekhoudkundig rapport"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5136,7 +5194,7 @@ msgstr "Algemene dagboeken"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Datum in periode"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5187,7 +5245,7 @@ msgstr "Verkoop"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5238,7 +5296,7 @@ msgstr "Coëfficiënt voor hoofd"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "Vervallen analytische rekeningen"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5275,7 +5333,7 @@ msgstr "Statistieken analyt. boekingen"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Kas en bank"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5341,7 +5399,7 @@ msgstr "Analytische boekhouding"
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Beginbalans opnemen"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5355,6 +5413,8 @@ msgstr "Verkoopcreditnota"
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"U kunt niet meer dan een beweging maken per periode in een "
+"centralisatiedagboek."
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5372,7 +5432,7 @@ msgstr "Facturen van de afgelopen 15 dagen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  Aantal dagen: 14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -5395,7 +5455,7 @@ msgstr "Configuratiefout"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Te betalen bedrag"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5437,7 +5497,7 @@ msgstr "Munt veranderen"
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "Deze actie wist de btw"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5460,7 +5520,7 @@ msgstr "Analytische rekeningen"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Verkoopfacturen en -creditnota's"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5506,12 +5566,12 @@ msgstr "Nummer (beweging)"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "Analytische boekingen van de laatste 7 dagen"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Normale tekst"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5580,7 +5640,7 @@ msgstr "Kas openen"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatische formattering"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5589,6 +5649,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Geen boekjaar gevonden voor deze datum.\n"
+"Gelieve een boekjaar te maken via de instellingen in het menu Financieel."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5647,7 +5709,7 @@ msgstr "De berekeningsmethode voor het btw-bedrag."
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Berekening vervaldatum"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5670,7 +5732,7 @@ msgstr "Afhankelijke rekeningen"
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Boekingsnaam (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5849,12 +5911,12 @@ msgstr "Filteren op"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "U heeft een verkeerde expressie \"%(...)s\" in uw model."
 
 #. module: account
 #: field:account.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "Boekingsdatum"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
@@ -5873,14 +5935,14 @@ msgstr ""
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Saldo zoals berekend volgens het beginsaldo en de transactielijnen."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "Huidige munt is niet juist ingesteld"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5916,7 +5978,7 @@ msgstr "Periode: %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "Bekijk uw financiële journalen"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5950,7 +6012,7 @@ msgstr "Verkoopcreditnota"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Saldo VM"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5986,7 +6048,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Lopende abonnementen"
 
 #. module: account
 #: report:account.invoice:0
@@ -6012,6 +6074,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Configuratiefout \n"
+"U kunt geen onderliggende rekeningen maken voor een rekening met een intern "
+"type dat niet gelijk is aan \"Weergave\". "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -6019,6 +6084,8 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Dit journaal wordt automatisch gemaakt voor de bankrekening bij het opslaan "
+"van uw record."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6097,7 +6164,7 @@ msgstr "Dit is een model voor terugkerende boekingen"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Verkoop-btw (%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6130,6 +6197,9 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Hiermee kiest u of u de gebruiker de btw-percentages laat ingeven of de "
+"gewone m2o-velden zal gebruiken. Voor de laatste optie moeten de btw-"
+"instellingen voor deze sjabloon volledig zijn."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6144,12 +6214,12 @@ msgstr "Bedrijven"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Openstaande en betaalde facturen"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Onderliggende plat tonen"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6158,6 +6228,8 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"U kunt een rekening ingesteld voor een klant of leverancier niet verwijderen "
+"of op niet-actief zetten."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6242,7 +6314,7 @@ msgstr "Te ontvangen"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "De firma moet dezelfde zijn voor de rekening en de periode."
 
 #. module: account
 #: view:account.invoice:0
@@ -6272,7 +6344,7 @@ msgstr "Kas"
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr ""
+msgstr "Vermogen"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6293,7 +6365,7 @@ msgstr "Kracht"
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Kan geen ongebruikte journaalcode maken."
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6402,6 +6474,7 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"U kunt de firma van een rekening niet wijzigen als er al boekingen bestaan."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6417,11 +6490,6 @@ msgstr "Geef een begindatum in."
 msgid "Supplier Refund"
 msgstr "Aankoopcreditnota"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6463,7 +6531,7 @@ msgstr "Alleen-lezen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  Waardering: saldo"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -6482,7 +6550,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Heeft standaardfirma"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6504,7 +6572,7 @@ msgstr "Analytisch journaal"
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr ""
+msgstr "U kunt een rekening met boekingen niet op inactief zetten."
 
 #. module: account
 #: view:account.entries.report:0
@@ -6560,7 +6628,7 @@ msgstr "Statistieken analytische boekingen"
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "U kunt een rekening met boekingen niet verwijderen."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
@@ -6577,7 +6645,7 @@ msgstr "Manueel recurrente boekingen maken in een journaal naar keuze."
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Munt van het betrokken journaal."
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6608,7 +6676,7 @@ msgstr ""
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Balans (actief)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6636,7 +6704,7 @@ msgstr "Totaal debet"
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "Bokeking \"%s\" is ongeldig."
+msgstr "Boeking \"%s\" is ongeldig."
 
 #. module: account
 #: report:account.invoice:0
@@ -6675,7 +6743,7 @@ msgstr "Python-code"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Boekingen in de huidige periode."
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6701,7 +6769,7 @@ msgstr "Boeking maken"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Winst en verlies (kostenrekening)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6737,12 +6805,12 @@ msgstr "Fout"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Financieel rapport"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Balansteken behouden"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -6761,7 +6829,7 @@ msgstr "Afgedrukt"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "Error :"
-msgstr ""
+msgstr "Fout:"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6801,6 +6869,8 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Als u filtert op datum of periode, kunt u met dit veld een rij toevoegen om "
+"debet/credit/saldo te tonen."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6824,6 +6894,10 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"U kunt een afgepunte boeking niet wijzigen. U kunt alleen bepaalde niet-"
+"wettelijke velden veranderen. Anders moet u de afpunting van de boeking "
+"eerst ongedaan maken.\n"
+"%s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6943,7 +7017,7 @@ msgstr ""
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Volledige btw-instellingen"
 
 #. module: account
 #: view:account.chart.template:0
@@ -6962,6 +7036,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Geef een BIC/Swift-code voor het banktype IBAN-rekening als u geldige "
+"betalingen wilt uitvoeren"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6997,11 +7074,6 @@ msgstr ""
 "\n"
 "vb. Mijn model van %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Opbrengstenrekeningen"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7017,7 +7089,7 @@ msgstr "Onderliggende codes"
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "Btw gebruikt voor verkopen"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
@@ -7064,6 +7136,10 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
+"Stel de bankrekeningen van uw firma in en kies welke rekeningen op rapporten "
+"moeten worden afgedrukt. U kunt de banken in een andere volgorde zetten "
+"vanuit lijstweergave. Als u de boekhoudtoepassing van OpenERP gebruikt, "
+"worden bankjournalen en rekeningen automatisch gemaakt."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7097,7 +7173,7 @@ msgstr "Brondocument"
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -7115,7 +7191,7 @@ msgstr "Uittreksels afpunten"
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Boekhoudkundig rapport"
 
 #. module: account
 #: report:account.invoice:0
@@ -7142,7 +7218,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hiërarchie financiële rapporten"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7212,11 +7288,13 @@ msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
+"Kan geen boekhoudplan vinden; maak een boekhoudplan via de instellingen van "
+"het menu Financieel."
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Kostenrekening openingsboekingen"
 
 #. module: account
 #: code:addons/account/account_move_line.py:999
@@ -7231,7 +7309,7 @@ msgstr "Hoofdrekeningsjabloon"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -7259,12 +7337,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Goedgekeurde boekingen"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Voor percentage, typt u een % ratio tussen 0 en 1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7277,7 +7355,7 @@ msgstr "Factuurdatum"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Groepering per jaar van factuurdatum"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7339,7 +7417,7 @@ msgstr "Standaard aankoop-btw"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Opbrengstenrekening openingsboekingen"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7365,7 +7443,7 @@ msgstr "U moet perioden van dezelfde firma kiezen"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "Bekijk uw betalingsvoorwaarden"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7380,7 +7458,7 @@ msgstr "Boekingen maken"
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Informatie over de bank"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -7402,7 +7480,7 @@ msgstr "Waarschuwing"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Contract/Analytische rekeningen"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -7451,7 +7529,7 @@ msgstr "Model gebruiken"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Kan het beginsaldo niet aanpassen (negatief)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7476,7 +7554,7 @@ msgstr "Factuurlijn"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Aan– en verkoopcreditnota's"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7487,18 +7565,18 @@ msgstr "Teken op rapporten"
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "Geen perioden gevonden om openingsboekingen te maken"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Root/weergave"
 
 #. module: account
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEN"
 
 #. module: account
 #: report:account.invoice:0
@@ -7522,7 +7600,7 @@ msgstr "Normaal"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-mailsjablonen"
 
 #. module: account
 #: view:account.move.line:0
@@ -7557,12 +7635,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Meerdere munten"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Vervaldatum"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -7597,7 +7675,7 @@ msgstr "Geen stuknummer"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Hiërarchie boekhoudkundige rapporten"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7608,11 +7686,16 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Met dit optionele veld kunt u een rekeningsjabloon koppelen aan een "
+"specifieke boekhoudplansjabloon, die anders kan zijn dan de hoofdrekening. "
+"Hiermee kunt u boekhoudplansjablonen maken die een uitbreiding zijn van "
+"elkaar en deze vervolledigen met enkele nieuwe rekeningen (op die manier "
+"moet u de hele gemeenschappelijke structuur niet opnieuw instellen)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Niet-bevestigde boekingen"
 
 #. module: account
 #: view:product.product:0
@@ -7641,7 +7724,7 @@ msgstr "Tot"
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Muntaanpassing"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7660,6 +7743,7 @@ msgstr "Geselecteerde facturen annuleren"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Met dit veld worden wettelijke rapporten gemaakt: winst-en-verlies, balans."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7669,6 +7753,10 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Betalingsvoorwaarden bepalen de condities om een verkoop– of aankoopfactuur "
+"in een of meer termijnen te bepalen. Aanmaningen zijn gebaseerd op de "
+"betalingsvoorwaarden. Elke klant of leverancier kan een betalingsvoorwaarde "
+"hebben."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7695,7 +7783,7 @@ msgstr "Te betalen rekeningen"
 #: code:addons/account/account_invoice.py:732
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
-msgstr ""
+msgstr "Globale btw gedefinieerd, maar niet op de factuurlijnen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7708,6 +7796,7 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
 msgstr ""
+"Volgorde wordt gebruikt om de elementen te sorteren van laag naar hoog"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -7728,7 +7817,7 @@ msgstr "Verkoop-btw"
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Rapportnaam"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7787,17 +7876,17 @@ msgstr "Volgorde"
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "U kunt niet dezelfde categorieën maken."
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "De optionele hoeveelheid voor boekingen"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Hoofdrapport"
 
 #. module: account
 #: view:account.state.open:0
@@ -7847,7 +7936,7 @@ msgstr "    7 dagen    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Berekend saldo"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7975,6 +8064,7 @@ msgstr "Kies de munt voor de factuur"
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
 msgstr ""
+"De bankrekening voor de gekozen boekhoudplansjabloon heeft geen code."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7991,7 +8081,7 @@ msgstr "Geen factuurlijnen"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Rapporttype"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8034,6 +8124,8 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Het uittrekselsaldo is niet juist.\n"
+"Het verwachte saldo (%.2f) verschilt van het berekende saldo (%.2f)."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
@@ -8051,6 +8143,12 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Het normale boekhoudplan heeft een structuur die wettelijk per land is "
+"vastgelegd. De analytische structuur weerspiegelt de behoeften van uw "
+"bedrijf qua inkomsten/uitgaven. Deze structuur is doorgaans vastgelegd "
+"volgens contracten, projecten, producten of afdelingen. De meeste "
+"bewerkingen in OpenERP (facturen, uurroosters, onkostennota's, enz.) maken "
+"analytische boekingen op de gekoppelde analytische rekening."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8087,6 +8185,8 @@ msgstr ""
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Schakel dit vakje in als voor deze rekeningen boekingslijnen kunnen worden "
+"afgepunt."
 
 #. module: account
 #: help:account.period,state:0
@@ -8116,7 +8216,7 @@ msgstr "Analytische boekingen"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "Verkopen van deze maand per type"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8148,6 +8248,16 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * 'Voorlopig' wordt gebruikt als een gebruiker een nieuwe, onbevestigde "
+"factuur ingeeft.             \n"
+"* 'Pro forma' wordt gebruikt voor een proformafactuur; de factuur heeft geen "
+"factuurnummer.             \n"
+"* 'Open' wordt gebruikt voor een openstaande factuur; er wordt een "
+"factuurnummer toegekend. De factuur blijft in deze status tot de factuur "
+"wordt betaald.             \n"
+"* 'Betaald' wordt automatisch toegekend zodra de factuur is betaald. De "
+"gekoppelde boekingen kunnen al dan niet zijn afgepunt.\n"
+"* 'Geannuleerd' betekent dat de gebruiker de factuur heeft geannuleerd."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8176,7 +8286,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Geen boekhoudplan voor deze firma; u dient er een te maken."
 
 #. module: account
 #: view:account.invoice:0
@@ -8207,12 +8317,12 @@ msgstr "Voor btw-type percentage, typt u een % ratio tussen 0 en 1."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Huidige rekeningen"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Groepering per factuurdatum"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8254,6 +8364,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totaalbedrag (in firmamunt) voor transacties in secundaire munt voor deze "
+"rekening."
 
 #. module: account
 #: report:account.invoice:0
@@ -8291,6 +8403,8 @@ msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"U kunt een gedeeltelijk betaalde factuur niet annuleren. U moet eerst de "
+"afpunting ongedaan maken."
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8300,7 +8414,7 @@ msgstr "Opbrengstencategorierekening"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Aangepast saldo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8321,7 +8435,7 @@ msgstr "Btw-/basisbedrag"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Waardering: percentage"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8421,7 +8535,7 @@ msgstr "Gemeenschappelijk rapport"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "huidige maand"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8430,6 +8544,8 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"Geen periode gedefinieerd voor deze datum: %s!\n"
+"Gelieve er een te maken."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8457,7 +8573,7 @@ msgstr "Rekeningtypen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Waarde bedrag: n.v.t."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8489,6 +8605,11 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Deze knop wordt alleen getoond als de factuur is betaald (en volledig "
+"afgepunt). Het veld Afpunten is uitgeschakeld (dit kan niet meer). Als het "
+"afpunten van factuur ongedaan is gemaakt, en de status dus niet meer Betaald "
+"zou mogen zijn, gebruikt u deze knop om de factuur te heropenen. Vervolgens "
+"gaat de normale flow lopen, eventueel nadat uitzonderingen zijn opgelost."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8529,6 +8650,8 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Om een periode te sluiten, moet u eerst de gekoppelde boekingen definitief "
+"boeken."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8546,12 +8669,12 @@ msgstr "De centralisatierekening voor deze factuur."
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Btw %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactpersonen"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8655,7 +8778,7 @@ msgstr "Openstaande facturen"
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr ""
+msgstr "De betalingsvoorwaarde van de leverancier heeft geen betalingslijn."
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8720,17 +8843,17 @@ msgstr "Journaalnaam"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Volgende af te punten relatie"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Kleinste tekst"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Facturen en betalingen"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8784,6 +8907,9 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"Een boeking die niet in evenwicht is, kan niet worden gevalideerd.\n"
+"Zorg ervoor dat u betalingsvoorwaarden hebt ingesteld.\n"
+"Er moet ten minste een betalingslijn van het type 'Saldo' bestaan."
 
 #. module: account
 #: view:account.account:0
@@ -8860,7 +8986,7 @@ msgstr "Adres contactpersoon"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Verkeerde model"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8881,6 +9007,11 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Voor rekeningen die typisch eerder een debetsaldo hebben dan een creditsaldo "
+"en die u als negatieve bedragen in uw rapporten wilt weergeven, moet u het "
+"teken van het saldo omkeren, vb. voor een kostenrekening. Dit geldt ook voor "
+"rekeningen die eerder credit dan debet staan en die u als positieve bedragen "
+"wilt afdrukken in uw rapport, vb. opbrengstenrekening."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8922,7 +9053,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Stel een reeks in voor het journaal van deze factuur."
 
 #. module: account
 #: view:account.move:0
@@ -8930,12 +9061,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Interne notitie"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Verkopen van dit jaar per type"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8989,7 +9120,7 @@ msgstr "Boekingslijnen"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Bekijk uw financiële rekeningen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -9070,7 +9201,7 @@ msgstr "Geachte mevrouw/heer,"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Details tonen"
 
 #. module: account
 #: code:addons/account/account.py:3118
@@ -9115,7 +9246,7 @@ msgstr "Einde periode"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Financiële rapporten"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9297,7 +9428,7 @@ msgstr "Legenda"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Contractgegevens"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9372,7 +9503,7 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Analytische boekingen van de laatste 365 dagen"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9434,7 +9565,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Aan– en verkoopfacturen"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9474,6 +9605,8 @@ msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
 msgstr ""
+"Er is geen openings–/afsluitperiode ingesteld; maak er een voor de "
+"openingsbalans."
 
 #. module: account
 #: report:account.account.balance:0
@@ -9522,6 +9655,10 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Kies 'Verkoop' voor verkoopfacturen. Kies 'Aankoop' voor aankoopfacturen. "
+"Kies 'Kas' of 'Bank' voor journalen die worden gebruikt voor betalingen. "
+"Kies 'Algemeen' voor diverse boekingen. Kies 'Opening/Afsluiting' voor "
+"openingsboekingen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9574,6 +9711,8 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Dit betekent dat de factuur is betaald en dat de boeking is afgepunt met een "
+"of meerdere betalingslijnen."
 
 #. module: account
 #: view:account.invoice:0
@@ -9652,7 +9791,7 @@ msgstr "Actief"
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Vergelijking"
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
@@ -9725,7 +9864,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Winst en verlies (opbrengstenrekening)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9734,6 +9873,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Configuratiefout\n"
+"U kunt geen rekeningtype kiezen met een andere methode dan \"Niet afgepunt\" "
+"voor rekeningen van het type \"Te ontvangen/Te betalen\". "
 
 #. module: account
 #: view:account.model:0
@@ -9770,7 +9912,7 @@ msgstr "Algemeen"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Analytische boekingen van de laatste 30 dagen"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9827,7 +9969,7 @@ msgstr "April"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Te rapporteren winst (verlies)"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9851,7 +9993,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Titel 2 (vet)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9891,6 +10033,8 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"Een nieuw uittreksel wordt gemaakt in voorlopige status.\n"
+"Na bevestiging van de bank komt het in status Bevestigd."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -10011,7 +10155,7 @@ msgstr "Boekjaarreeks"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Geen details"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
@@ -10023,14 +10167,14 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "U kunt niet boeken op een afgesloten rekening."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Niet-gerealiseerde winst en verlies"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10043,12 +10187,12 @@ msgstr "Statussen"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Automatisch via e-mail bevestigde facturen"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Controletotaal"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10174,7 +10318,7 @@ msgstr "Lege rekeningen? "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Journaal en periode moeten tot dezelfde firma behoren."
 
 #. module: account
 #: view:account.invoice:0
@@ -10204,7 +10348,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Uw boekhoudplan maken op basis van sjabloon"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10275,7 +10419,7 @@ msgstr "Debet"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Titel 3 (vet, kleiner)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10290,7 +10434,7 @@ msgstr "U kunt niet dezelfde rekeningsjablonen maken."
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Boekingsnummer"
 
 #. module: account
 #: view:account.subscription:0
@@ -10304,6 +10448,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"U kunt het rekeningtype niet wijzigen van 'Afgesloten' in een ander type als "
+"er boekingen zijn."
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10329,7 +10475,7 @@ msgstr "Bereik"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Analytische boekingen voor het aankoopdagboek."
 
 #. module: account
 #: help:account.account,type:0
@@ -10340,6 +10486,12 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"Het 'Interne type' wordt gebruikt om een onderscheid te maken tussen "
+"rekeningen: op het type 'weergave' kunt u niet boeken. 'Consolidatie' geldt "
+"voor rekeningen die gekoppelde rekeningen kunnen hebben (voor consolidatie "
+"van verschillende bedrijven). Te ontvangen / Te betalen gelden voor "
+"centralisatierekeningen (berekening debet/credit); 'Afgesloten' wordt "
+"gebruikt voor oude, ongebruikte rekeningen."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -10381,7 +10533,7 @@ msgstr "Analytische journalen afdrukken"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Groepering per maand van factuurdatum"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10473,7 +10625,7 @@ msgstr "Verkeerde rekening"
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Boekingen gesorteerd op"
 
 #. module: account
 #: help:account.move,state:0
@@ -10484,6 +10636,9 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"Alle manuele boekingen zijn doorgaans 'Ongeboekt', maar u kunt per journaal "
+"de optie instellen om deze status over te slaan. Manuele boekingen worden "
+"dan onmiddellijk als Geboekt beschouwd."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10509,6 +10664,7 @@ msgstr "November"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
 msgstr ""
+"Wijzigen: factuur crediteren, afpunten en een nieuwe conceptfactuur maken"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10613,6 +10769,75 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hallo${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"Een nieuwe factuur is beschikbaar voor ${object.partner_id.name}:\n"
+"       | Factuurnummer: *${object.number}*\n"
+"       | Factuurtotaal: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Factuurdatum: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Orderreferentie: ${object.origin}\n"
+"       % endif\n"
+"       | Uw contactpersoon: ${object.user_id.name} "
+"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"U kunt de factuur bekijken, downloaden of on line betalen via de volgende "
+"link:\n"
+"    ${ctx.get('edi_web_url_view') or 'nvt'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"U kunt ook onmiddellijk betalen via Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Neem gerust contact met ons op als u vragen heeft.\n"
+"\n"
+"\n"
+"Bedankt dat u heeft gekozen voor ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -10797,6 +11022,8 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"Dit wordt getoond op het rapport en toont het berekende saldo voor de "
+"gekozen vergelijkingsfilter."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
@@ -11142,6 +11369,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Factuurbeweging"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Boekhoudplan maken op basis van sjabloon"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Wettelijke staten"
 
@@ -11371,6 +11601,10 @@ msgstr ""
 #~ msgid "O_k"
 #~ msgstr "O_k"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Klanten"
+
 #~ msgid "Due date Computation"
 #~ msgstr "Berekening vervaldatum"
 
@@ -11410,6 +11644,9 @@ msgstr ""
 #~ msgid "Include initial balances"
 #~ msgstr "Beginbalans opnemen"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkopen per rekeningtype"
+
 #, python-format
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Deze rekening is niet ingesteld voor afpunten."
@@ -11446,6 +11683,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturen van de afgelopen 15 dagen"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11563,6 +11803,9 @@ msgstr ""
 #~ "U kunt de firma van dit journaal niet wijzigen, omdat er al een boekingslijn "
 #~ "bestaat."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkopen per rekening"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -11817,6 +12060,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Kan geen boekhoudplan vinden voor deze firma. Gelieve er een te maken."
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Maak uw boekhoudplan volgens een sjabloon."
 
@@ -11843,6 +12089,9 @@ msgstr ""
 #~ "De module Boekstukken bevat alle basiselementen voor boekstukken voor "
 #~ "banken, kas, verkoop, aankoop, onkosten, enz. "
 
+#~ msgid "Income Accounts"
+#~ msgstr "Opbrengstenrekeningen"
+
 #~ msgid ""
 #~ "Allows you to change the sign of the balance amount displayed in the "
 #~ "reports, so that you can see positive figures instead of negative ones in "
@@ -12178,3 +12427,9 @@ msgstr ""
 
 #~ msgid "CashBox Balance"
 #~ msgstr "Kassaldo"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Stel uw boekhoudplan in"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "Omschrijving op facturen"
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 0cc6aff8469..53dbb6e4629 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "Font comptable"
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index bd84ef4aeb6..a1bbaaa1178 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
+"PO-Revision-Date: 2012-06-20 16:17+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgstr "Źródło konta"
 msgid "All Analytic Entries"
 msgstr "Wszystkie zapisy analityczne"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktury utworzone w ostatnich 15. dniach."
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -702,18 +697,6 @@ msgstr "Okres dziennika"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Do uzgodnień zapisów firma musi być ta sama dla wszystkich zapisów"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta należności"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1703,11 +1686,6 @@ msgstr "Oddzielne numeracje dzienników"
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sprzedaż wg typów kont"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2807,13 +2785,6 @@ msgstr "Ustawienia finansowe nowej firmy"
 msgid "Configure Your Chart of Accounts"
 msgstr "Konfiguruj plan kont"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Sprzedaż wg kont"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3214,8 +3185,8 @@ msgstr "Szablony planu kont"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Wygeneruj plan kont z szablonu"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6444,11 +6415,6 @@ msgstr "Wprowadź datę początkową !"
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Konsola"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7008,11 +6974,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta dochodowe"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7234,7 +7195,7 @@ msgstr "Szablon konta nadrzędnego"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instaluj swój plan kont"
 
 #. module: account
@@ -11562,6 +11523,9 @@ msgstr ""
 #~ msgid "Account to reconcile"
 #~ msgstr "Konto do uzgodnienia"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Wygeneruj plan kont z szablonu"
+
 #~ msgid "Partner Ref."
 #~ msgstr "Odn. partnera"
 
@@ -11655,6 +11619,10 @@ msgstr ""
 #~ msgid "Receivable and Payable"
 #~ msgstr "Należności i zobowiązania"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta należności"
+
 #~ msgid "Accounting Statement"
 #~ msgstr "Zestawienie księgowe"
 
@@ -12209,6 +12177,9 @@ msgstr ""
 #~ "1. Pozycja 1: procent 0.02 14 dni\n"
 #~ "2. Pozycja 2: reszta 30 dni"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta dochodowe"
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category"
@@ -12263,6 +12234,9 @@ msgstr ""
 #~ msgid "You cannot deactivate an account that contains account moves."
 #~ msgstr "Nie możesz dezaktywować konta zawierającego zapisy."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktury utworzone w ostatnich 15. dniach."
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta wg typu"
 
@@ -12383,6 +12357,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Dziennik"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Sprzedaż wg kont"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Konfiguracja planu kont"
 
@@ -12434,6 +12411,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Raport zysków i strat"
 
+#~ msgid "Dashboard"
+#~ msgstr "Konsola"
+
 #~ msgid "Your Bank and Cash Accounts"
 #~ msgstr "Twoje konta bankwe i gotówkowe"
 
@@ -12572,6 +12552,9 @@ msgstr ""
 #~ msgid "Anglo-Saxon Accounting"
 #~ msgstr "Ksiągowość anglosaska"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sprzedaż wg typów kont"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Błąd! Nie możesz tworzyć lat podatkowych zachodzących na siebie"
 
@@ -12800,5 +12783,8 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "Saldo końcowe wprowadzone przez weryfikatora kasy"
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instaluj swój plan kont"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Opis faktur"
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 69e36d5fc48..6019614ec2e 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-05 09:38+0000\n"
+"PO-Revision-Date: 2012-06-20 16:19+0000\n"
 "Last-Translator: Tiago Rodrigues <tig.rodrigues@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-06 04:37+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "mês anterior"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -185,11 +185,6 @@ msgstr "Origem da Conta"
 msgid "All Analytic Entries"
 msgstr "Todos os Movimentos Analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faturas Criadas nos Últimos 15 Dias"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -705,18 +700,6 @@ msgstr "Período do Diário"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Todos os movimentos a conciliar devem ser da mesma empresa."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas a Receber"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1612,7 +1595,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "e diários"
+msgstr "e Diários"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1723,11 +1706,6 @@ msgstr "Sequências do Diário Separadas"
 msgid "Responsible"
 msgstr "Responsável"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendas por tipo de conta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2844,13 +2822,6 @@ msgstr "Nova Definição financeira da Empresa"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configure o seu Plano de Contas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendas por conta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3256,8 +3227,8 @@ msgstr "Templates de Plano de Contas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Gerar um Plano de Contas a partir de um Template de Plano de Contas"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -3563,7 +3534,7 @@ msgstr "Relatório de Vendas por Tipo de Conta"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "Items Diários Inconciliáveis"
+msgstr "Items de Diário Inconciliáveis"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3623,7 +3594,7 @@ msgstr "Contrapartida centralizada"
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr "Não pode criar items diários sobre uma conta \"vista\" %s %s"
+msgstr "Não pode criar items de diário sobre uma conta \"vista\" %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3807,7 +3778,7 @@ msgstr "Conta a receber"
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr "Ordem de pagamento"
+msgstr "Ordem de Pagamento"
 
 #. module: account
 #: help:account.account.template,reconcile:0
@@ -3897,7 +3868,7 @@ msgstr "Relatório de Balancete de Antiguidade de Contas  Experimental"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr "Não pode criar items diários sobre uma conta %s %s fechada"
+msgstr "Não pode criar items de diário sobre uma conta %s %s fechada"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4337,7 +4308,7 @@ msgstr "Todos os movimentos confirmados"
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "O Extrato %s está confirmado, os items diários foram criados."
+msgstr "O Extrato %s está confirmado, os items do diário foram criados."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4890,7 +4861,7 @@ msgstr "Aplicação do imposto"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Items Diários"
+msgstr "Items do Diário"
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -5139,7 +5110,7 @@ msgstr "Código python (reverso)"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "Prazos de pagamento"
+msgstr "Termos de Pagamento"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5563,7 +5534,7 @@ msgstr "Contas da contabilidade analítica"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr "Faturas de clientes e Reembolsos"
+msgstr "Faturas e Notas de Crédito de Clientes"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -6023,7 +5994,7 @@ msgstr "Período: %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr "Reveja os seus diários financeiros"
+msgstr "Reveja os seus Diários Financeiros"
 
 #. module: account
 #: help:account.tax,name:0
@@ -6052,7 +6023,7 @@ msgstr "  365 dias  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Notas de crédito a clientes"
+msgstr "Notas de Crédito a Clientes"
 
 #. module: account
 #: field:account.account,foreign_balance:0
@@ -6200,7 +6171,7 @@ msgstr "Linha analítica"
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Impostos de cliente"
+msgstr "Impostos a Cliente"
 
 #. module: account
 #: help:account.model,name:0
@@ -6478,7 +6449,7 @@ msgstr "Liquidez"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Lançamentos de diários analíticos"
+msgstr "Lançamentos de Diários Analíticos"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6543,11 +6514,6 @@ msgstr "Indique uma data de início"
 msgid "Supplier Refund"
 msgstr "Nota de crédito de fornecedores"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Painel"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6941,7 +6907,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr "Movimentos diários"
+msgstr "Movimentos de Diário"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7136,11 +7102,6 @@ msgstr ""
 "\n"
 "Ex. Meu modelo em %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Contas de Despesas"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7168,7 +7129,7 @@ msgstr "Insuficiência de dados!"
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Faturas a clientes"
+msgstr "Faturas a Clientes"
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
@@ -7377,7 +7338,7 @@ msgstr "Template da Conta Ascedente"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instale o seu Plano de Contas"
 
 #. module: account
@@ -7429,7 +7390,7 @@ msgstr "Agrupar por ano da data de fatura"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Dívida total do cliente"
+msgstr "Dívida total do cliente."
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -7625,7 +7586,7 @@ msgstr "Linha de Fatura"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr "Reembolso de clientes e fornecedores"
+msgstr "Notas de Crédito de Clientes e Fornecedores"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7729,7 +7690,7 @@ msgstr "Diário de Vendas"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "Abrir Items Diários !"
+msgstr "Abrir Items do Diário !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -8635,7 +8596,7 @@ msgstr "Importação automática do extrato bancário"
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr "Vistas de diários"
+msgstr "Vistas de Diário"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8899,7 +8860,7 @@ msgstr "Template de Mapeamento Fiscal de Conta"
 #. module: account
 #: view:board.board:0
 msgid "Draft Customer Invoices"
-msgstr "Rascunho da fatura do cliente"
+msgstr "Rascunho de Faturas a Clientes"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -9654,7 +9615,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr "Faturas clientes e fornecedores"
+msgstr "Faturas de Clientes e Fornecedores"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -10260,7 +10221,7 @@ msgstr "Não há conta de despesas definida para este artigo:\"%s\" (id:%d)"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "Não pode criar items diários numa conta fechada."
+msgstr "Não pode criar items do diário numa conta fechada."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
@@ -10544,7 +10505,7 @@ msgid ""
 "contains journal items!"
 msgstr ""
 "Não pode alterar o tipo de conta de 'Fechado' para qualquer outro tipo que "
-"contém items diários!"
+"contém items do diário!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10560,7 +10521,7 @@ msgstr "Contas que se pode receber"
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Condições de pagamento do parceiro"
+msgstr "Condições de Pagamento do Parceiro"
 
 #. module: account
 #: field:temp.range,name:0
@@ -10570,7 +10531,7 @@ msgstr "Intervalo"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr "Items diários analíticos relacionados com uma compra diária."
+msgstr "Items de Diários Analíticos relacionados com o diário de compras."
 
 #. module: account
 #: help:account.account,type:0
@@ -11089,7 +11050,7 @@ msgstr "Futuro"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Pesquisar Items Diários"
+msgstr "Pesquisar Items do Diário"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -12711,9 +12672,15 @@ msgstr ""
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Não se pode definir anos fiscais sobrepostos"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendas por conta"
+
 #~ msgid "Total With Tax"
 #~ msgstr "Total, com taxas"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendas por tipo de conta"
+
 #, python-format
 #~ msgid " Journal"
 #~ msgstr " Diário"
@@ -12793,6 +12760,9 @@ msgstr ""
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
+#~ msgid "Dashboard"
+#~ msgstr "Painel"
+
 #~ msgid "Bank and Cash Accounts"
 #~ msgstr "Contas bancárias e de caixa"
 
@@ -13196,6 +13166,9 @@ msgstr ""
 #~ msgid "Liabilities"
 #~ msgstr "Passivo"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faturas Criadas nos Últimos 15 Dias"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Impossível apagar movimentos confirmados: \"%s\"!"
@@ -13298,6 +13271,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "A Divisa actual não está bem configurada!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Contas de Despesas"
+
 #~ msgid ""
 #~ "The normal chart of accounts has a structure defined by the legal "
 #~ "requirement of the country. The analytic chart of account structure should "
@@ -13337,6 +13313,9 @@ msgstr ""
 #~ "Permite que as linhas das facturas despoletem movimentos em múltiplas contas "
 #~ "analíticas em simultâneo."
 
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instale o seu Plano de Contas"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Descrição em Faturas"
 
@@ -13346,5 +13325,12 @@ msgstr ""
 #~ msgid "Unreconciliation transactions"
 #~ msgstr "Transações não reconciliadas"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Gerar um Plano de Contas a partir de um Template de Plano de Contas"
+
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Criar uma conta baseada neste Template"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas a Receber"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 014ca37598b..55aaa64c832 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:09+0000\n"
+"PO-Revision-Date: 2012-06-20 16:26+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <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-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgstr "Conta de origem"
 msgid "All Analytic Entries"
 msgstr "Todos os lançamentos analíticos"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faturas Criadas nos Últimos 15 Dias"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -710,18 +705,6 @@ msgstr ""
 "Para reconciliar a empresa das entradas deveria ser a mesma para todas as "
 "entradas"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas de Recebíveis"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1730,11 +1713,6 @@ msgstr "Sequências de diário separadas"
 msgid "Responsible"
 msgstr "Responsável"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendas por Tipo de Conta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2849,13 +2827,6 @@ msgstr "Novo Ambiente Financeiro da Empresa"
 msgid "Configure Your Chart of Accounts"
 msgstr "Configurar o Plano de Contas"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendas por Conta"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3263,8 +3234,8 @@ msgstr "Modelo de plano de contas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Gerar plano de contas de um modelo de plano"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6536,11 +6507,6 @@ msgstr "Entre com a Data Inicial !"
 msgid "Supplier Refund"
 msgstr "Devolução para Fornecedor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Painel"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7122,11 +7088,6 @@ msgstr ""
 "\n"
 "Ex.: Meu modelo em %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Contas de Receitas"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7365,7 +7326,7 @@ msgstr "Modelo de conta-pai"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Instale o seu Plano de Contas"
 
 #. module: account
@@ -11520,6 +11481,9 @@ msgstr ""
 #~ msgid "Positive"
 #~ msgstr "Positivo"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Gerar plano de contas de um modelo de plano"
+
 #~ msgid "Partner Ref."
 #~ msgstr "Código parceiro"
 
@@ -12470,6 +12434,9 @@ msgstr ""
 #~ msgid "Accounts by type"
 #~ msgstr "Contas por tipo"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Contas de Receitas"
+
 #~ msgid "Display accounts"
 #~ msgstr "Exibir contas"
 
@@ -12484,6 +12451,9 @@ msgstr ""
 #~ "Você não pode remover/desativar uma conta que é definida como uma "
 #~ "propriedade de qualquer Parceiro."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faturas Criadas nos Últimos 15 Dias"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "Balanço Calculado"
 
@@ -12554,6 +12524,9 @@ msgstr ""
 #~ "O termo de pagamento definido fornece uma quantia computada maior que a "
 #~ "quantia total da Fatura."
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendas por Tipo de Conta"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Conta de Reserva e Lucro/Perda"
 
@@ -12642,6 +12615,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Erro!  Você não pode criar categorias recursivas."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendas por Conta"
+
 #~ msgid "Narration"
 #~ msgstr "Relato"
 
@@ -12792,6 +12768,9 @@ msgstr ""
 #~ "O plano de contas não foi encontrado para esta empresa. Por favor, crie uma "
 #~ "conta."
 
+#~ msgid "Dashboard"
+#~ msgstr "Painel"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valorização: porcentagem"
 
@@ -12940,6 +12919,10 @@ msgstr ""
 #~ msgid "You can not create move line on view account."
 #~ msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas de Recebíveis"
+
 #~ msgid ""
 #~ "Financial and accounting module that covers:\n"
 #~ "    General accountings\n"
@@ -13116,3 +13099,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Conforme valor, contas relacionadas, serão exibidas nos respectivos "
 #~ "relatórios  (Conta de Perdas e Proveitos do Balanço)"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instale o seu Plano de Contas"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 9b4e7c83a6e..17faa618ac5 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,24 +13,24 @@ msgstr ""
 "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 04:51+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "luna trecută"
+msgstr "luna trecuta"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "Sistem plată"
+msgstr "Sistem de plata"
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Altă configurație"
+msgstr "O alta configuratie"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -38,6 +38,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Determinati ordinea de afisare in raportul 'Contabilitate \\ Raportare \\ "
+"Raportare Generala \\ Taxe \\ Raport Taxe'"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -50,22 +52,22 @@ msgstr "Reconciliere Inregistrari in Jurnalul contabil"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Statistică cont"
+msgstr "Statistica Cont"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "Facturi Proforma/Deschise/Platite"
 
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Rezidual"
+msgstr "Valoare reziduala"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Eroare ! Durata Perioadei (Perioadelor) este invalidă. "
+msgstr "Eroare ! Durata Perioadei (Perioadelor) este invalida. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -75,33 +77,33 @@ msgstr "Moneda contului"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr "Definitie copii"
+msgstr "Definitie conturi subordonate"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Elementul \"%s\" din jurnal nu este valid."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "Facturi clienți restante la zi"
+msgstr "Creante vechi pana astazi"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "Importă din factură sau plată"
+msgstr "Importati din factura sau din plata"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr "wizard.multi.plan.de.conturi"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Debit Total"
+msgstr "Total debit"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -119,6 +121,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Eroare de configurare! Moneda aleasa trebuie sa fie comuna si conturilor "
+"predefinite."
 
 #. module: account
 #: report:account.invoice:0
@@ -133,7 +137,7 @@ msgstr "Origine"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Reconciliază"
+msgstr "Reconciliati"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -143,12 +147,12 @@ msgstr "Reconciliază"
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
 msgid "Reference"
-msgstr "Referintă"
+msgstr "Referinta"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "Alege Anul Fiscal "
+msgstr "Alegeti Anul Fiscal "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -163,34 +167,29 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr "Avertisment!"
+msgstr "Avertizare!"
 
 #. module: account
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Jurnal Diverse"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr "Sursă cont"
+msgstr "Cont sursa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Toate înregistrările analitice"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturi create in ultimele 15 zile"
+msgstr "Toate Inregistrarile Analitice"
 
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Eticheta coloana"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -213,17 +212,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr "Şabloane taxe"
+msgstr "Sabloane taxe"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "account.tax"
+msgstr "taxa.cont"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Mutati linia reconciliaza alege"
+msgstr "Mutati linia reconciliati selectati"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -232,19 +231,19 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Bifati aceasta casuta daca doriti ca TVA-ul asociat acestui cod fiscal sa nu "
+"Bifati aceasta casuta daca doriti ca TVA-ul asociat acestui Cod Fiscal sa nu "
 "apara pe facturi"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1241
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "Factura '%s' este platită partial: %s%s din %s%s (a mai ramas %s%s)"
+msgstr "Factura '%s' este platita partial: %s%s din %s%s (a mai ramas %s%s)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Înregistrările contabile sunt un input al reconcilierii"
+msgstr "Inregistrarile contabile sunt un input al reconcilierii"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -255,7 +254,7 @@ msgstr "Rapoarte belgiene"
 #: code:addons/account/account_move_line.py:1200
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "Nu puteţi adăuga/modifica înregistrări într-un jurnal închis."
+msgstr "Nu puteti adauga/modifica inregistrarile dintr-un jurnal inchis."
 
 #. module: account
 #: help:account.account,user_type:0
@@ -264,6 +263,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Tipul de cont este folosit in scop informativ, pentru a genera rapoarte "
+"juridice specifice tarilor, si pentru a configura regulile pentru inchiderea "
+"unui an fiscal si a genera inregistrari deschise."
 
 #. module: account
 #: report:account.overdue:0
@@ -275,22 +277,22 @@ msgstr "Subtotal :"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Recurentă manuală"
+msgstr "Recurenta manuala"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr "Închiderea anului fiscal"
+msgstr "Inchideti anul fiscal"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr "Permite pierderea"
+msgstr "Permiteti pierderea"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Selectare perioadă pentru analiză"
+msgstr "Selectati Perioada pentru Analiza"
 
 #. module: account
 #: view:account.move.line:0
@@ -302,12 +304,12 @@ msgstr "St."
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
-"Linia facturii contului companiei nu se potriveste cu factura companiei"
+"Linia facturii contului companiei nu se potriveste cu factura companiei."
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr "Nume câmp"
+msgstr "Nume camp"
 
 #. module: account
 #: help:account.installer,charts:0
@@ -315,9 +317,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Installs a localizat grafice contabile pentru a se potrivi cat mai "
-"indeaproape nevoilor contabile ale companiei dumneavoastra in functie de "
-"tara d-voastra."
+"Installs a localizat grafice contabile care se potrivesc cat mai indeaproape "
+"nevoilor contabile ale companiei dumneavoastra in functie de tara d-voastra."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -328,7 +329,8 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
-"Nu gaseste nici un jurnal contabil de tipul %s pentru aceasta companie. \n"
+"Nu poate fi gasit niciun jurnal contabil de tipul %s pentru aceasta "
+"companie.\n"
 "\n"
 "Puteti crea unul in meniul: \n"
 "Configurare/Contabilitate Financiara/Conturi/Jurnale."
@@ -351,11 +353,14 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Aici puteti configura formatul in care doriti sa fie afisata aceasta "
+"inregistrare. Daca lasati formatul automat, va fi calculat pe baza ierarhiei "
+"rapoartelor financiare (campul 'nivel' auto-calculat)."
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr "Configurare"
+msgstr "Configurati"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -374,35 +379,36 @@ msgid ""
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
 "Aceasta vizualizare este folosita de catre contabili pentru a înregistra "
-"intrările pe scara larga în OpenERP. Elementele jurnalului sunt create de "
-"catre OpenERP daca folosiți Extrase de cont, Case de marcat, sau Plăți "
-"Clienți/Furnizor"
+"intrarile pe scara larga in OpenERP. Elementele jurnalului sunt create de "
+"catre OpenERP daca folositi Extrase de cont, Case de marcat, sau Plati "
+"Client/Furnizor"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Nu puteti crea elemente ale jurnalului intr-un cont de tipul vizualizare."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "account.tax.template (cont.taxa.sablon)"
+msgstr "sablon.taxa.cont"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "account.bank.accounts.wizard (cont.banca.conturi.wizard)"
+msgstr "wizard.conturi.cont.bancar"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "Data creării"
+msgstr "Data crearii"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Rambursare Cumparaturi"
+msgstr "Rambursare Achizitii"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -412,12 +418,12 @@ msgstr "Situatie Deschidere/Inchidere"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Moneda folosită la introducerea extrasului"
+msgstr "Moneda folosita la introducerea extrasului"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "An fiscal de deschis"
+msgstr "Anul Fiscal de deschis"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -426,17 +432,17 @@ msgid ""
 "entries of this journal."
 msgstr ""
 "Acest camp contine informatii referitoare la numerotarea intrarilor in acest "
-"jurnal contabil"
+"jurnal contabil."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Cont debit implicit"
+msgstr "Cont Debit Implicit"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Credit total"
+msgstr "Total Credit"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -449,17 +455,17 @@ msgstr "Deschis pentru Nereconciliere"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Şablon plan de conturi"
+msgstr "Sablon Plan de Conturi"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Suma exprimată întro altă monedă opţională"
+msgstr "Suma exprimata intr-o alta moneda optionala."
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Activati Comparatia"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -469,7 +475,7 @@ msgid ""
 "'Done' state."
 msgstr ""
 "Atunci cand este creata perioada in jurnal. Stadiul este 'Ciorna'. Daca un "
-"raport este printat, stadiul devine 'Printat'. Atunci cand toate "
+"raport este tiparit, stadiul devine 'Tiparit'. Atunci cand toate "
 "tranzactiile sunt efectuate, stadiul devine 'Efectuat'."
 
 #. module: account
@@ -480,10 +486,10 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
-"Graficul Fiscal este o vizualizare arbore care reflecta structura Cazurilor "
+"Planul de taxe este o vizualizare arbore care reflecta structura Cazurilor "
 "Fiscale (sau 'codurilor fiscale') si prezinta situatia fiscala actuala. "
-"Graficul fiscal reprezinta suma fiecarei parti a declaratiei fiscale din "
-"tara dumneavoastra. Este prezentat in structura ierarhica, care poate fi "
+"Planul de taxe fiscal reprezinta suma fiecarei parti a declaratiei fiscale "
+"din tara dumneavoastra. Este prezentat in structura ierarhica, care poate fi "
 "modificata pentru a se potrivi nevoilor dumneavoastra."
 
 #. module: account
@@ -519,7 +525,7 @@ msgstr "Jurnal"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr "Confirma facturile selectate"
+msgstr "Confirmati facturile selectate"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
@@ -529,7 +535,7 @@ msgstr "Tinta parinte"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Cont folosit in acest jurnal"
+msgstr "Contul folosit in acest jurnal"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -547,12 +553,12 @@ msgstr "Cont folosit in acest jurnal"
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Selecteaza Planuri de Conturi"
+msgstr "Selectati Planurile de Conturi"
 
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie sa fie unic !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -567,26 +573,26 @@ msgstr "Li."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Tranzacţii nereconciliate"
+msgstr "Tranzactii nereconciliate"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr "Omolog"
+msgstr "Echivalent"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "Corespondenţă taxe"
+msgstr "Reprezentare Taxa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Inchide un An Fiscal"
+msgstr "Inchideti un An Fiscal"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -619,7 +625,7 @@ msgid ""
 "that are linked to those transactions because they will not be disable"
 msgstr ""
 "Daca nu reconciliati tranzactiile, trebuie, de asemenea, sa verificati toate "
-"actiunile relationate acestor tranzactii deoarece nu vor ifi dezactivate."
+"actiunile relationate acestor tranzactii deoarece nu vor fi dezactivate."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -629,39 +635,41 @@ msgstr "   30 zile   "
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Secvenţe"
+msgstr "Secvente"
 
 #. module: account
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Raport Valoare"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "Corespondenţă taxe"
+msgstr "Reprezentare taxe"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Jurnal centralizat"
+msgstr "Jurnal Centralizat"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "Secventa Principala trebuie sa fie diferita de secventa actuala"
+msgstr "Secventa Principala trebuie sa fie diferita de secventa actuala !"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
+"Nu a fost gasita nicio perioada sau au fost gasite mai multe perioade pentru "
+"data specificata."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "Valoare cod fiscal"
+msgstr "Valoare Cod Fiscal"
 
 #. module: account
 #: code:addons/account/account.py:3116
@@ -673,17 +681,17 @@ msgstr "SAJ"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Închidere perioadă"
+msgstr "Inchideti perioada"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Raportul partenerului cu privire la contul comun"
+msgstr "Raportul Partenerului cu privire la Contul Comun"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Perioada înregistrărilor de deschidere"
+msgstr "Perioada Deschidere Inregistrari"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -696,47 +704,37 @@ msgstr "Perioada Jurnal"
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
-"Pentru a reconcilia inregistrarile, compania ar trebui sa fie aceeasi pentru "
+"Pentru a reconcilia inregistrarile, compania trebuie sa fie aceeasi pentru "
 "toate inregistrarile"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Conturi clienți"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Data Inregistrarii in Jurnal nu se afla in perioada definita! Ar trebui sa "
+"schimbati data sau sa eliminati aceasta restrictie din jurnal."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "Raport registru contabil general"
+msgstr "Raport Registru de Contabilitate General"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr "Re-deschide"
+msgstr "Redeschideti"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "Sunteti sigur ca doriţi să creaţi înregistrări ?"
+msgstr "Sunteti sigur(a) ca doriti sa creati inregistrari ?"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr "Imprima factura"
+msgstr "Tipariti Factura"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -746,12 +744,12 @@ msgstr "Parteneri reconciliati astazi"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "Jurnal de vanzari in acest an"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Afisati conturi secundare ierarhic"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -762,30 +760,30 @@ msgstr "Procent"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Planuri de conturi"
+msgstr "Grafice"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Inregistrari analitice per linie"
+msgstr "Inregistrari Analitice dupa linie"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Metoda de rambursare"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "Puteti schimba valuta doar pentru factura ciorna!"
+msgstr "Puteti schimba moneda doar pentru Factura Ciorna!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Raport Financiar"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -809,6 +807,8 @@ msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Lipsesc taxele!\n"
+"Faceti click pe butonul calculeaza."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -818,12 +818,12 @@ msgstr "Linie abonament cont"
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "Referinţă partener de pe această factură."
+msgstr "Referinta partener a acestei facturi."
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Facturi Furnizor si Rambursari"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -837,6 +837,7 @@ msgstr "Nereconciliere"
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
 msgstr ""
+"La 14 zile net 2 la suta, suma ramasa la sfarsitul lunii din 30 de zile."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
@@ -846,12 +847,12 @@ msgstr "Cont Jurnal Analitic"
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "Reconciliere automata"
+msgstr "Reconciliere Automata"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "J.C. / Denumire mişcare"
+msgstr "J.C. / Nume miscare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -861,6 +862,11 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"Atunci cand faceti tranzactii cu mai multe valute, puteti pierde sau castiga "
+"o anumita suma datorita taxelor cursului de schimb valutar. Acest meniu va "
+"ofera o estimare a Castigului sau a Pierderii realizat(a) daca acele "
+"tranzactii s-ar finaliza astazi. Valabil numai pentru conturile care au "
+"configurata o valuta secundara."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -881,7 +887,7 @@ msgstr "zile"
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
-"Dacă este bifat, noul plan de conturi nu va contine acest lucru implicit."
+"Daca este bifat, noul plan de conturi nu va contine acest lucru implicit."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:110
@@ -891,7 +897,7 @@ msgid ""
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
 "Nu se poate %s factura care este deja reconciliata, factura ar trebui sa fie "
-"nereconciliata mai intai. Puteti doar sa Rambursati aceasta factura."
+"nereconciliata mai intai. Puteti doar sa Rambursati aceasta factura"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -906,7 +912,7 @@ msgstr "Calcul"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "Anulati: rambursati factura si reconciliati"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -924,17 +930,17 @@ msgstr "Intarzierea medie la plata"
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "Plan taxe"
+msgstr "Plan de Taxe"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Creare perioade de 3 luni"
+msgstr "Creati Perioade de 3 luni"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr "Scadentă"
+msgstr "Scadent(a)"
 
 #. module: account
 #: code:addons/account/account.py:1345
@@ -943,6 +949,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Nu puteti valida aceasta inregistrare in jurnal deoarece contul \"%s\" nu "
+"apartine planului de conturi \"%s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -951,6 +959,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Acest cont nu permite reconcilierea! Trebuie sa actualizati definitia "
+"contului pentru a schimba acest lucru."
 
 #. module: account
 #: view:account.invoice:0
@@ -958,14 +968,14 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr "Aprobă"
+msgstr "Aprobati"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr "Suma totală"
+msgstr "Suma totala"
 
 #. module: account
 #: selection:account.account,type:0
@@ -979,22 +989,22 @@ msgstr "Consolidare"
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr "Pasiv"
+msgstr "Raspundere"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Centralizare jurnal"
+msgstr "Centralizare Jurnal"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Ramburs vanzare"
+msgstr "Rambursare Vanzare"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1004,7 +1014,7 @@ msgstr "Extras de cont"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Linie mişcare"
+msgstr "Linie miscare"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1013,7 +1023,7 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
-"Daca contul de taxe este un cont al codului fiscal, acest camp va contine "
+"Daca Contul de taxe este un cont al codului fiscal, acest camp va contine "
 "suma impozabila. Daca contul de taxe este cod fiscal de baza, acest camp va "
 "contine suma de baza (fara impozit)."
 
@@ -1021,17 +1031,17 @@ msgstr ""
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Nu pot localiza un cod principal pentru contul sablon!"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr "Achiziții"
+msgstr "Achizitii"
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr "Înregistrări model"
+msgstr "Inregistrari model"
 
 #. module: account
 #: field:account.account,code:0
@@ -1058,7 +1068,7 @@ msgstr "Cod"
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Nu există jurnal analitic !"
+msgstr "Nu exista nici un Jurnal Analitic !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1067,7 +1077,7 @@ msgstr "Nu există jurnal analitic !"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "Balanţă parteneri"
+msgstr "Sold Partener"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1097,16 +1107,18 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Nu puteti schimba tipul contului din '%s' in tipul '%s' deoarece contine "
+"elemente ale jurnalului!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Sortati dupa"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "Selectati anul fiscal care va fi închis"
+msgstr "Selectati Anul fiscal care va fi inchis"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1114,7 +1126,7 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
-"Aceste tipuri sunt definite în functie de ţara dumneavoastră. Tipul contine "
+"Aceste tipuri sunt definite în functie de tara dumneavoastra. Tipul contine "
 "mai multe informatii despre cont si specificul acestuia."
 
 #. module: account
@@ -1123,16 +1135,18 @@ msgstr ""
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
 msgstr ""
+"Trebuie sa introduceti un cont pentru inregistrarea diferentei dintre "
+"pierdere/schimb valutar!"
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr "Optiuni aplicabilitate"
+msgstr "Optiuni Aplicabilitate"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr "În litigiu"
+msgstr "In litigiu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
@@ -1156,12 +1170,12 @@ msgstr "Manager"
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr "Generarea Inregistrarilor inainte:"
+msgstr "Generati Inregistrari inainte de:"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Elemente Neechilibrate Jurnal"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1169,17 +1183,17 @@ msgstr ""
 #: code:addons/account/account.py:3003
 #, python-format
 msgid "Bank"
-msgstr "Bancă"
+msgstr "Banca"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "Începutul perioadei"
+msgstr "Inceputul perioadei"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr "Confirma extrasul"
+msgstr "Confirmati extrasul"
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1187,22 +1201,24 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Valoarea totala (exprimata in Moneda secundara) pentru tranzactii efectuate "
+"in moneda secundara a acestui cont."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Taxă înlocuire"
+msgstr "Taxa de inlocuire"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr "Centralizare credit"
+msgstr "Centralizare Credit"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "Vanzarile din toate lunile dupa tip"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1222,22 +1238,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "Şabloane pentru coduri de taxe"
+msgstr "Sabloane Coduri Fiscale"
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr "Anuleaza facturi"
+msgstr "Anulati Facturile"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Codul va fi afisat in rapoarte."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Taxe utilizate in Achizitii."
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1245,22 +1261,22 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Cod taxă"
+msgstr "Cod fiscal"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Curs de schimb pentru ieşiri"
+msgstr "Curs Valutar Iesiri"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
-msgstr "Situaţie"
+msgstr "Situatie"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "Mişcarea corespunzătoare acestei înregistrări"
+msgstr "Miscarea acestei linii a inregistrarii."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -1269,11 +1285,13 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Nu puteti utiliza acest cont general in acest jurnal, bifati tabul 'Control "
+"Inregistrare' in jurnalul asociat !"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "# tranzacţiei"
+msgstr "# Tranzactiei"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1281,20 +1299,20 @@ msgstr "# tranzacţiei"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Etichetă înregistrare"
+msgstr "Eticheta Inregistrare"
 
 #. module: account
 #: code:addons/account/account.py:1129
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
-"Nu puteţi modifica/şterge un jurnal cu înregistrări pentru această perioadă !"
+"Nu puteţi modifica/sterge un jurnal cu inregistrari pentru aceasta perioada !"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "Referinţa la documentul care a produs aceasta factura."
+msgstr "Referinta la documentul care a produs aceasta factura."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1305,7 +1323,7 @@ msgstr "Altele"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Abonament Ciorna"
 
 #. module: account
 #: view:account.account:0
@@ -1339,14 +1357,14 @@ msgstr "Cont"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr "Inclus în suma de bază"
+msgstr "Inclus in suma de baza"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr "Analiza inregistrarilor"
+msgstr "Analiza Inregistrarilor"
 
 #. module: account
 #: field:account.account,level:0
@@ -1379,57 +1397,57 @@ msgstr "Selectati o perioada de inceput si una de sfarsit"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Profit si Pierdere"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Şabloane pentru conturi"
+msgstr "Sabloane pentru Conturi"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "Cautare sablon taxa"
+msgstr "Cautati sablon taxa"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "Reconciliere înregistrări"
+msgstr "Reconciliati Inregistrarile"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Plăţi restante"
+msgstr "Plati restante"
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr "Sold initial"
+msgstr "Soldul initial"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr "Resetare la Ciorna"
+msgstr "Resetare ca Ciorna"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr "Informaţii bancare"
+msgstr "Informatii bancare"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr "Opţiuni raport"
+msgstr "Optiuni Raport"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Analiza elementelor din jurnal"
+msgstr "Analiza Elementelor din Jurnal"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1448,12 +1466,12 @@ msgstr "Extras de cont"
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "Cont încasări"
+msgstr "Cont Incasari"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Jurnal central"
+msgstr "Jurnal Central"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1461,54 +1479,54 @@ msgstr "Jurnal central"
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "Cu sold diferit de zero"
+msgstr "Cu soldul diferit de zero"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr "Căutare taxe"
+msgstr "Cautati Taxele"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Registru cont costuri analitice"
+msgstr "Registru Costuri Cont Analitic"
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "Creează înregistrări"
+msgstr "Creati inregistrari"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "# elemente"
+msgstr "# Elemente"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Suma maximă pierduta"
+msgstr "Suma maxima pierduta"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr "Calculare taxe"
+msgstr "Calculati Taxele"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "# de cifre"
+msgstr "# de Cifre"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Omite stadiul 'Ciorna' pentru Inregistrarile Manuale"
+msgstr "Omiteti stadiul 'Ciorna' pentru Inregistrarile Manuale"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr "Total fără taxe"
+msgstr "Total fara taxe"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1518,7 +1536,7 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"O inregistrare in jurnal consta in mai multe elemente ale jurnalului, "
+"O inregistrare in jurnal consta din mai multe elemente ale jurnalului, "
 "fiecare dintre ele fiind sau o tranzactie debit sau o tranzactie credit. "
 "OpenERP creeaza automat o inregistrare in jurnal per document contabil: "
 "factura, ramburs, plata furnizorului, extrase de cont, etc."
@@ -1534,17 +1552,19 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Daca debifati campul activ, puteti ascunde o positie fiscala fara sa o "
+"stergeti."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "Un tabel temporar folosit pentru vizualizarea Tabloului de bord"
+msgstr "Un Tabel temporar folosit pentru vizualizarea Tabloului de bord"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Restituiri furnizor"
+msgstr "Rambursare Furnizor"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1555,22 +1575,22 @@ msgstr "Restituiri furnizor"
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr "Închis"
+msgstr "Inchis(a)"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr "Inregistrari recurente"
+msgstr "Inregistrari Recurente"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "Şablon pentru Poziţia Fiscală"
+msgstr "Sablon pentru Pozitia Fiscala"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "Tranzacţii reconciliate"
+msgstr "Tranzactii reconciliate"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1585,7 +1605,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "şi jurnale"
+msgstr "si Jurnale"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1606,30 +1626,30 @@ msgstr "Mergeti la partenerul următor"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Cautare Extrase de cont"
+msgstr "Cautati Extrase de cont"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Elemente Neafisate ale Jurnalului"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Cont plati"
+msgstr "Cont Plati"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Cont restituire taxă"
+msgstr "Cont Restituire Taxa"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Linii extras de cont"
+msgstr "Linii Extras de cont"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1658,12 +1678,12 @@ msgstr "Data/Cod"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr "Cont general"
+msgstr "Cont General"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr "Limită de plata"
+msgstr "Limita de plata"
 
 #. module: account
 #: report:account.invoice:0
@@ -1673,7 +1693,7 @@ msgstr "Limită de plata"
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr "Factură"
+msgstr "Factura"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
@@ -1689,26 +1709,21 @@ msgstr "Secventa An Fiscal"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Secvente de jurnal separate"
+msgstr "Secvente Separate de Jurnal"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsabil"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vanzari dupa Tipul de cont"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
-"Anuleaza factura: Creeaza factura ramburs, o valideaza si reconciliaza "
-"pentru a anula factura actuala."
+"Anulati factura: Creati factura ramburs, o validati si reconciliati pentru a "
+"anula factura actuala."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1724,7 +1739,7 @@ msgstr "Partener Necunoscut"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "Suma pe an"
+msgstr "Suma anuala"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1429
@@ -1737,7 +1752,7 @@ msgstr ""
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "Acest wizard va schimba moneda în care este exprimată factura"
+msgstr "Acest wizard va schimba moneda an care este exprimata factura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1747,18 +1762,18 @@ msgid ""
 "on an account."
 msgstr ""
 "Afisarea planului de conturi al companiei dumneavoastra per an fiscal si "
-"filtrarea lui pe perioada.Aveti o vizualizare arbore completa a tuturor "
-"elementelor jurnalului per cod cont facand click pe un cont."
+"filtrarea lui pe perioada. Aveti o vizualizare arbore completa a tuturor "
+"elementelor jurnalului pe cod cont facand click pe un cont."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Conturi in asteptare"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "Declaraţie fiscala"
+msgstr "Declaratie fiscala"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1767,17 +1782,17 @@ msgid ""
 "period without removing it."
 msgstr ""
 "Daca campul activ este setat pe Fals, va va permite sa ascundeti perioada "
-"din jurnal fara a o sterge."
+"din jurnal fara sa o stergeti."
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr "Debit furnizor"
+msgstr "Debit Furnizor"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr "Încasări & plați"
+msgstr "Incasari & Plati"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1787,12 +1802,12 @@ msgstr "Raport Jurnal Cont Comun"
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "Toti partenerii"
+msgstr "Toti Partenerii"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Planuri de conturi analitice"
+msgstr "Planuri de Conturi Analitice"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1803,13 +1818,13 @@ msgstr "Inregistrarile mele"
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Referință client:"
+msgstr "Referinta Client:"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "Utilizatorul %s nu are dreptul de a accesa jurnalul %s!"
+msgstr "Utilizatorul %s nu are dreptul de a accesa jurnalul %s !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1819,7 +1834,7 @@ msgstr "Aceste perioade se pot suprapune."
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Extras ciornă"
+msgstr "Extras ciorna"
 
 #. module: account
 #: view:account.tax:0
@@ -1829,7 +1844,7 @@ msgstr "Declaratie fiscala: Note de credit"
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Suma credit"
+msgstr "Valoarea creditului"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1837,20 +1852,20 @@ msgstr "Suma credit"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Eroare!"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
-"Valoare gresita a creditului sau debitului in inregistrarea contabila!"
+"Valoare gresita a creditului sau debitului in inregistrarea contabila !"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr "Analiza facturilor"
+msgstr "Analiza Facturilor"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -1860,28 +1875,28 @@ msgstr "incheierea perioadei"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr "Configurare An Fiscal"
+msgstr "Configurati Anul Fiscal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr "Inregistrari in functie de Linie"
+msgstr "Inregistrari dupa Linie"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Pe baza"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Inregistrare in jurnal"
+msgstr "Inregistrare in Jurnal"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr "Declaratie fiscala: Facturi"
+msgstr "Declaratie Fiscala: Facturi"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
@@ -1905,7 +1920,7 @@ msgstr "Eroare! Nu puteti crea companii recursive."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Jurnal Vanzari/Achizitii"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1916,19 +1931,19 @@ msgstr "Cont analitic"
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Verificaţi dacă acest cont este definit în jurnal."
+msgstr "Va rugam sa verificati daca acest cont este definit in jurnal."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr "Valid"
+msgstr "Valabil"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr "Jurnal Printare Cont"
+msgstr "Jurnal Tiparire Cont"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -1947,18 +1962,21 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Acest cont este folosit pentru transferul Profitului/Pierderii (Daca este "
+"Profit: Suma va fi adaugata, Pierdere: Suma va fi scazuta.), asa cum a fost "
+"calculat in Raportul Profituri & Pierderi"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr "Comparatie intre intrarile contabile si plati"
+msgstr "Comparatie intre inregistrarile contabile si plati"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Definire taxe"
+msgstr "Definite Taxe"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1966,8 +1984,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
-"Bifaţi aceasta casuta dacă doriţi să folositi o secvenţă diferită pentru "
-"fiecare jurnal creat. Altfel, toate vor folosi aceeaşi secvenţă."
+"Bifati aceasta casuta daca doriti sa folositi o secventa diferita pentru "
+"fiecare jurnal creat. Altfel, toate vor folosi aceeasi secventa."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1990,7 +2008,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Trebuie sa definiti un jurnal analitic de tipul '%s'!"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -2005,11 +2023,15 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Contul selectat din Inregistrarea in Jurnal solicita furnizarea unei monede "
+"secundare. Ar trebui sa stergeti moneda secundara din cont sau sa selectati "
+"o vizualizare multi-moneda in jurnal."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
+"Face ca un sistem general sa efectueze rapoarte financiare cu usurinta."
 
 #. module: account
 #: view:account.invoice:0
@@ -2029,12 +2051,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Elemente ale Jurnalului Analitic asociate unui jurnal de vanzari."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Text cursiv (mai mic)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2047,17 +2069,17 @@ msgstr ""
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
-msgstr ""
+msgstr "Declaratie TVA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Linii cu înregistrări parţiale"
+msgstr "Linii Inregistrari partiale"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -2069,7 +2091,7 @@ msgstr "An fiscal"
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "Înregistrări deschise"
+msgstr "Inregistrari deschise"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2098,7 +2120,7 @@ msgstr "Ianuarie"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr "Validări"
+msgstr "Validari"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2108,7 +2130,7 @@ msgstr "Anul fiscal curent"
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr "Cont planuri fiscale"
+msgstr "Cont Planuri fiscale"
 
 #. module: account
 #: constraint:account.period:0
@@ -2116,14 +2138,14 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
-"Perioadă invalidă ! Unele perioade se suprapun sau perioada datei este în "
+"Perioada invalida ! Unele perioade se suprapun sau perioada datei este in "
 "afara anului fiscal. "
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Trebuie sa atribuiti un jurnal analitic jurnalului '%s'!"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2131,7 +2153,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "Proformă"
+msgstr "Pro-forma"
 
 #. module: account
 #: code:addons/account/account.py:1461
@@ -2139,7 +2161,9 @@ msgstr "Proformă"
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr "Nu exista un cond de debit default definit in jurnal \"%s\""
+msgstr ""
+"Nu exista un cond de debit implicit definit \n"
+"in jurnalul \"%s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2160,7 +2184,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "Cautare Sabloane Plan de conturi"
+msgstr "Cautati Sabloane Plan de Conturi"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1277
@@ -2170,6 +2194,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Nu se poate crea o secventa automata pentru aceasta piesa!\n"
+"Introduceti o secventa in definirea jurnalului pentru numerotare automata "
+"sau creati manual o secventa pentru aceasta piesa."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2178,11 +2205,13 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Nu puteti modifica compania din acest jurnal deoarece inregistrarea asociata "
+"exista in elementele jurnalului"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Cod Client"
 
 #. module: account
 #: view:account.installer:0
@@ -2193,7 +2222,7 @@ msgid ""
 msgstr ""
 "Planul de Conturi predefinit se potriveste cu alegerea tarii. Daca nu exista "
 "nici un Plan de conturi certificat pentru tara specificata, poate fi "
-"instalat unul general si va fi selectat prin default."
+"instalat unul general si va fi selectat implicit."
 
 #. module: account
 #: view:account.account.type:0
@@ -2224,7 +2253,7 @@ msgstr "ECNJ"
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "În derulare"
+msgstr "In executie"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2237,39 +2266,39 @@ msgstr "Cont de venituri"
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "Nu este definit nici un Jurnal Contabil de tipul Vanzare/Achizitie!"
+msgstr "Nu exista niciun Jurnal Contabil de tipul Vanzare/Achizitie definit!"
 
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "Codul RIB si/sau IBAN nu este valabil"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr "Proprietăţi contabilitate"
+msgstr "Proprietati Contabilitate"
 
 #. module: account
 #: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr "Înregistrări sortate după"
+msgstr "Inregistrari clasificate dupa"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr "Schimba in"
+msgstr "Schimbati in"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "# a cantitatii produselor "
+msgstr "# a Cantitatii Produselor "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Șablon produs"
+msgstr "Sablon Produs"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2325,12 +2354,12 @@ msgstr "An fiscal"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Lasaţi necompletat pentru toti anii fiscali deschisi"
+msgstr "Lasati necompletat pentru toti anii fiscali deschisi"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Linie Cont"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2339,7 +2368,7 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
-"Nu exista nici un cont de credit predefinit definit \n"
+"Nu exista nici un cont de credit implicit definit \n"
 "in jurnalul \"%s\""
 
 #. module: account
@@ -2349,21 +2378,24 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Configurati-va jurnalele contabile. Pentru conturile bancare, este mai bine "
+"sa folositi instrumentul 'Configurare Conturi Bancare' care va crea automat "
+"conturile si jurnalele pentru d-voastra."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Înregistrare contabilă"
+msgstr "Inregistrare contabila"
 
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr "Secvenţa principală"
+msgstr "Secventa Principala"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:402
@@ -2372,6 +2404,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Pentru a sterge un extras de cont, mai intai trebuie sa il anulati pentru a "
+"sterge elementele asociate jurnalului."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2383,24 +2417,24 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "Termen de plată"
+msgstr "Termen de plata"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Poziţii fiscale"
+msgstr "Pozitii Fiscale"
 
 #. module: account
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Eroare ! Nu puteţi crea conturi recursive."
+msgstr "Eroare ! Nu puteti crea conturi recursive."
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr "Bifaţi căsuţa aceasta"
+msgstr "Bifati casuaa aceasta"
 
 #. module: account
 #: view:account.common.report:0
@@ -2426,7 +2460,7 @@ msgstr "Deschis"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "Stadiul ciorna al unei facturi"
+msgstr "Starea ciorna a unei facturi"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2437,7 +2471,7 @@ msgstr "Reconciliere Partener"
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Cod taxa cont"
+msgstr "Cont Cod Fiscal"
 
 #. module: account
 #: code:addons/account/account_invoice.py:572
@@ -2448,8 +2482,8 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"Nu se poate gasi nici un jurnal contabil de tipul %s pentru aceasta "
-"companie. \n"
+"Nu se poate gasi niciun jurnal contabil de tipul %s pentru aceasta companie. "
+"\n"
 "\n"
 "Puteti crea unul in meniul: \n"
 "Configurare\\Contabilitate Financiara\\Conturi\\Jurnale."
@@ -2458,12 +2492,12 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% Avans Sfarsit 30 de zile"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr "Intrari nereconciliate"
+msgstr "Inregistrari nereconciliate"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2483,7 +2517,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Semn cod de baza"
+msgstr "Semn Cod de baza"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2495,7 +2529,7 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"Acest meniu printeaza o declaratie a TVA-ului pe baza facturilor sau a "
+"Acest meniu tipareste o declaratie a TVA-ului pe baza facturilor sau a "
 "platilor. Selectati una sau mai multe perioade ale anului fiscal. "
 "Informatiile necesare pentru o declaratie fiscala sunt generate automat de "
 "catre OpenERP din facturi (sau plati, in unele tari). Aceste date sunt "
@@ -2506,13 +2540,13 @@ msgstr ""
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "Centralizare debit"
+msgstr "Centralizare Debit"
 
 #. module: account
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr "Confirma Facturile Ciorna"
+msgstr "Confirmati Facturile Ciorna"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2521,7 +2555,7 @@ msgstr "Confirma Facturile Ciorna"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr "Ziua"
+msgstr "Zi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
@@ -2531,7 +2565,7 @@ msgstr "Conturi de reinnoit"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Înregistrări model cont"
+msgstr "Inregistrari Model Cont"
 
 #. module: account
 #: code:addons/account/account.py:3117
@@ -2542,12 +2576,12 @@ msgstr "EXJ"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Taxe furnizor"
+msgstr "Taxe Furnizor"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "inregistrari"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2558,15 +2592,15 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"Dacă folosiţi termeni de plată, data scadenţei va fi calculată automat la "
-"generarea înregistrărilor contabile. Dacă lăsaţi necompletate termenul de "
-"plată şi data scadenţei, se va considera plată directă. Termenul de plată "
-"poate calcula mai multe date scadente, de exemplu 50% acum, 50% peste o lună."
+"Daca folositi termeni de plata, data scadentei va fi calculata automat la "
+"generarea inregistrarilor contabile. Daca lasati necompletate termenul de "
+"plata si data scadentei, se va considera plata directa. Termenul de plata "
+"poate calcula mai multe date scadente, de exemplu 50% acum, 50% peste o luna."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr "Selectare perioadă"
+msgstr "Selectati perioada"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
@@ -2576,7 +2610,7 @@ msgstr "Extrase"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Nume mişcare"
+msgstr "Nume miscare"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2597,7 +2631,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Reconciliere linie miscare cont (pierdere)"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2605,7 +2639,7 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Taxă"
+msgstr "Taxa"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2635,12 +2669,12 @@ msgstr "Conturi"
 #: code:addons/account/account_invoice.py:369
 #, python-format
 msgid "Configuration Error!"
-msgstr "Eroare de configurare !"
+msgstr "Eroare de configurare!"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr "Preţ mediu"
+msgstr "Pretul mediu"
 
 #. module: account
 #: report:account.overdue:0
@@ -2651,13 +2685,13 @@ msgstr "Data:"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr "Etichetă"
+msgstr "Eticheta"
 
 #. module: account
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr "Informatii contabile"
+msgstr "Informatii Contabile"
 
 #. module: account
 #: view:account.tax:0
@@ -2669,12 +2703,12 @@ msgstr "Calcul special"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "Reconciliere bancară"
+msgstr "Reconciliere bancara"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "Discount (%)"
+msgstr "Reducere(%)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2694,27 +2728,29 @@ msgstr "Contul poate fi sau un cod fiscal de baza sau un cont de cod fiscal."
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Valoare gresita a creditului sau debitului in model, ea trebuie sa fie "
+"pozitiva!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr "Reconciliere automată"
+msgstr "Reconciliere automata"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "Plătit/Reconciliat"
+msgstr "Platit/Reconciliat"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Cod bază restituire"
+msgstr "Cod baza restituire"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "Adevărat"
+msgstr "Adevarat"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2728,19 +2764,19 @@ msgstr "Date"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Sablon Principal Plan"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "Cont taxă părinte"
+msgstr "Cont principal taxa"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "Noua moneda nu este configurata corect !"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2767,12 +2803,12 @@ msgstr "Inregistrari contabile"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Tip de comunicare"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr "Discount (%)"
+msgstr "Reducere (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2797,14 +2833,7 @@ msgstr "Noua Setare Financiara a Companiei"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vanzari dupa Cont"
+msgstr "Configurati-va Planul de Conturi"
 
 #. module: account
 #: view:account.use.model:0
@@ -2815,7 +2844,7 @@ msgstr "Acest wizard va crea inregistrari contabile recurente"
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "Nici o secventa nu a fost definita in jurnal !"
+msgstr "Nicio secventa nu a fost definita in jurnal !"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -2823,7 +2852,7 @@ msgstr "Nici o secventa nu a fost definita in jurnal !"
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "Trebuie să definiţi un jurnal analitic pentru jurnalul '%s' !"
+msgstr "Trebuie sa definiti un jurnal analitic in jurnalul '%s' !"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2832,6 +2861,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Aveti nevoie de un Jurnal de deschidere cu centralizarea bifata pentru a "
+"configura soldul initial!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2843,20 +2874,20 @@ msgstr "Coduri taxe"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Castiguri si pierderi nerealizate"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "Clienți"
+msgstr "Clienti"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr "Perioadă până la"
+msgstr "Perioada pana la"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2899,7 +2930,7 @@ msgstr "Linia 2:"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "Necesar"
+msgstr "Necesar(e)"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2912,7 +2943,7 @@ msgstr "Cont de cheltuieli"
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
-"Lăsaţi necompletat pentru a folosi perioada datei validării (facturii)."
+"Lasati necompletat pentru a folosi perioada datei validarii (facturii)."
 
 #. module: account
 #: help:account.bank.statement,account_id:0
@@ -2925,7 +2956,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Suma cod bază"
+msgstr "Cuantum Cod Baza"
 
 #. module: account
 #: code:addons/account/account_invoice.py:392
@@ -2934,11 +2965,13 @@ msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
+"Nu puteti sterge o factura care este deschisa sau platita. Va sugeram sa o "
+"rambursati in schimb."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "Taxa de vanzare implicita"
+msgstr "Taxa de vanzare Implicita"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1013
@@ -2960,7 +2993,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr "Contabilitate financiară"
+msgstr "Contabilitate Financiara"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
@@ -2979,7 +3012,7 @@ msgstr "Profit si Pierdere"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Poziţie fiscală"
+msgstr "Pozitie fiscala"
 
 #. module: account
 #: code:addons/account/account_invoice.py:735
@@ -2988,17 +3021,19 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Baza de impozitare este diferita!\n"
+"Faceti click pe calculeaza pentru a actualiza baza de impozitare."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr "Un partener pe pagină"
+msgstr "Un Partener pe Pagina"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr "Subordonaţi"
+msgstr "Subordonati"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3006,7 +3041,7 @@ msgstr "Subordonaţi"
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr "Factură client"
+msgstr "Factura client"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -3015,7 +3050,7 @@ msgid ""
 "computing the next taxes."
 msgstr ""
 "Setati daca suma impozitului trebuie inclusa în suma de baza inainte de a "
-"calcula următoarele taxe."
+"calcula urmatoarele taxe."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3025,7 +3060,7 @@ msgstr "Utilizatorul responsabil pentru acest jurnal"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr "Perioada de cautare"
+msgstr "Cautati Perioada"
 
 #. module: account
 #: view:account.change.currency:0
@@ -3036,7 +3071,7 @@ msgstr "Moneda facturii"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Rapoarte Cont"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3046,7 +3081,7 @@ msgstr "Termeni"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr "Tranzactie cu numerar"
+msgstr "Tranzactie numerar"
 
 #. module: account
 #: view:res.partner:0
@@ -3056,12 +3091,12 @@ msgstr "Cont bancar"
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr "Listă şabloane taxe"
+msgstr "Lista Sablon Taxe"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Jurnale Vanzari/Achizitii"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3072,39 +3107,39 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Aceasta va selecta modul de calcul pentru cursul valutar actual pentru "
-"tranzacţiile de ieşire. În majoritatea ţărilor metoda legală este \"media\" "
-"dar numai câteva softuri sunt capabile să gestioneze această metodă. Asadar, "
-"dacă importati dintr-un alt sistem de software, s-ar putea să fiţi nevoiţi "
-"să folosiţi cursul zilei. Tranzacţiile de intrare folosesc întotdeauna "
+"Acesta va selecta modul cum este calculat cursul valutar actual pentru "
+"tranzactiile iesite. In majoritatea tarilor metoda legala este \"media\", "
+"dar numai cateva softuri sunt capabile sa gestioneze aceasta metoda. Prin "
+"urmare, daca importati dintr-un alt sistem de software, s-ar putea sa fiti "
+"nevoiti sa folositi cursul zilei. Tranzactiile intrate folosesc intotdeauna "
 "cursul zilei."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr "Nr. de cifre de folosit pentru codul contului"
+msgstr "Nr. de Cifre care va fi folosit pentru codul contului"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr "Denumire linie"
+msgstr "Nume linie"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr "Cautare An Fiscal"
+msgstr "Cautati Anul Fiscal"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr "Întotdeauna"
+msgstr "Intotdeauna"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Luna-1"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3126,7 +3161,7 @@ msgstr "Model"
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr "Baza de conturi pentru declaraţia fiscală"
+msgstr "Baza de conturi pentru declaratia fiscala"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3151,22 +3186,22 @@ msgstr "Linii analitice"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Facturi Proforma"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr "Fişier electronic"
+msgstr "Fisier electronic"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr "Credit client"
+msgstr "Credit Client"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Ziua din luna: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3197,9 +3232,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Acest wizard va valida toate inregistrarile dintr-un anumit jurnal si "
-"perioada. Odata ce inregistrarile in jurnal sunt validate, nu le mai puteri "
-"actualiza."
+"Acest wizard va valida toate inregistrarile ui anumit jurnal si perioada. "
+"Odata ce inregistrarile in jurnal sunt validate, nu le mai puteti actualiza."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3209,23 +3243,23 @@ msgstr "Sabloane Planuri de conturi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generare Plan de Conturi dintr-un model existent"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Vanzarile din luna aceasta dupa tip"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "Reconciliere Nereconciliere cont"
+msgstr "Reconciliere Cont Nereconciliat"
 
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr ""
+msgstr "Descrierea trebuie sa fie unica pe companie!"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3253,13 +3287,13 @@ msgstr ""
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr "Nici un jurnal contabil de sfarsit de an definit pentru anul fiscal"
+msgstr "Nu exista niciun jurnal de sfarsit de an definit pentru anul fiscal"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Lasaţi necompletat pentru a folosi contul de cheltuieli"
+msgstr "Lasati necompletat pentru a folosi contul de cheltuieli"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3321,24 +3355,24 @@ msgstr "Achizitie"
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr "Configurarea Aplicatiei Contabile"
+msgstr "Configurarea Aplicatiei de Contabilitate"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Valoare suma: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "Tablou de bord contabilitate"
+msgstr "Tablou de bord Contabilitate"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 #: field:account.treasury.report,starting_balance:0
 msgid "Starting Balance"
-msgstr "Sold de început"
+msgstr "Soldul initial"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1332
@@ -3351,12 +3385,12 @@ msgstr "Nici un partener definit !"
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr "Închidere perioadă"
+msgstr "Inchideti o Perioada"
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Afisati Detaliile"
 
 #. module: account
 #: report:account.overdue:0
@@ -3366,7 +3400,7 @@ msgstr "TVA:"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Comunicare Structurata BBA Nevalida !"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3388,7 +3422,7 @@ msgstr "Nereconciliere inregistrari"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "Netipăribil pe factură"
+msgstr "Nu se poate tipari pe Factura"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3400,12 +3434,12 @@ msgstr "Plan de taxe"
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Soldul final trebuie sa fie la fel ca si soldul calculat!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Cautare Jurnal Contabil"
+msgstr "Cautati Jurnalul de Conturi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3446,24 +3480,24 @@ msgstr "Planuri de conturi"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr "Valoare taxă"
+msgstr "Valoare taxa"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr "Cautare miscare"
+msgstr "Cautati Miscarea"
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nume dosar taxe"
+msgstr "Nume caz fiscal"
 
 #. module: account
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr "Factură ciornă"
+msgstr "Factura ciorna"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3472,28 +3506,28 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
-"Factura (facturile) selectata(e) nu pot fi anulate deoarece se afla deja in "
-"stadiu 'Anulat' sau 'Efectuat'!"
+"Factura selectata nu poate fi anulata deoarece se afla deja in stadiu "
+"'Anulat' sau 'Efectuat'!"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "Cantitate :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Durata Perioada (zile)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Tipariti Jurnalul de Vanzari/Achizitii"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr "Stadiu factura"
+msgstr "Starea facturii"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3505,22 +3539,22 @@ msgstr "Categoria Produsului"
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr "Creeaza Cont"
+msgstr "Creati Contul"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr "Raport asupra Vanzarilor dupa Tipul Contului"
+msgstr "Raport Vanzari dupa Tipul Contului"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Elemente Nereconciliate ale Jurnalului"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "Codul monedei trebuie sa fie unic per companie!"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3536,6 +3570,11 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Nu se poate crea factura !\n"
+"Termenii de plata asociati sunt probabil configurati gresit deoarece suma "
+"calculata este mai mare decat suma totala facturata. Ultima linie a "
+"termenului de plata trebuie sa fie de tipul 'sold' pentru a evita problemele "
+"de rotunjire."
 
 #. module: account
 #: report:account.invoice:0
@@ -3565,13 +3604,14 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr "Omolog centralizat"
+msgstr "Echivalent centralizat"
 
 #. module: account
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
+"Nu puteti crea elemente ale jurnalului intr-un cont \"vizualizare\" %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3587,8 +3627,8 @@ msgstr "2"
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
-"(Dacă nu selectaţi un an fiscal, vor fi luaţi în considerare toţi anii "
-"fiscali deschişi)"
+"(Daca nu selectati un an fiscal, vor fi luati in considerare toti anii "
+"fiscali deschisi)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3632,7 +3672,7 @@ msgstr "Data"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Afisati"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3653,7 +3693,7 @@ msgstr "Utilizator"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Şablon Plan de Conturi"
+msgstr "Sablon Plan de Conturi"
 
 #. module: account
 #: code:addons/account/account.py:2280
@@ -3664,19 +3704,19 @@ msgid ""
 "Please define partner on it!"
 msgstr ""
 "Data scadenta a liniei inregistrarii generata de linia model '%s' a "
-"modelului '%s' se bazeaza pe termenul de plata al partenerului!Va rugam sa "
-"ii definiti partenerul!"
+"modelului '%s' se bazeaza pe termenul de plata al partenerului!\n"
+"Va rugam sa ii definiti un partener!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:837
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "Unele înregistrări sunt deja reconciliate !"
+msgstr "Unele inregistrari sunt deja reconciliate !"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Taxă cont"
+msgstr "Taxa Cont"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
@@ -3705,7 +3745,7 @@ msgstr "Nici un Filtru"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Facturi Pro-forma"
 
 #. module: account
 #: view:res.partner:0
@@ -3719,8 +3759,8 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
-"Dacă nu este cazul (calculata printr-un cod Python), taxa nu va apărea pe "
-"factură."
+"Daca nu este cazul (calculata printr-un cod Python), taxa nu va aparea pe "
+"factura."
 
 #. module: account
 #: view:account.tax:0
@@ -3747,7 +3787,7 @@ msgstr "Litigiu"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "Cauta Liniile Analitice"
+msgstr "Cautati Liniile Analitice"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3757,15 +3797,15 @@ msgstr "Cont Plati"
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr "Ordin de plată"
+msgstr "Ordin de plata"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
-"Bifaţi aceasta optiune dacă doriţi ca utilizatorul să reconcilieze "
-"înregistrările in acest cont."
+"Bifati aceasta optiune daca doriti ca utilizatorul sa reconcilieze "
+"inregistrarile in acest cont."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3776,7 +3816,7 @@ msgstr "Sold cont"
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr "Preţ unitar"
+msgstr "Pret unitar"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
@@ -3787,7 +3827,7 @@ msgstr "Elemente Analitice"
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "Unable to change tax !"
-msgstr "Taxa nu poate fi modificată !"
+msgstr "Taxa nu poate fi modificata !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -3797,22 +3837,22 @@ msgstr "# Inregistrari"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "Creati o Rambursare ciorna"
 
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "Deschidere factură"
+msgstr "Factura deschisa"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr "Factor de multiplicare cod fiscal"
+msgstr "Factor de multiplicare Cod fiscal"
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr "Trasare"
+msgstr "Mapare"
 
 #. module: account
 #: code:addons/account/account_invoice.py:921
@@ -3822,6 +3862,8 @@ msgid ""
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Nu putet crea o factura intr-un jurnal centralizat. Debifati casuta "
+"omologului centralizat in jurnalul asociat din meniul de configurare."
 
 #. module: account
 #: field:account.account,name:0
@@ -3845,24 +3887,24 @@ msgstr "Verificare Raport sold Cont vechi"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "Nu puteti crea elemente ale jurnalului intr-un cont inchis %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Data efectivă"
+msgstr "Data efectiva"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Configurati-va Conturile Bancare"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr "Codare standard"
+msgstr "Inregistrare standard"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
@@ -3888,6 +3930,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Anul fiscal, perioadele sau planul de conturi ales (e) trebuie sa apartina "
+"aceleiasi companii."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3903,7 +3947,7 @@ msgstr "Contabilitate"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Inregistrari in Jurnal cu perioada in anul curent"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3914,7 +3958,7 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
-"Printare Raport cu coloana valutei daca valuta este diferita de cea a "
+"Tipariti Raportul cu coloana monedei daca moneda este diferita de cea a "
 "companiei"
 
 #. module: account
@@ -3923,6 +3967,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Valoarea Pierderilor sau Castigului datorata schimbarilor ratei de schimb "
+"valutar atunci cand faceti tranzactii cu mai multe valute."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3944,8 +3990,8 @@ msgid ""
 msgstr ""
 "Cea mai buna practica in acest caz este sa folositi un jurnal care sa "
 "contina inregistrarile de deschidere ale tuturor anilor fiscali. Observati "
-"faptul ca ar trebui sa il definiti cu conturi debit/credit predefinite, de "
-"tipul 'situatie' si cu un omolog centralizat."
+"faptul ca ar trebui sa il definiti cu conturi debit/credit implicite, de "
+"tipul 'situatie' si cu un echivalent centralizat."
 
 #. module: account
 #: view:account.installer:0
@@ -3958,22 +4004,22 @@ msgstr "titlu"
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Setează ca Ciornă"
+msgstr "Setati ca ciorna"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr "Lini Recurente"
+msgstr "Linii Recurente"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr "Afiseaza Partenerii"
+msgstr "Afisati Partenerii"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr "Validare"
+msgstr "Validati"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3981,7 +4027,7 @@ msgstr "Validare"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr "Registru costuri"
+msgstr "Registru Costuri"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -3991,48 +4037,48 @@ msgstr "Active"
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr "Confirmare Facturi"
+msgstr "Confirmati Facturile"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr "Rata medie"
+msgstr "Rata Medie"
 
 #. module: account
 #: field:account.balance.report,display_account:0
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Afisati Conturile"
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Factura ar trebui nereconciliata daca doriti sa o deschideti)"
+msgstr "(Factura trebuie sa fie nereconciliata daca doriti sa o deschideti)"
 
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr "Incepere perioada"
+msgstr "Inceput perioada"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr "Denumire taxă"
+msgstr "Nume taxa"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 #: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr "Sfârşit de lună de 30 zile"
+msgstr "Sfarsit de luna de 30 zile"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr "Balanţă analitică"
+msgstr "Sold Analitic"
 
 #. module: account
 #: help:account.account,active:0
@@ -4041,17 +4087,17 @@ msgid ""
 "without removing it."
 msgstr ""
 "Daca campul activ este setat pe Fals, va va permite sa ascundeti contul fara "
-"sa il stergeti."
+"a-l sterge."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Elemente Afisate ale Jurnalului"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "Sabloane Cautare Taxa"
+msgstr "Cautati Sabloane Fiscale"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -4061,23 +4107,25 @@ msgstr "Inregistrari Ciorna"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  Ziua din Luna= -1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  Numar de Zile: 30"
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr "Scurtătură"
+msgstr "Shortcut (Comanda rapida)"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
 msgstr ""
+"Eroare! Data de inceput a anului fiscal trebuie sa fie inaintea datei de "
+"sfarsit."
 
 #. module: account
 #: view:account.account:0
@@ -4093,12 +4141,12 @@ msgstr ""
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr "Tip cont"
+msgstr "Tipul de cont"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Titularul contului bancar"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4112,7 +4160,7 @@ msgstr "Balanta de verificare"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr "Anuleaza Facturile Selectate"
+msgstr "Anulati Facturile Selectate"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -4121,8 +4169,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
-"Acest cont va fi folosit pentru evaluarea stocului de iesire pentru "
-"categoria produsului actual folosind pretul de vanzare"
+"Acest cont va fi folosit la evaluarea stocului de iesire pentru categoria "
+"produsului actual folosind pretul de vanzare"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4136,6 +4184,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Nu ati furnizat suficiente argumente pentru calcularea soldului initial, va "
+"rugam sa selectati o perioada si un jurnal in context."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4143,24 +4193,24 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"Costurile analitice (fise de ponyaj, unele produse cumparate,...) rezulta "
+"Costurile analitice (fise de pontaj, unele produse cumparate,...) rezulta "
 "din conturile analitice. Acestea genereaza facturi ciorna ale furnizorilor."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr "Inchide Casa de Bani"
+msgstr "Inchideti Casa de Bani"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr "Media Intarzierilor"
+msgstr "Medie Intarzieri Scadente"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr "Tip de cont"
+msgstr "Tipul de cont"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4181,49 +4231,53 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Nu puteti face aceasta modificare intr-o inregistrare confirmata! Puteti "
+"doar sa schimbati unele campuri non juridice sau trebuie sa confirmati mai "
+"intai inregistrarea in jurnal! \n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Cont Paypal"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr "Unitatea de Masura de referinta"
+msgstr "UdM de referinta"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr "Notă"
+msgstr "Nota"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Semn stornare sold"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr "Cont Restante"
+msgstr "Cont Scadente depasite"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Bilant (Cont pasive)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr "Lăsati necompletat pentru a folosi data actuală"
+msgstr "Lasati necompletat pentru a folosi data actuala"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr "Linii taxă"
+msgstr "Linii fiscale"
 
 #. module: account
 #: field:account.tax,base_code_id:0
@@ -4241,12 +4295,13 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Proprietăți contabilitate clienți"
+msgstr "Proprietati contabilitate clienti"
 
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Nume de utilizator Paypal (de obicei e-mail) pentru primirea platilor online."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4269,7 +4324,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Toate înregistrările afisate"
+msgstr "Toate inregistrarile Afisate"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:367
@@ -4285,12 +4340,12 @@ msgstr "Interval lunar"
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr "Bifati daca doriti sa afisati si Conturi cu sold 0."
+msgstr "Bifati daca doriti sa afisati si Conturi cu soldul 0."
 
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr "Calculeaza Cod"
+msgstr "Calculati Codul"
 
 #. module: account
 #: view:account.account.template:0
@@ -4301,17 +4356,17 @@ msgstr "Taxe predefinite"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "Înregistrare de închidere an fiscal"
+msgstr "Inregistrare Inchidere An Fiscal"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr "Procesare periodică"
+msgstr "Procesare periodica"
 
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Nu puteti crea o linie analitica in vizualizarea contului."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4330,7 +4385,7 @@ msgstr "Mod Afisare"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr "Extras de la factura sau plata"
+msgstr "Extras din factura sau plata"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4340,13 +4395,13 @@ msgstr "Plan de conturi"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Titlul Principal 1 (ingrosat, subliniat)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr "Denumire cont"
+msgstr "Nume cont"
 
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
@@ -4356,12 +4411,12 @@ msgstr "Dati numele inregistrarilor noi"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr "Statistici Facturi"
+msgstr "Statistica Facturi"
 
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Curs de schimb valutar"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4383,23 +4438,23 @@ msgstr "Conturi, după tip"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_cash:0
 msgid "Closing Balance"
-msgstr "Sold la închidere"
+msgstr "Sold la inchidere"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr "Neimplementat"
+msgstr "Neimplementat(a)"
 
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Se poate vedea?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "Selectare jurnal contabil"
+msgstr "Selectti Jurnalul Contabil"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4409,12 +4464,12 @@ msgstr "Note de credit"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Numele perioadei trebuie sa fie unic pe companie!"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr "res_config_contents"
+msgstr "res_config_continuturi"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4429,17 +4484,21 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Setati pe Fals daca nu doriti ca acest sablon sa fie folosit in mod activ in "
+"wizardul care genereaza Planul de Conturi din sabloane, acesta este util "
+"atunci cand doriti sa generati conturi din acest sablon doar atunci cand "
+"incarcati sabloanele secundare."
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr "Creare înregistrări după model"
+msgstr "Creati Inregistrari dupa Model"
 
 #. module: account
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "Permite Reconciliere"
+msgstr "Permiteti Reconciliere"
 
 #. module: account
 #: code:addons/account/account.py:1077
@@ -4447,11 +4506,13 @@ msgstr "Permite Reconciliere"
 msgid ""
 "You can not modify company of this period as some journal items exists."
 msgstr ""
+"Nu puteti modifica compania in aceasta perioada pentru ca exista unele "
+"elemente ale jurnalului."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "Statistici conturi analitice"
+msgstr "Statistici Conturi Analitice"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4462,12 +4523,12 @@ msgstr "Bazat pe"
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr "Taxa inclusă în preţ"
+msgstr "Taxa inclusa in Pret"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Registru cu costul contului analitic pentru Raportul Jurnalului"
+msgstr "Registru cu Costurile Contului Analitic pentru Raportul Jurnalului"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4479,7 +4540,7 @@ msgstr "Modele Recurente"
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "Inregistrare eroare"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4489,7 +4550,7 @@ msgstr "4"
 #. module: account
 #: view:account.invoice:0
 msgid "Change"
-msgstr "Modificare"
+msgstr "Modificati"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -4499,7 +4560,7 @@ msgstr "Banca si Cecuri"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "Controale de tip"
+msgstr "Tip Controale"
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
@@ -4512,24 +4573,24 @@ msgstr "Actioneaza ca si cont predefinit pentru suma creditului"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Afiseaza Inregistrarile in Jurnal"
+msgstr "Afisati Inregistrarile in Jurnal"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr "Anulat"
+msgstr "Anulat(a)"
 
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "Soldul la inchidere bazat pe casa de bani"
+msgstr "Soldul la inchidere pe baza casei de bani"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Example"
-msgstr ""
+msgstr "Exemplu"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
@@ -4538,39 +4599,39 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
-"Verificaţi preţul de pe factură !\n"
+"Va rugam sa verificati pretul de pe factura !\n"
 "Totalul specificat este diferit de totalul calculat."
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "Lăsaţi necompletat pentru a utiliza contul de venituri."
+msgstr "Lasati necompletat pentru a utiliza contul de venituri"
 
 #. module: account
 #: code:addons/account/account.py:3299
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Taxa Achizitie %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "Generare Inregistrari"
+msgstr "Generati Inregistrari"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr "Selectare Diagrame ale Taxelor"
+msgstr "Selectati Planurile Fiscale"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr "Corespondenţă conturi"
+msgstr "Reprezentare Conturi"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4584,12 +4645,12 @@ msgstr "Client"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr "Confirmat"
+msgstr "Confirmat(a)"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr "Factură anulată"
+msgstr "Factura anulata"
 
 #. module: account
 #: code:addons/account/account.py:1567
@@ -4600,18 +4661,18 @@ msgid ""
 "definition if you want to accept all currencies."
 msgstr ""
 "Nu s-a putut crea miscarea cu valuta diferita de valuta secundara a contului "
-"\"%s - %s\". Stergeti campul valutei secundare a definirii contului daca "
+"\"%s - %s\". Stergeti campul valutei secundare din definirea contului daca "
 "doriti sa acceptati toate valutele."
 
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Nou(a)"
 
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
-msgstr "Data operaţiei"
+msgstr "Data operatiunii"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -4622,7 +4683,7 @@ msgstr "Nereconciliere tranzacţii"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Cod taxă restituită"
+msgstr "Cod Restituire Fiscala"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4637,7 +4698,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr "Configuratie"
+msgstr "Configurare"
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
@@ -4647,18 +4708,18 @@ msgstr "Data de inceput"
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr "Cont venituri specificat în şablonul produsului"
+msgstr "Cont venituri specificat in Sablonul Produsului"
 
 #. module: account
 #: code:addons/account/account.py:3120
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "DIVERSE"
 
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${obiect.companie_id.nume} Factura (Ref ${obiect.numar sau 'n/a'})"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4688,12 +4749,12 @@ msgstr "Facturi"
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Facturile mele"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr "Bifează"
+msgstr "Verificati"
 
 #. module: account
 #: view:account.invoice:0
@@ -4701,7 +4762,7 @@ msgstr "Bifează"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr "Agent de vânzări"
+msgstr "Agent Vanzari"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4711,12 +4772,12 @@ msgstr "Facturat"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Inregistrari in Jurnal Afisate"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr "Folosire model"
+msgstr "Folositi Modelul"
 
 #. module: account
 #: help:account.invoice,partner_bank_id:0
@@ -4725,6 +4786,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Numarul de Cont Bancar in care va fi platita factura. Un cont bancar al "
+"companiei daca aceasta este o Factura a Clientului sau o Rambursare a "
+"Furnizorului, altfel un numar de cont bancar al partenerului"
 
 #. module: account
 #: view:account.state.open:0
@@ -4734,18 +4798,18 @@ msgstr "Nu"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr "Bază taxe în declaraţia fiscala."
+msgstr "Baza de impozitare a declaratiei fiscale."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr "Adauga"
+msgstr "Adaugati"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "Plătit"
+msgstr "Platit(a)"
 
 #. module: account
 #: view:account.period.close:0
@@ -4755,7 +4819,7 @@ msgstr "Sunteti sigur ?"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "Extrasul bancar folosit pentru reconcilierea cu banca"
+msgstr "Extrasul bancar folosit pentru reconcilierea bancara"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4769,28 +4833,31 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Eroare de Configurare!\n"
+"Nu puteti defini conturi secundare intr-un cont cu tipul intern diferit de "
+"\"Vizualizare\"! "
 
 #. module: account
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Deschidere Perioada"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Inregistrari in Jurnal de Revizuit"
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr "Calculare"
+msgstr "Calculati"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr "Aplicare taxă"
+msgstr "Aplicare Taxa"
 
 #. module: account
 #: view:account.move:0
@@ -4815,7 +4882,7 @@ msgstr "Aplicare taxă"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Pozitii Jurnal"
+msgstr "Elementele Jurnalului"
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -4849,7 +4916,7 @@ msgstr "Eroare"
 #: field:account.analytic.inverted.balance,date2:0
 #: field:account.analytic.journal.report,date2:0
 msgid "End of period"
-msgstr "Sfârşitul perioadei"
+msgstr "Sfarsitul perioadei"
 
 #. module: account
 #: view:res.partner:0
@@ -4862,8 +4929,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
-"Acest raport este o analiza pe partener. Este un raport PDF care contine o "
-"linie per partener reprezentand soldul creditului cumulativ."
+"Acest raport este o analiza dupa partener. Este un raport PDF care contine o "
+"linie per partener reprezentand soldul cumulativ al creditului."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4871,29 +4938,29 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
-"Pentru a imprima un jurnal analitic (sau costuri) pentru o perioada data. "
-"Raportul da codul, miscarea, numarul contului, suma generala si suma "
-"analitica."
+"Pentru imprimarea unui jurnal analitic (sau costuri analitice) pentru o "
+"perioada data. Raportul prezinta codul, numele miscarii, numarul contului, "
+"suma generala si suma analitica."
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Numarul Facturii trebuie sa fie unic per Companie!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr "Sold după Tipul de cont"
+msgstr "Sold dupa Tipul de cont"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "Generare înregistrări de deschidere an fiscal"
+msgstr "Generati Inregistrări de deschidere a Anului Fiscal"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Contabil"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -4901,27 +4968,30 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Din aceasta vizualizare aveti o analiza a trezoreriei. Aceasta iInsumeaza "
+"soldul fiecarei inregistrari contabile efectuata in conturi de lichididati "
+"pe perioada."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr "Linii Facturi Grup"
+msgstr "Grupati Liniile Facturii"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr "Închidere"
+msgstr "Inchideti"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Mişcări"
+msgstr "Miscari"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "Jurnalul de vanzari din luna aceasta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4942,7 +5012,7 @@ msgstr "Pentru inchidere"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Inceputul Datei perioadei"
 
 #. module: account
 #: code:addons/account/account.py:1351
@@ -4952,19 +5022,19 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"Nu puteti modifica o inregistrare afisată a acestui jurnal !\n"
-"Ar trebui sa setati ca jurnalul sa permita anularea inregistrărilor dacă "
-"doriti sa faceţi acest lucru."
+"Nu puteti modifica o inregistrare afisata a acestui jurnal !\n"
+"Ar trebui sa setati ca jurnalul sa permita anularea inregistrarilor daca "
+"doriti sa faceti acest lucru."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr "Şabloane"
+msgstr "Sabloane"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Descriere taxă"
+msgstr "Descriere taxa"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -4976,7 +5046,7 @@ msgstr "Conturi taxe subordonate"
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
-"Perioada de inceput ar trebui sa fie mai mica decat perioada de sfarsit"
+"Perioada de inceput trebuie sa fie mai mica decat Perioada de sfarsit"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -4985,13 +5055,13 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
-"Bifati aici dacă preţul folosit pentru produs şi în facturi include această "
-"taxă."
+"Bifati aici daca pretul folosit pentru produs si in facturi include aceasta "
+"taxa."
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "Sold analitic -"
+msgstr "Sold Analitic -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -5022,47 +5092,47 @@ msgstr "Sold analitic -"
 #: field:account.vat.declaration,target_move:0
 #: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr "Miscări ţintă"
+msgstr "Miscari tinta"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 de zile Net"
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr "Tip perioadă"
+msgstr "Tipul Perioadei"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr "Plăţi"
+msgstr "Plati"
 
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr "Restabilire Calcul Cod"
+msgstr "Schimbati Cod Calcul"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Înregistrare"
+msgstr "Inregistrare"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr "Cod Python (restabilire)"
+msgstr "Cod Python (inversare)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "Termeni de plată"
+msgstr "Termeni de plata"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5071,18 +5141,22 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Aceasta expresie booleeana va ajuta sa va hotarati daca doriti sa-i "
+"propuneti utilizatorului sa inregistreze ratele de vanzare si de cumparare "
+"sau sa aleaga din lista de taxe. Ultima alegere presupune faptul ca setul de "
+"taxe definit in acest sablon este complet"
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Raport Cont"
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr "Denumire coloană"
+msgstr "Nume Coloana"
 
 #. module: account
 #: view:account.general.journal:0
@@ -5101,12 +5175,12 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr "An"
+msgstr "Anul"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr "Deschidere Casa de bani"
+msgstr "Deschideti Casa de bani"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5117,7 +5191,7 @@ msgstr "Linia 1:"
 #: code:addons/account/account.py:1307
 #, python-format
 msgid "Integrity Error !"
-msgstr "Eroare integritate!"
+msgstr "Eroare de integritate!"
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5160,7 +5234,7 @@ msgstr "Jurnale Generale"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Bifati Data in Perioada"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5173,12 +5247,12 @@ msgstr "Rapoarte Contabile"
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
 #: model:ir.actions.act_window,name:account.action_move_line_form
 msgid "Entries"
-msgstr "Înregistrări"
+msgstr "Inregistrari"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr "Aceasta Perioada"
+msgstr "Aceasta perioada"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -5190,12 +5264,12 @@ msgstr "UdeM"
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr "Nu s-a gasit pe factură specificarea perioadei!"
+msgstr "Nu exista nicio Perioada specificata pe Factura!"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr "Calcul cod (daca tip=cod)"
+msgstr "Cod Calcul (daca tip=cod)"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5206,12 +5280,12 @@ msgstr "Calcul cod (daca tip=cod)"
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr "Vânzări"
+msgstr "Vanzari"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Raport"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5226,7 +5300,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr "Sumă"
+msgstr "Suma"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5242,17 +5316,17 @@ msgstr "Validare"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "Taxa pentru poziţiile subordonate"
+msgstr "Taxa pentru pozitiile subordonate"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "Sablon Pozitie Taxa Fiscala"
+msgstr "Sablon Fiscal Pozitie Fiscala"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr "Permite anularea înregistrărilor"
+msgstr "Permiteti Anularea Inregistrarilor"
 
 #. module: account
 #: field:account.tax.code,sign:0
@@ -5262,7 +5336,7 @@ msgstr "Coeficient pentru parinte"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "Conturi Analitice cu scadenta depasita."
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5284,32 +5358,32 @@ msgstr "Tranzactie"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "Foloseşte acest cod pentru declararea TVA-ului."
+msgstr "Folositi acest cod pentru declararea TVA-ului."
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr "Progrea"
+msgstr "In desfasurare"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "Statistici ale înregistrărilor analitice"
+msgstr "Statistici Inregistrari Analitice"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Numerar si Banci"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr "account.installer"
+msgstr "cont.program de instalare"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "Se include în suma de bază"
+msgstr "Se include in suma de baza"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5317,8 +5391,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
-"Numărul de zile ce se adaugă înainte de a calcula ziua din lună. Dacă "
-"Data=15/01, Numărul de zile=22, Ziua din lună=-1, atunci data scadenţei este "
+"Numarul de zile care se adauga inainte de a calcula ziua din luna. Daca "
+"Data=15/01, Numarul de zile=22, Ziua din luna=-1, atunci data scadentei este "
 "28/02."
 
 #. module: account
@@ -5329,13 +5403,13 @@ msgstr "Calcul Suma"
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr "Comenzi înregistrări"
+msgstr "Comenzi inregistrare"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(Lasati necompletat pentru a deschide situaţia curentă)"
+msgstr "(Lasati necompletat pentru a deschide situatia curenta)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5344,7 +5418,7 @@ msgstr "(Lasati necompletat pentru a deschide situaţia curentă)"
 #: field:account.analytic.inverted.balance,date1:0
 #: field:account.analytic.journal.report,date1:0
 msgid "Start of period"
-msgstr "Începutul perioadei"
+msgstr "Inceputul perioadei"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5355,31 +5429,32 @@ msgstr "Cont Comun Raport Cont"
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr "Comuncare"
+msgstr "Comunicare"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Contabilitate analitică"
+msgstr "Contabilitate Analitica"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Includeti Soldurile Initiale"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Restituire client"
+msgstr "Rambursare client"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Nu puteti crea mai mult de o miscare pe perioada intr-un jurnal centralizat"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5387,22 +5462,22 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "Semn cod taxa"
+msgstr "Semn Cod Fiscal"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr "Raport al facturilor create in ultimele 15 zile"
+msgstr "Raportul Facturilor create in ultimele 15 zile"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  Numar de zile: 14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Jurnal înregistrări închidere de an"
+msgstr "Jurnal Inregistrari Sfarsit de an"
 
 #. module: account
 #: code:addons/account/account.py:3446
@@ -5415,12 +5490,12 @@ msgstr "Jurnal înregistrări închidere de an"
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "Eroare Configurare !"
+msgstr "Eroare de Configurare !"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Suma de Plata"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5430,7 +5505,7 @@ msgid ""
 "as reconciled."
 msgstr ""
 "Acestia sunt partenerii ramasi pentru care ar trebui sa verificati daca "
-"exista ceva de reconciliat sau nu. Aceasta cifra deja considera partenerul "
+"exista ceva de reconciliat sau nu. Aceasta cifra considera deja partenerul "
 "actual ca fiind reconciliat."
 
 #. module: account
@@ -5457,18 +5532,18 @@ msgstr "Neafisat"
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr "Schimba Valuta"
+msgstr "Schimbati Moneda"
 
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "Aceasta actiune va sterge taxele"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr "Inregistrari Contabile"
+msgstr "Inregistrari contabile."
 
 #. module: account
 #: view:account.invoice:0
@@ -5480,12 +5555,12 @@ msgstr "Data platii"
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Conturi analitice"
+msgstr "Conturi Analitice"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Facturi si Rambursari Client"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5493,7 +5568,7 @@ msgstr ""
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Valuta sumei"
+msgstr "Moneda sumei"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5502,8 +5577,8 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Jurnalul specificat nu contine nici o înregistrare contabilă în stadiul de "
-"ciornă pentru aceasta perioada"
+"Jurnalul specificat nu contine nici o inregistrare contabila in stadiul de "
+"ciorna pentru aceasta perioada"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5533,12 +5608,12 @@ msgstr "Numar (Miscare)"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "Inregistrari Analitice in ultimele 7 zile"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Text obisnuit"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5560,14 +5635,14 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
-"Câmpul secvenţă este utilizat pentru ordonarea ascendentă a liniilor "
-"termenelor de plată"
+"Campul secventa este utilizat pentru ordonarea ascendenta a liniilor "
+"termenelor de plata"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Şablon poziţie fiscală"
+msgstr "Sablon Pozitie Fiscala"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -5608,7 +5683,7 @@ msgstr "Deschideti Casa de bani"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Formatare automata"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5617,6 +5692,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Nu exista niciun an fiscal definit pentru aceasta data !\n"
+"Va rugam sa creati unul din configurarea meniului contabil."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5627,17 +5704,17 @@ msgstr "Reconciliere cu Pierderea"
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 msgid "Fixed Amount"
-msgstr "Sumă fixă"
+msgstr "Suma fixa"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr "Valid pana la"
+msgstr "Valabil pana la"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr "Datele de facturare"
+msgstr "Date pentru facturare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5659,7 +5736,7 @@ msgstr "Mutare jurnal"
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr "Generare Inregistrari de intrare"
+msgstr "Generati Inregistrari Deschise"
 
 #. module: account
 #: code:addons/account/account_move_line.py:759
@@ -5670,17 +5747,17 @@ msgstr "Deja Reconciliat!"
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr "Metoda de calcul pentru taxă"
+msgstr "Metoda de calcul pentru valoarea impozitului."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Calcul Data Scadenta"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr "Creeaza Data"
+msgstr "Data Crearii"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -5698,7 +5775,7 @@ msgstr "Conturi subordonate"
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Nume miscare (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5710,7 +5787,7 @@ msgstr "Pierdere"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Total de plată"
+msgstr "Total de plata"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -5739,7 +5816,7 @@ msgstr "Martie"
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "Sablon cont"
+msgstr "Sablon Cont"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -5749,13 +5826,13 @@ msgstr "TVA"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr "Nr. cont"
+msgstr "Nr. de cont"
 
 #. module: account
 #: code:addons/account/account_invoice.py:88
 #, python-format
 msgid "Free Reference"
-msgstr "Referinţă liberă"
+msgstr "Referinta gratuita"
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -5770,12 +5847,12 @@ msgstr "Evaluare"
 #: code:addons/account/report/account_partner_balance.py:301
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "Conturi debitori şi creditori"
+msgstr "Conturi Incasari si Plati"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr "Corespondentă fiscală"
+msgstr "Reprezentare fiscala"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -5791,12 +5868,12 @@ msgstr "Cant. max."
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "Factură stornată"
+msgstr "Stornare factura"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr "Adresă de facturare"
+msgstr "Adresa de facturare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5816,10 +5893,10 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
-"Definirea codului taxei depinde de declaratia fiscala din tara "
+"Definirea codului fiscal depinde de declaratia fiscala din tara "
 "dumneavoastra. OpenERP va permite sa definiti structura impozitului si sa o "
-"gestionati din acest meniu.Puteti defini atat coduri de taxe numerice cat si "
-"alfanumerice."
+"gestionati din acest meniu. Puteti defini atat coduri fiscale numerice cat "
+"si alfanumerice."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5829,7 +5906,7 @@ msgid ""
 msgstr ""
 "Va arata progresul facut azi in ceea ce priveste procesul de reconciliere. "
 "Dat de catre \n"
-" Parteneri Reconciliati Astazi \\ (Parteneri Ramasi + Parteneri Reconciliati "
+"Parteneri Reconciliati Astazi \\ (Parteneri Ramasi + Parteneri Reconciliati "
 "Astazi)"
 
 #. module: account
@@ -5849,13 +5926,13 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Impune perioada"
+msgstr "Impuneti Perioada"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "# a Liniilor"
+msgstr "# de Linii"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5874,60 +5951,60 @@ msgstr "# a Liniilor"
 #: field:accounting.report,filter:0
 #: field:accounting.report,filter_cmp:0
 msgid "Filter by"
-msgstr "Filtrare dupa"
+msgstr "Filtrati dupa"
 
 #. module: account
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Aveti o expresie \"%(...)s\" gresita in modelul dumneavoastra !"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "Data inregistrarii"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
 #: code:addons/account/account_move_line.py:1238
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr "Nu puteţi folosi un cont inactiv !"
+msgstr "Nu puteti folosi un cont inactiv!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr "Înregistrările nu au acelaşi cont sau sunt deja reconciliate ! "
+msgstr "Inregistrarile nu au acelasi cont sau sunt deja reconciliate ! "
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Soldul calculat pe baza Soldului Initial si liniile tranzactiei"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "Moneda curenta nu este configurata corect !"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Cont taxă factură"
+msgstr "Cont Factura Fiscala"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr "Cont Jurnal General"
+msgstr "Jurnal General Cont"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr "Număr de zile"
+msgstr "Numarul de zile"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:402
@@ -5935,7 +6012,7 @@ msgstr "Număr de zile"
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr "Acţiune invalidă !"
+msgstr "Actiune nevalida !"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
@@ -5946,25 +6023,25 @@ msgstr "Perioada: %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "Revizuiti Jurnalele Financiare"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr "Acest nume va aparea în rapoarte"
+msgstr "Acest nume va aparea in rapoarte"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr "Data tipăririi"
+msgstr "Data tiparirii"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr "Lipsă"
+msgstr "Niciunul/Niciuna"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -5975,17 +6052,17 @@ msgstr "  365 Zile  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Restituiri client"
+msgstr "Restituiri Client"
 
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Sold Strain"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Denumirea perioadei jurnalului"
+msgstr "Numele Perioadei Jurnalului"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -6011,17 +6088,17 @@ msgid ""
 "Forma' state!"
 msgstr ""
 "Factura (Facturile) selectate nu pot fi confirmate deoarece nu sunt in "
-"stadiu 'Ciorna' sau 'Pro-forma'!"
+"stadiu 'Ciorna' sau 'Pro-Forma'!"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Abonament in derulare"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Comentariu poziţie fiscală"
+msgstr "Observatie pozitie fiscala :"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -6042,6 +6119,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Eroare de configurare! \n"
+"Nu puteti defini conturi subordonate unui cont cu tipul intern diferit de "
+"\"Vizualizare\"! "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -6049,17 +6129,19 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Acest jurnal va fi creat automat pentru acest cont bancar atunci cand "
+"salvati inregistrarea"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "Înregistrare analitică"
+msgstr "Inregistrare Analitica"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr "Mesaj plăţi restante"
+msgstr "Mesaj Plati Restante"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -6069,26 +6151,26 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
-"Aceasta vizualizare poate fi folisita de contabili pentru a inregistra "
+"Aceasta vizualizare poate fi folosita de contabili pentru a inregistra "
 "repede inregistrarile in OpenERP. Daca doriti sa inregistrati o factura a "
 "furnizorului, incepeti prin a inregistra linia contului de cheltuieli. "
-"OpenERP va va propune automat Taxa asociata acestui cont si corespondentul "
-"\"Cont de Plati\"."
+"OpenERP va va propune automat Taxa asociata acestui cont si \"Contul de "
+"Plati\" corespondent."
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr "Data Creata"
+msgstr "Data crearii"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr "account.analytic.line.extended"
+msgstr "cont.analitic.linie.extinsa"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "(păstraţi necompletat pentru a folosi perioada curentă)"
+msgstr "(lasati necompletat pentru a folosi perioada curenta)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -6103,7 +6185,7 @@ msgstr ""
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr "Cont rădăcină"
+msgstr "Cont baza"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
@@ -6118,17 +6200,17 @@ msgstr "Linie Analitica"
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Taxe client"
+msgstr "Taxe Client"
 
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr "Acesta este un model pentru înregistrări contabile recurente"
+msgstr "Acesta este un model pentru inregistrari contabile recurente"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Taxa Vanzari(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6139,19 +6221,19 @@ msgstr "Creare Cont bazat pe acest sablon"
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "Raportare Configurare"
+msgstr "Configurare Raportare"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr "Tip taxă"
+msgstr "Tip taxa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr "Şabloane conturi"
+msgstr "Sabloane Conturi"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,complete_tax_set:0
@@ -6161,6 +6243,10 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Aceasta expresie booleeana va ajuta sa va decideti daca doriti sa-i "
+"propuneti utilizatorului sa inregistreze ratele de vanzare sau de achizitie "
+"sau sa foloseasca campul obisnuit m2o (facut la comanda). Ultima varianta "
+"presupune ca setul de taxe definit pentru sablonul ales este complet"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6175,12 +6261,12 @@ msgstr "Companii"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Facturi Deschise si Platite"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Afisati subordordonatele fixe"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6189,6 +6275,8 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Nu puteti sterge/dezactiva un cont care este configurat pentru un client sau "
+"un furnizor."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6213,7 +6301,7 @@ msgstr "Informatii suplimentare"
 #. module: account
 #: field:account.chart,fiscalyear:0
 msgid "Fiscal year"
-msgstr "An fiscal"
+msgstr "Anul fiscal"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -6260,7 +6348,7 @@ msgstr "Inregistrari Reconciliate Partial"
 #: view:validate.account.move.lines:0
 #, python-format
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulati"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6268,32 +6356,32 @@ msgstr "Anulare"
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "Debitor"
+msgstr "Incasari"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociata."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr "Alte informații"
+msgstr "Alte informatii"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr "Cont credit implicit"
+msgstr "Cont Credit Implicit"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr "Valuta asociata contului daca nu este aceeasi cu cea a companiei."
+msgstr "Valuta asociata contului daca nu este aceeasi ca si cea a companiei."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr "Actual"
+msgstr "Actual(a)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6324,18 +6412,18 @@ msgstr "Putere"
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Nu se poate crea un cod de jurnal nefolosit."
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr "Vizualizare linii conturi analitice"
+msgstr "Vizualizati Liniile Contului Analitic"
 
 #. module: account
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr "Numărul facturii"
+msgstr "Numarul facturii"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6343,7 +6431,7 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
-"Indica daca suma taxei trebuie inclusa in suma de baza pentru calculul "
+"Indica daca valoarea taxei trebuie inclusa in suma de baza pentru calculul "
 "taxelor urmatoare"
 
 #. module: account
@@ -6355,17 +6443,17 @@ msgstr "Reconciliere: Mergeti la Partenerul Urmator"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Balanţă analitică inversă"
+msgstr "Sold Analitic Inversat"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr "Tip aplicabil"
+msgstr "Tipul aplicabil"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "Referinţa facturii"
+msgstr "Referinta facturii"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6374,9 +6462,9 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"Câmpul secvenţă este utilizat pentru ordonarea ascendentă a liniilor "
-"taxelor. Ordinea este importantă dacă aveţi o taxa care are alte taxe "
-"subordonate. În acest caz, ordinea evaluării este importantă."
+"Campul secventa este utilizat pentru ordonarea ascendenta a liniilor "
+"taxelor. Ordinea este importanta daca aveti o taxa care are alte taxe "
+"subordonate. In acest caz, ordinea evaluarii este importanta."
 
 #. module: account
 #: selection:account.account,type:0
@@ -6438,12 +6526,14 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Nu puteti schimba compania detinatoare a unui cont care contine deja "
+"elemente ale jurnalului."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "Enter a Start date !"
-msgstr "Introduceti o data de inceput !"
+msgstr "Introduceti o Data de inceput !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6453,15 +6543,10 @@ msgstr "Introduceti o data de inceput !"
 msgid "Supplier Refund"
 msgstr "Restituire furnizor"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablou de bord"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
-msgstr "Linii înregistrări"
+msgstr "Linii inregistrari"
 
 #. module: account
 #: field:account.move.line,centralisation:0
@@ -6489,7 +6574,7 @@ msgstr "Centralizare"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "Grupare dupa..."
+msgstr "Grupati dupa..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -6499,12 +6584,12 @@ msgstr "Numai citire"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  Evaluare: Sold"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "Unitate de măsură"
+msgstr "Unitatea de masura"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6518,12 +6603,12 @@ msgstr ""
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Are Compania Implicita"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "account.sequence.fiscalyear"
+msgstr "secventa.cont.an_fiscal"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -6534,34 +6619,35 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "Jurnal analitic"
+msgstr "Jurnal Analitic"
 
 #. module: account
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
 msgstr ""
+"Nu puteti dezactiva un cont care contine niste elemente ale jurnalului."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr "Reconciliat"
+msgstr "Reconciliat(a)"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr "Bază"
+msgstr "Baza"
 
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr "Denumire model"
+msgstr "Nume Model"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr "Categorie cont de cheltuieli"
+msgstr "Categorie Cont de cheltuieli"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6572,7 +6658,7 @@ msgstr "Tranzactii cu numerar"
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr "Factura este deja reconciliată"
+msgstr "Factura este deja reconciliata"
 
 #. module: account
 #: view:account.account:0
@@ -6590,36 +6676,36 @@ msgstr "Note"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr "Statistici Inregistrari Analitice"
+msgstr "Statistica Inregistrari Analitice"
 
 #. module: account
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "Nu puteti sa stergeti un cont care contine elemente ale jurnalului."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
 #: code:addons/account/account_move_line.py:933
 #, python-format
 msgid "Entries: "
-msgstr "Înregistrări: "
+msgstr "Inregistrari: "
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "Creare inregistrari recurente manuale intr-un jurnal selectat."
+msgstr "Creati inregistrari recurente manuale intr-un jurnal selectat."
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Moneda jurnalului contabil asociat."
 
 #. module: account
 #: code:addons/account/account.py:1563
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr "Nu pot crea mişcări între companii diferite"
+msgstr "Nu s-a putut crea miscarea intre companii diferite."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6633,8 +6719,8 @@ msgid ""
 "need for your company."
 msgstr ""
 "Un tip de cont este folosit pentru a determina modul in care un cont este "
-"folosit in fiecare jurnal.Metoda de tergiversare a unui tip de cont "
-"determina procesul pentru inchiderea anuala. Rapaorte precum Bilant si "
+"folosit in fiecare jurnal. Metoda de tergiversare a unui tip de cont "
+"determina procesul pentru inchiderea anuala. Rapoartele precum Bilant si "
 "raportul Profit si Pierderi folosesc categoria (profit/pierderi sau bilant). "
 "De exemplu, tipul de cont ar putea fi relationat unui cont activ, cont de "
 "cheltuieli sau cont de plati. Din aceasta fereastra, puteti crea si gestiona "
@@ -6645,7 +6731,7 @@ msgstr ""
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Bilant (Cont Active)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6654,8 +6740,8 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
-"Reconcilierea bancara consta in a verifica daca extrasul dumneagvoastra "
-"bancar corespunde cu intrarile (sau inregistrarile) acelui cont in sistemul "
+"Reconcilierea bancara consta in a verifica daca extrasul dumneavoastra "
+"bancar corespunde cu intrarile (sau inregistrarile) acelui cont din sistemul "
 "dumneavoastra contabil."
 
 #. module: account
@@ -6668,13 +6754,13 @@ msgstr "Stadiul este ciorna"
 #: code:addons/account/account_move_line.py:1043
 #, python-format
 msgid "Total debit"
-msgstr "Debit total"
+msgstr "Total debit"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "Înregistrarea \"%s\" nu este validă !"
+msgstr "Inregistrarea \"%s\" nu este valida !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6687,8 +6773,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"Vor fi configurate automat planul de conturi, conturile bancare, taxele şi "
-"jurnalele conform modelului ales"
+"Acesta va configura automat planul d-voastra de conturi, conturile bancare, "
+"taxele si jurnalele in functie de sablonul selectat"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6696,8 +6782,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
-"Acest cont va fi utilizat în locul contului predefinit drept cont de "
-"încasări pentru partenerul actual"
+"Acest cont va fi utilizat in locul contului implicit drept cont de incasari "
+"pentru partenerul actual"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6713,7 +6799,7 @@ msgstr "Cod Python"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Inregistrarile Contabile cu perioada in perioada curenta"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6727,19 +6813,19 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Creare"
+msgstr "Creati"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Creează înregistrare"
+msgstr "Creati inregistrarea"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Profit & Pierdere (Contul de cheltuieli)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6775,36 +6861,36 @@ msgstr "Eroare !"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Stil Raport Financiar"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Pastrati semnul soldului"
 
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "Raport taxe"
+msgstr "Raport Taxe"
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr "Tipărit"
+msgstr "Tiparit"
 
 #. module: account
 #: code:addons/account/account_move_line.py:584
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "Error :"
-msgstr ""
+msgstr "Eroare :"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "Linie proiect"
+msgstr "Linia proiectului"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
@@ -6830,7 +6916,7 @@ msgstr ""
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr "De Verificat"
+msgstr "De verificat"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -6840,6 +6926,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Daca ati selectat sa faceti filtrarea dupa data sau perioada, acest camp va "
+"permite sa adaugati un rand pentru afisarea sumei "
+"debitului/creditului/soldului care precede filtrul setat de dumneavoastra."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6853,7 +6942,7 @@ msgstr "Inregistrari in Jurnal"
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Afisare Raport Registru cu Un partener pe pagina"
+msgstr "Afisati Raport Registru cu Un partener pe pagina"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1218
@@ -6863,6 +6952,10 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Nu puteti face aceasta modificare intr-o inregistrare reconciliata! Puteti "
+"sa schimbati doar niste campuri nejuridice sau trebuie sa nereconciliati mai "
+"intai!\n"
+"%s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6888,8 +6981,8 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
-"Liniile Inregistrarilor selectate nu au inregistrari ale miscarii contului "
-"in stadiu de ciorna"
+"Liniile selectate ale Inregistrarilor nu au nicio inregistrare a miscarii "
+"contului in stadiu de ciorna"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6912,15 +7005,15 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "Toate înregistrările"
+msgstr "Toate Inregistrarile"
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Eroare: UdeM predefinita si cumpararea UdeM trebuie sa fie in aceeasi "
-"categorie."
+"Eroare: Unitatea de masura implicita si unitatea de masura pentru achizitii "
+"trebuie sa faca parte din aceeasi categorie."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6933,12 +7026,12 @@ msgstr "Selectare Jurnal"
 #: code:addons/account/account.py:432
 #, python-format
 msgid "Opening Balance"
-msgstr "Bilantul de deschidere"
+msgstr "Soldul la deschidere"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Reconciliere cont"
+msgstr "Reconciliere Cont"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -6968,8 +7061,8 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
-"Acest raport va permite sa imprimati sau sa generati un pdf cu soldul de "
-"incercare, permitandu-va sa verificati repede soldul fiecarui cont intr-un "
+"Acest raport va permite sa tipariti sau sa generati un pdf cu balanta de "
+"verificare, permitandu-va sa verificati repede soldul fiecarui cont intr-un "
 "singur raport"
 
 #. module: account
@@ -6986,17 +7079,17 @@ msgstr ""
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Completati Setul de Taxe"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr "Proprietăţi"
+msgstr "Proprietati"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr "Cont Diagrama Taxe"
+msgstr "Cont plan fiscal"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -7005,6 +7098,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Va rugam sa definiti un cod BIC/Swift la banca pentru ca Contul bancar de "
+"tip IBAN sa faca plati valabile"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7031,20 +7127,15 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-"Puteti specifica anul,luna si data in numele modelului folosind urmatoarele "
-"etichete- \n"
+"Puteti specifica anul, luna si data in numele modelului folosind urmatoarele "
+"etichete:\n"
 "\n"
-"%(year)s- Pentru a Specifica Anul \n"
-"%(month)s- Pentru a Specifica Luna \n"
-"%(date)s- Data Actuala\n"
+"%(year)s: Pentru a Specifica Anul \n"
+"%(month)s: Pentru a Specifica Luna \n"
+"%(date)s: Data Actuala\n"
 "\n"
 "ex. Modelul meu in %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Conturi de venituri"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7059,25 +7150,25 @@ msgstr "Coduri subordonate"
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "Taxe folosite in Vanzari"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
-msgstr "Date insuficiente !"
+msgstr "Date Insuficiente !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Facturi clienți"
+msgstr "Facturi client"
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
 msgid "Write-Off amount"
-msgstr "Suma casată"
+msgstr "Suma pierduta"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7088,7 +7179,7 @@ msgstr "Vanzari"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "Coloană jurnal"
+msgstr "Coloana Jurnal"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -7106,6 +7197,10 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
+"Configurati contul bancar al companiei dumneavoastra si selectati-le pe cele "
+"care trebuie sa apara la subsolul raportului. Puteti reordona bancile in "
+"vizualizarea listei. Daca folositi aplicatia contabila OpenERP, jurnalele si "
+"conturile vor fi create automat pe baza acestor date."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7122,25 +7217,25 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
-"Balanta veche a partenerului este un raport mai detaliat al veniturilor "
-"dumneavoastra de realizat dupa intervale. Atunci cand deschideti acel "
-"raport, OpenERP va cere numele companiei, perioada fiscala si marimea "
-"intervalului care va fi analizat (in zile). OpenERP calculeaza apoi un sold "
-"de credit pe perioada. Astfel, daca solicitati un interval de 30 de zile, "
-"OpenERP genereaza o analiza a creditorilor pentru ultima luna, ultimele doua "
-"luni, si asa mai departe. "
+"Balanta veche a partenerului este un raport mai detaliat al incasarilor "
+"dumneavoastra dupa intervale. Atunci cand deschideti acel raport, OpenERP va "
+"cere numele companiei, perioada fiscala si marimea intervalului care va fi "
+"analizat (in zile). OpenERP calculeaza apoi un sold de credit dupa perioada. "
+"Astfel, daca solicitati un interval de 30 de zile, OpenERP genereaza o "
+"analiza a creditorilor pentru ultima luna, ultimele doua luni, si asa mai "
+"departe. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Document sursă"
+msgstr "Document sursa"
 
 #. module: account
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "Nu puteti sterge o inregistrare in jurnal \"%s\" afisata!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -7158,7 +7253,7 @@ msgstr "Reconciliere Extrase"
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Raport Contabil"
 
 #. module: account
 #: report:account.invoice:0
@@ -7178,23 +7273,23 @@ msgid ""
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
-"O înregistrare recurentă este o înregistrare variată care are loc pe o baza "
-"recurentă dintr-o dată specifică, adică corespunzatoare semnăturii unui "
-"contract sau a unui acord cu clientul sau furnizorul. Din Definire "
-"Înregistrări Recurente, puteți crea asemenea înregistrări pentru a "
-"automatiza înregistrarea de documente în sistem."
+"O inregistrare recurenta este o inregistrare variata care are loc pe o baza "
+"recurenta dintr-o data specifica, adica corespunzatoare semnaturii unui "
+"contract sau a unui acord cu un client sau un furnizor. Din Definiti "
+"Inregistrarile Recurente, puteti crea asemenea inregistrari pentru a "
+"automatiza afisarea de documente in sistem."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Ierarhie Rapoarte Financiare"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr "UdeM a Produsului"
+msgstr "UdeM Produs"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -7205,10 +7300,10 @@ msgid ""
 "entries when money comes in or goes out of the cash box."
 msgstr ""
 "O Casa de marcat va permite sa gestionati intrarile de numerar in jurnalele "
-"de numerar.Aceasta caracteristica ofera o modalitate usoara de a urmari "
-"platile in numerar zilnic. Puteti introduce monedele care exista in casa de "
-"bani, si apoi sa afisati inregistrarile cand banii intra sau ies din casa de "
-"bani."
+"d-voastra de numerar. Aceasta caracteristica ofera o modalitate usoara de a "
+"urmari zilnic platile in numerar. Puteti introduce monedele care exista in "
+"casa de bani, si apoi sa afisati inregistrarile atunci cand banii intra sau "
+"ies din casa de bani."
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7228,7 +7323,7 @@ msgstr "Cifra de afaceri lunara"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "Linii analitice"
+msgstr "Linii Analitice"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -7239,7 +7334,7 @@ msgstr "Linii"
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Şablon cont taxe"
+msgstr "Sablon Cont Fiscal"
 
 #. module: account
 #: view:account.journal.select:0
@@ -7249,7 +7344,7 @@ msgstr "Sunteti sigur(a) ca doriti sa deschideti Inregistrarile Jurnalului?"
 #. module: account
 #: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr "Sunteti sigur ca doriţi să deschideţi această factură ?"
+msgstr "Sunteti sigur(a) ca doriti sa deschideti aceasta factura ?"
 
 #. module: account
 #: code:addons/account/account_invoice.py:528
@@ -7259,26 +7354,28 @@ msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
+"Nu poate fi gasit niciun plan ce conturi, trebuie sa creati unul din "
+"configurarea meniului contabil."
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Inregistrari Deschise Cont de Cheltuieli"
 
 #. module: account
 #: code:addons/account/account_move_line.py:999
 #, python-format
 msgid "Accounting Entries"
-msgstr "Înregistrări contabile"
+msgstr "Inregistrari contabile"
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Şablon cont părinte"
+msgstr "Sablon Cont Principal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -7287,12 +7384,12 @@ msgstr ""
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "Situaţie"
+msgstr "Extras"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr "Actioneaza drept cont predefinit pentru suma debit"
+msgstr "Actioneaza ca un cont implicit pentru valoarea debitului"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7307,12 +7404,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Inregistrari afisate"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Pentru procent introduceti un raport intre 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7320,17 +7417,17 @@ msgstr ""
 #: field:account.invoice,date_invoice:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr "Data facturii"
+msgstr "Data Facturii"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Grupati dupa anul Datei Facturii"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Suma totală pe care acest client v-o datorează."
+msgstr "Suma totala pe care acest client v-o datoreaza."
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -7340,18 +7437,18 @@ msgstr "ir.secventa"
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr "Pictogramă"
+msgstr "Pictograma"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.use.model:0
 msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "Cod taxă rădăcină"
+msgstr "Baza Cod Fiscal"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -7360,9 +7457,9 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
-"Bifaţi aceasta casuta pentru a determina ca toate înregistrările din acest "
-"jurnal să nu creeze un corespondent nou, ci sa aibă acelaşi corespondent. "
-"Aceasta opţiune este utilizată la închiderea de an fiscal."
+"Bifati aceasta casuta pentru a va asigura ca toate inregistrarile din acest "
+"jurnal nu vor crea un corespondent nou, ci vor imparti acelasi corespondent. "
+"Aceasta optiune este utilizata la inchiderea de an fiscal."
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7372,27 +7469,27 @@ msgstr "Inchis la data de"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Linie extras bancar"
+msgstr "Linie extras de cont"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr "Data de incheiere"
+msgstr "Data de sfarsit"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Taxa Achizitii Predefinita"
+msgstr "Taxa Implicita Achizitii"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Inregistrari Deschise Cont Venituri"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirm"
-msgstr "Confirmare"
+msgstr "Confirmati"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -7401,8 +7498,8 @@ msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 msgstr ""
-"Acest câmp este utilizat numai dacă dezvoltaţi un modul propriu care permite "
-"dezvoltatorilor să creeze taxe specifice întrun domeniu particular."
+"Acest camp este utilizat numai daca dezvoltati un modul propriu care sa le "
+"permita dezvoltatorilor sa creeze taxe specifice intr-un domeniu particular."
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -7413,22 +7510,22 @@ msgstr "Ar fi trebuit sa alegeti perioade care apartin aceleiasi companii"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "Revedeti Termenii de Plata"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "Denumirea noilor intrări"
+msgstr "Numele noilor inregistrari"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr "Creează înregistrări"
+msgstr "Creati Inregistrari"
 
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Informatii despre Banca"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -7445,12 +7542,12 @@ msgstr "Raportare"
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
-msgstr "Avertizare"
+msgstr "Atentionare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Contracte/Conturi Analitice"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -7461,13 +7558,13 @@ msgstr "Inchidere Casa de bani"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Jurnal contabil"
+msgstr "Jurnal Contabil"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr "Factură plătită"
+msgstr "Factura platita"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7476,13 +7573,14 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
-"Acest camp va arata urmatorul partener care va fi ales automat de sistem in "
-"procesul de reconciliere, bazat pe ultima zi in care s-a facut reconcilierea."
+"Acest camp va arata urmatorul partener care va fi ales automat de sistem "
+"pentru procesul de reconciliere, pe baza ultimei zile in care s-a facut "
+"reconcilierea."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr "Comentariu"
+msgstr "Observatie"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -7493,13 +7591,13 @@ msgstr "Domeniu"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr "Utilizare model"
+msgstr "Utilizati modelul"
 
 #. module: account
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Soldul initial nu a putut fi adaptat (valoare negativa)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7511,43 +7609,44 @@ msgid ""
 msgstr ""
 "Aceasta fereastra este folosita de catre contabili pentru a inregistra "
 "intrarile masive in OpenERP. Daca doriti sa inregistrati o factura a "
-"furnizorului, incepeti prin a inregistra linia contului de cheltuieli, "
-"OpenERP va va propune automat Taxa asociata acestui cont si corespondentul "
-"\"Cont Plati\"."
+"furnizorului, incepeti prin a inregistra linia contului de cheltuieli, iar "
+"OpenERP va va propune automat Taxa asociata acestui cont si \"Contul de "
+"Plati\" corespondent."
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Linie factură"
+msgstr "Linie factura"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Rambursari Client si Furnizor"
 
 #. module: account
 #: field:account.financial.report,sign:0
 msgid "Sign on Reports"
-msgstr "Semn în Rapoarte"
+msgstr "Semnati in Rapoarte"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
+"Perioadele pentru generarea intregistrarilor de deschidere nu au fost gasite"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Baza/Vizualizare"
 
 #. module: account
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
@@ -7571,7 +7670,7 @@ msgstr "Normal"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Sabloane e-mail"
 
 #. module: account
 #: view:account.move.line:0
@@ -7582,7 +7681,7 @@ msgstr "Informatii optionale"
 #: code:addons/account/wizard/account_fiscalyear_close.py:84
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "Jurnalul trebuie să aibă cont implicit de debit şi de credit"
+msgstr "Jurnalul trebuie să aiba cont implicit de debit si de credit"
 
 #. module: account
 #: report:account.general.journal:0
@@ -7601,17 +7700,17 @@ msgid ""
 "the limit date for the payment of this line."
 msgstr ""
 "Acest camp este folosit pentru inregistrarile in jurnal a platilor si a "
-"incasarilor. Puteti pune data liita pentru plata acestei linii."
+"incasarilor. Puteti pune data limita pentru plata acestei linii."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Multi-monede"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Data scadenta"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -7623,13 +7722,13 @@ msgstr "Cont eronat !"
 #: code:addons/account/account.py:3108
 #, python-format
 msgid "Sales Journal"
-msgstr "Jurnal vânzări"
+msgstr "Jurnal Vanzari"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "Deschidere Elemente Jurnal !"
+msgstr "Deschideti Elementele Jurnalului !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7646,7 +7745,7 @@ msgstr "Lipsă număr bucăţi !"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Ierarhie Rapoarte Conturi"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7657,17 +7756,22 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Acest camp optional va permite sa asociati un sablon de cont unui sablon "
+"specific de grafice care poate sa difere de cel la care apartine baza "
+"principala. Aceasta va permite sa definiti sabloane de planuri care se "
+"extind si sa completati cu cateva conturi noi (Nu este nevoie sa definiti "
+"intreaga structura care este comuna amandurora de mai multe ori)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Inregistrari in Jurnal Neafisate"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr "Proprietăţi vanzări"
+msgstr "Proprietati Vanzari"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -7677,7 +7781,7 @@ msgstr "Reconciliere Manuala"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Suma totală scadentă:"
+msgstr "Suma totala scadenta:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -7690,25 +7794,27 @@ msgstr "Catre"
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Ajustare Moneda"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to close"
-msgstr "An fiscal de închis"
+msgstr "An fiscal de inchis"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr "Anuleaza Facturile Selectate"
+msgstr "Anulati Facturile Selectate"
 
 #. module: account
 #: help:account.account.type,report_type:0
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Acest camp este utilizat pentru a genera rapoarte juridice: profit si "
+"pierdere, bilant."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7718,6 +7824,11 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Termenii de plata definesc conditiile pentru plata unei facturi a clientului "
+"sau furnizorului intr-una sau in mai multe plati. Memento-urile periodice "
+"pentru clienti vor folosi termenii de plata pentru fiecare scrisoare. "
+"Fiecare client sau furnizor poate fi alocat unuia dintre aceste termene de "
+"plata."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7738,46 +7849,48 @@ msgstr "Mai"
 #: code:addons/account/report/account_partner_balance.py:299
 #, python-format
 msgid "Payable Accounts"
-msgstr "Conturi plati"
+msgstr "Conturi Plati"
 
 #. module: account
 #: code:addons/account/account_invoice.py:732
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
+"Au fosst definite taxele globale, dar ele nu se regasesc in liniile facturii "
+"!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "Şabloane pentru Planul de Conturi"
+msgstr "Sabloane pentru Planul de Conturi"
 
 #. module: account
 #: help:account.model.line,sequence:0
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "Campul secventa este utilizat pentru a ordona resursele ascendent."
 
 #. module: account
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Cod dosar"
+msgstr "Cod caz"
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Afisare Inregistrarile in Jurnal ale unui Jurnal"
+msgstr "Afisati Inregistrarile in Jurnal ale unui Jurnal"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "Taxe vânzare"
+msgstr "Taxe vanzare"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Nume raport"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7794,7 +7907,7 @@ msgstr "Numerar"
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr "Destinaţie cont"
+msgstr "Destinatie Cont"
 
 #. module: account
 #: code:addons/account/account.py:1431
@@ -7831,22 +7944,22 @@ msgstr "Plata facturilor"
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Secvenţă"
+msgstr "Secventa"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea categorii recursive."
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "Cantitatea optionala din inregistrari."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Raport Principal"
 
 #. module: account
 #: view:account.state.open:0
@@ -7856,12 +7969,12 @@ msgstr "Da"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr "Vanzari dupa tipul de Cont"
+msgstr "Vanzari dupa Tipul de cont"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "Link catre Elementele Jurnalului generate automat"
+msgstr "Link catre Elementele Jurnalului generate automat."
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7881,7 +7994,8 @@ msgstr ""
 "crea o vizualizare noua. Vizualizarile jurnalelor determina modul in care "
 "inregistrati intrarile in jurnalul dumneavoastra. Selectati campurile care "
 "doriti sa apara intr-un jurnal si determinati ordinea in care acestea vor "
-"aparea. Apoi puteti crea un jurnal nou si sa va conectati vizualizarea la el."
+"aparea. Apoi puteti crea un jurnal nou si puteti sa va conectati "
+"vizualizarea la el."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7896,7 +8010,7 @@ msgstr "    7 Zile    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Soldul calculat"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7923,7 +8037,7 @@ msgstr "Rapoarte Legale"
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr "Suma pentru perioadă"
+msgstr "Suma din Perioada"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -7932,14 +8046,14 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
-"Câmpul succesiune se foloseşte pentru ordonarea ascendentă a înregistrărilor "
-"taxelor. Ordinea este importantă dacă aveţi definite taxe cu mai multe taxe "
-"subordonate. În acest caz, ordinea evaluării este importantă."
+"Campul succesiunii se foloseste pentru ordonarea ascendenta a "
+"inregistrarilor taxelor. Ordinea este importanta daca aveti definite taxe cu "
+"mai multe taxe subordonate. In acest caz, ordinea evaluarii este importanta."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Linia Casei de bani"
+msgstr "Linie Casa de bani"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7954,7 +8068,7 @@ msgstr "Registru Partener"
 #. module: account
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Rezolvat"
+msgstr "Fix"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -7971,12 +8085,12 @@ msgstr "Rezolvat"
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "Warning !"
-msgstr "Atenţie !"
+msgstr "Avertizare !"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Stadiul Liniei Miscarii"
+msgstr "Starea Liniei Miscarii"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
@@ -7987,7 +8101,7 @@ msgstr "Reconciliere linia miscarii contului"
 #: view:account.subscription.generate:0
 #: model:ir.model,name:account.model_account_subscription_generate
 msgid "Subscription Compute"
-msgstr "Calcul abonament"
+msgstr "Calcul Abonament"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -8017,31 +8131,31 @@ msgstr "Partener"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr "Selectati o valuta pentru a o aplica facturii"
+msgstr "Selectati o valuta pentru a o aplica pe factura"
 
 #. module: account
 #: code:addons/account/account.py:3446
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "Contul bancar definit in planul de conturi selectat nu are cod."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "Imposibil de %s o factură ciornă/proformă/anulată."
+msgstr "Imposibil de %s o factura ciorna/proforma/anulata."
 
 #. module: account
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "No Invoice Lines !"
-msgstr "Nici o Linie a Facturii"
+msgstr "Nici o Linie a Facturii !"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tipul Raportului"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8062,7 +8176,7 @@ msgstr ""
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "Stadiu"
+msgstr "Stare"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8070,13 +8184,13 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
-"Selectati Anul Fiscal in care doriti sa stergeti inregistrarile pentru "
+"Selectati Anul Fiscal din care doriti sa stergeti inregistrarile pentru "
 "Sfarsitul de an"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr "Taxă utilizată în"
+msgstr "Taxa utilizata in"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:315
@@ -8085,14 +8199,14 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
-"Bilantul extrasului este incorect !\n"
-"Bilantul planificat (%.2f) este diferit de cel calculat. (%2f)"
+"Soldul extrasului este incorect !\n"
+"Soldul estimat (%.2f) este diferit de cel calculat. (%.2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr "Liniile înregistrărilor contabile nu sunt în stare validă."
+msgstr "Liniile inregistrarilor contabile nu sunt in stare valida."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -8104,6 +8218,12 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Planul de conturi obisnuit are o structura definita prin normele legale ale "
+"tarii respective. Structura planului de contuir analitic trebuie sa reflecte "
+"nevoile afacerii d-voastra in termenii raportului costuri/venituri. De "
+"obicei, sunt structurate dupa contracte, proiecte, produse sau departamente. "
+"Majoritatea operatiunilor OpenERP (facturi, fise de pontaj, cheltuieli, etc) "
+"genereaza inregistrari analitice in contul asociat."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8124,7 +8244,7 @@ msgstr "Inregistrare automata"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Eroare ! Nu puteti crea Coduri fiscale recursive."
+msgstr "Eroare ! Nu puteti crea Coduri Fiscale recursive."
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -8132,7 +8252,7 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Daca bifaţi aceasta casuta, sistemul va incerca să grupeze înregistrările "
+"Daca bifati aceasta casuta, sistemul va incerca să grupeze inregistrarile "
 "contabile atunci cand le genereaza din facturi."
 
 #. module: account
@@ -8140,6 +8260,8 @@ msgstr ""
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Bifati aceasta casuta daca acest cont permite reconcilierea elementelor "
+"jurnalului."
 
 #. module: account
 #: help:account.period,state:0
@@ -8147,13 +8269,13 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
-"Cand sunt create perioadele lunare. Stadiul este 'Ciorna'. La sfarsitul "
-"perioadei lunare este in stadiul “Efectuat“."
+"Cand sunt create perioadele lunare. Starea este 'Ciorna'. La sfarsitul "
+"perioadei lunare este in starea “Efectuat“."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "Balanţă analitică inversată -"
+msgstr "Sold Analitic Inversat -"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -8164,23 +8286,23 @@ msgstr "Deschis pentru reconciliere bancară"
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr "Înregistrări analitice"
+msgstr "Inregistrari Analitice"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "Vanzarile din luna aceasta dupa tip"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Partener Asociat"
+msgstr "Partener asociat"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1332
 #, python-format
 msgid "You must first select a partner !"
-msgstr "Trebuie mai întâi să selectaţi un partener !"
+msgstr "Mai intai trebuie sa selectati un partener !"
 
 #. module: account
 #: view:account.invoice:0
@@ -8201,18 +8323,28 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * Starea 'Ciorna' este utilizata atunci cand un utilizator inregistreaza o "
+"Factura noua si neconfirmata.             \n"
+"* 'Pro-forma' este atunci cand factura se afla in starea Pro-forma, factura "
+"neavand un numar de factura.             \n"
+"* Starea 'Deschis' este utilizata atunci cand utilizatorul creeaza factura, "
+"si este generat un numar de factura. Se afla in starea deschisa atata timp "
+"cat utilizatorul nu plateste factura.             \n"
+"* Starea 'Platit' este setata automat atunci cand factura este platita. "
+"Inregistrarile in jurnal asociate ei pot fi sau reconciliate.            \n"
+"* Starea 'Anulata' este utilizata atunci cand utilizatorul anuleaza factura."
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr "Valoare Reziduala Totala"
+msgstr "Valoarea Reziduala Totala"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr "Stadiul facturii este Deschisa"
+msgstr "Starea facturii este Deschisa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8221,9 +8353,9 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
-"Diagrama taxelor este folosita pentru a genera declaratia dumneavoastra "
-"periodic. Veti vedea taxele cu coduri asociate declaratiei dumneavoastra "
-"legale in functie de tara dumneavoastra."
+"Planul fiscal este folosit pentru a genera declaratia dumneavoastra fiscala "
+"periodica. Veti vedea taxele cu coduri asociate declaratiei dumneavoastra "
+"fiscale in functie de tara dumneavoastra."
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
@@ -8231,6 +8363,8 @@ msgstr ""
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
 msgstr ""
+"Nu se poate gasi niciun plan de conturi pentru aceasta companie, trebuie sa "
+"creati unul."
 
 #. module: account
 #: view:account.invoice:0
@@ -8240,33 +8374,33 @@ msgstr "Proforma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "J.C./Denumire miscare"
+msgstr "J.C. /Nume miscare"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
 msgid "Choose Fiscal Year"
-msgstr "Alegeţi anul fiscal"
+msgstr "Alegeti Anul Fiscal"
 
 #. module: account
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Jurnal Ramburs Cumparaturi"
+msgstr "Jurnal Rambursare Achizitii"
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "Pentru taxe de tip procent introduceti raportul % intre 0-1."
+msgstr "Pentru Taxe de tip procent introduceti raportul % intre 0-1."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Conturi Curente"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Grupati dupa Data Facturii"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8300,7 +8434,7 @@ msgstr ""
 #: field:account.treasury.report,period_id:0
 #: field:validate.account.move,period_id:0
 msgid "Period"
-msgstr "Perioadă"
+msgstr "Perioada"
 
 #. module: account
 #: help:account.account,adjusted_balance:0
@@ -8308,11 +8442,13 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Suma totala (in Moneda companiei) pentru tranzactiile efectuate in moneda "
+"secundara a acestui cont."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Net Total:"
-msgstr "Total net :"
+msgstr "Net Total:"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8330,7 +8466,7 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
-"Acest termen de plată va fi folosit în locul celui implicit pentru "
+"Acest termen de plata va fi folosit in locul celui implicit pentru "
 "partenerul curent"
 
 #. module: account
@@ -8345,37 +8481,39 @@ msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"Nu puteti anula o factura care este platita partial! Mai intai trebuie sa "
+"nereconciliati inregistrarile legate de plata!"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "Cont categorie venituri"
+msgstr "Cont Categorie Venituri"
 
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Sold Ajustat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr "Şabloane poziţii fiscale"
+msgstr "Sabloane Pozitii Fiscale"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr "Int.Tip"
+msgstr "Tip Int."
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr "Suma taxă/bază"
+msgstr "Suma Taxa/Baza"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Evaluare: Procent"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8387,8 +8525,8 @@ msgid ""
 msgstr ""
 "Cu Rambursarea Clientului puteti gestiona notele de credit pentru clientii "
 "dumneavoastra. Un ramburs este un document care crediteaza complet sau "
-"partial o factura. Puteti genera usor returnari si sa reconciliati direct "
-"din  formularul facturii."
+"partial o factura. Puteti genera cu usurinta rambursari si sa le "
+"reconciliati direct din  formularul facturii."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8400,10 +8538,10 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"Acest meniu printeaza o declaratie TVA bazata pe facturi sau plati. Puteti "
-"selecta una sau mai multe perioade ale anului fiscal. Informatiile necesare "
-"pentru o declaratie fiscala sunt generate automat de catre OpenERP din "
-"facturi (sau plati, in unele tari). Aceste date sunt actualizate in timp "
+"Acest meniu tipareste o declaratie TVA pe baza facturilor sau platilor. "
+"Puteti selecta una sau mai multe perioade ale anului fiscal. Informatiile "
+"necesare pentru o declaratie fiscala sunt generate automat de catre OpenERP "
+"din facturi (sau plati, in unele tari). Aceste date sunt actualizate in timp "
 "real. Acest lucru este foarte util deoarece va permite sa previzualizati "
 "oricand impozitul pe care il datorati la inceputul si la sfarsitul lunii sau "
 "trimestrului."
@@ -8416,7 +8554,7 @@ msgstr "Tel. :"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Moneda companiei"
+msgstr "Moneda Companiei"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8446,7 +8584,7 @@ msgstr "Plata"
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr "Sold sfârşit perioadă"
+msgstr "Sold final"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8461,23 +8599,23 @@ msgstr ""
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "Reconciliere parţială"
+msgstr "Reconciliere partiala"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr "Sold Analitic Inversat al Contului"
+msgstr "Soldul Inversat al Contului Analitic"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr "Raport Comun Cont"
+msgstr "Raport Cont Comun"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "luna curenta"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8486,11 +8624,13 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"Nicio perioada definia pentru aceasta data:%s !\n"
+"Va rugam sa creati una."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr "Import automat al extrasului bancar"
+msgstr "Import automat al extrasului de cont"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
@@ -8508,12 +8648,12 @@ msgstr "Reconciliere miscare bancara"
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr "Tipuri de conturi"
+msgstr "Tipuri de Conturi"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Cuantum suma: n.a"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8533,7 +8673,7 @@ msgstr "Reconciliere"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Cont încasări"
+msgstr "Cont Incasari"
 
 #. module: account
 #: view:account.invoice:0
@@ -8545,16 +8685,23 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Acest buton apare doar atunci cand starea facturii este 'platita' (aratandu-"
+"va ca a fost complet reconciliata), iar expresia booleeana auto-calculata "
+"'reconciliata' este Falsa (aratand faptul ca nu mai este cazul). Cu alte "
+"cuvinte, factura a fost dereconciliata si nu se mai potriveste cu starea "
+"'platita'. Trebuie sa apasati pe acest buton pentru a o redeschide si sa ii "
+"permiteti sa isi continue procesul normal dupa ce a rezolvat eventualele "
+"exceptii pe care este posibil sa le fi creat."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Stadiul de inchidere al anului fiscal"
+msgstr "Stare Inchiderea Anului fiscal"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "Jurnal restituiri"
+msgstr "Jurnal Rambursari"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8564,7 +8711,7 @@ msgstr "Jurnal restituiri"
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr "Filtrare dupa"
+msgstr "Filtrati dupa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8586,6 +8733,8 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Pentru a inchide o perioada, mai intai trebuie sa afisati inregistrarile in "
+"jurnal asociate."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8597,25 +8746,25 @@ msgstr "Analiza Companiei"
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "Contul partener folosit pentru această factură."
+msgstr "Contul partener folosit pentru aceasta factura."
 
 #. module: account
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Taxa %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacte"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: view:account.tax.code.template:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr "Cod părinte"
+msgstr "Cod principal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
@@ -8631,7 +8780,7 @@ msgstr "Jurnal Achizitii"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr "Factura ReturnataL Creeaza factura returnata, gata pentru scriere."
+msgstr "Rambursati Factura: Creeaza factura rambursata, gata pentru scriere."
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8641,12 +8790,12 @@ msgstr "Subtotal"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Printeaza Declaratia Fiscala"
+msgstr "Tipariti Declaratia Fiscala"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "Linia Inregistrarii Model in Jurnal"
+msgstr "Linie Model Inregistrare in Jurnal"
 
 #. module: account
 #: view:account.invoice:0
@@ -8655,7 +8804,7 @@ msgstr "Linia Inregistrarii Model in Jurnal"
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Data scadenţei"
+msgstr "Data scadentei"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
@@ -8666,12 +8815,12 @@ msgstr "Furnizori"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipuri de conturi permise (lăsaţi necompletat pentru toate)"
+msgstr "Tipuri de Conturi permise (lasati necompletat pentru niciun control)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Proprietăţi contabile furnizor"
+msgstr "Proprietati Contabile Furnizor"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8679,13 +8828,13 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
-"Suma reziduala de incasat sau de plata a unei inregistrari in jurnal "
+"Suma reziduala de incasat sau de plata dintr-o inregistrare in jurnal "
 "exprimata in moneda companiei."
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr "Statistici"
+msgstr "Statistica"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -8701,19 +8850,20 @@ msgstr "Inchidere An Fiscal"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "Codul sumei trebuie sa fie unic per companie !"
+msgstr "Codul contului trebuie sa fie unic per companie !"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr "Facturi Neplatite"
+msgstr "Facturi neplatite"
 
 #. module: account
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
+"Termenul de plata al furnizorului nu are nici o linie a termenului de plata!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8735,22 +8885,22 @@ msgstr "Trezorerie"
 #: view:account.analytic.journal.report:0
 #: view:account.common.report:0
 msgid "Print"
-msgstr "Tipărire"
+msgstr "Tipariti"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr "Conturi admise (lăsaţi necompletat pentru toate)"
+msgstr "Conturi admise (lasati necompletat pentru niciun control)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr "Sablon cont corespondentă fiscală"
+msgstr "Sablon Cont Reprezentare Fiscala"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft Customer Invoices"
-msgstr "Facturi clienți (ciornă)"
+msgstr "Facturi Ciorna Clienti"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -8760,7 +8910,7 @@ msgstr "Diverse"
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr "Suma totală pe care o aveti de plătit acestui furnizor."
+msgstr "Suma totala pe care o aveti de platit acestui furnizor."
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
@@ -8773,22 +8923,22 @@ msgstr "Costuri Analitice"
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "Nume jurnal"
+msgstr "Numele Jurnalului"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Urmatoarele Inregistrari Partener de reconciliat"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Cel mai mic text"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr "Facturare & plată"
+msgstr "Facturare & Plati"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8796,7 +8946,7 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
-"Număr unic al facturii, calculat automat atunci când este creată factura."
+"Numarul unic al facturii, calculat automat atunci cand este creata factura."
 
 #. module: account
 #: constraint:account.bank.statement.line:0
@@ -8804,13 +8954,13 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
-"Suma de pe voucher trebuie sa fie aceeasi ca si cea din linia extrasului"
+"Suma de pe chitanta trebuie sa fie aceeasi ca si cea din linia extrasului"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
-msgstr "Cheltuială"
+msgstr "Cheltuieli"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
@@ -8829,8 +8979,8 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Suma exprimată întro altă monedă opţională dacă este o înregistrare de tip "
-"multi-monedă."
+"Suma exprimata intr-o alta moneda optionala daca este o inregistrare de tip "
+"multi-moneda."
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -8840,6 +8990,9 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"Nu puteti valida o inregistrare neechilibrata !\n"
+"Asigurati-va ca ati configurat corect termenii de plata !\n"
+"Ultima linie a termenilor de plata trebuie sa fie de tipul \"Sold\" !"
 
 #. module: account
 #: view:account.account:0
@@ -8869,7 +9022,7 @@ msgstr ""
 #: field:report.invoice.created,currency_id:0
 #: field:res.partner.bank,currency_id:0
 msgid "Currency"
-msgstr "Monedă"
+msgstr "Moneda"
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -8882,7 +9035,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr "Contabilul valideaza intrarile contabile venite de la factura."
+msgstr "Contabilul valideaza intrarile contabile provenite de la factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8895,7 +9048,7 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
-"Defineste anul financiar al companiei dumneavoastra in functie de nevoile "
+"Definti anul financiar al companiei dumneavoastra in functie de nevoile "
 "dumneavoastra. Un an financiar este o perioada la sfarsitul careia conturile "
 "unei companii sunt compensate (de obicei 12 luni). De obicei, se face "
 "referire la anul financiar in functie de data in care se incheie. De "
@@ -8907,28 +9060,28 @@ msgstr ""
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "Înregistrări reconciliate"
+msgstr "Inregistrari reconciliate"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr "Adresa contact"
+msgstr "Adresa de contact"
 
 #. module: account
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Model gresit !"
 
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Impune perioada"
+msgstr "Impuneti perioada"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Tiparite Sold Cont Partener"
+msgstr "Tipariti Soldul Contului Partener"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8939,6 +9092,12 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Pentru conturile care sunt de obicei mai mult debitate decat creditate si pe "
+"care ati dori sa le tipariti ca sume negative in rapoartele dumneavoastra, "
+"trebuie sa inversati semnul soldului; de ex. Contul de cheltuieli. Acelasi "
+"lucru se aplica pentru conturile care sunt de obicei mai mult creditate "
+"decat debitate si pe care doriti sa le tipariti ca sume pozitive in "
+"rapoartele lor; de ex. Contul de venituri."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8951,19 +9110,19 @@ msgstr "Contracte"
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
 msgid "unknown"
-msgstr "necunoscut"
+msgstr "necunoscut(a)"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 #: code:addons/account/account.py:3113
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "Jurnal înregistrări de deschidere"
+msgstr "Jurnalul Inregistrarilor de deschidere"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "Facturile ciorna sunt verificate, validate si printate."
+msgstr "Facturile ciorna sunt verificate, validate si tiparite."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8972,7 +9131,7 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
-"Acest Cont este folosit pentru transferul Profitului?Pierderii (Daca este "
+"Acest Cont este folosit pentru transferul Profitului/Pierderii (Daca este "
 "Profit: Suma va fi adunata, Pierdere: Suma va fi scazuta.), care este "
 "calculat din Raportul Profit & Pierdere"
 
@@ -8980,7 +9139,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Va rugam sa definiti secventa din jurnalul asociat acestei facturi."
 
 #. module: account
 #: view:account.move:0
@@ -8988,12 +9147,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Nota interna"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Vanzarile din acest an dupa tip"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -9007,18 +9166,18 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
-"Setează dacă calculul taxei se face pe baza calculului taxelor subordonate "
-"si nu pe suma totală."
+"Setati dacă calculul taxei se face pe baza calculului taxelor secundare si "
+"nu pe suma totala."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr "Dat de Codul Piton"
+msgstr "Dat de Codul Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Cod jurnal"
+msgstr "Codul Jurnalului"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -9042,23 +9201,23 @@ msgstr "Suma Reziduala"
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr "Linii înregistrări"
+msgstr "Linii Inregistrari"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Verificati-va Conturile Financiare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "Deschidere jurnal"
+msgstr "Jurnal deschis"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "KI"
-msgstr "Kl"
+msgstr "KI"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -9078,7 +9237,7 @@ msgstr "Jurnal Rambursare Vanzari"
 #: view:account.move.line:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr "Informaţii"
+msgstr "Informatii"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9088,12 +9247,12 @@ msgstr "Plata inregistrata"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr "Inchiderea stadiilor Anului fiscal si a Perioadelor"
+msgstr "Inchideti starile Anului fiscal si ale perioadelor"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr "Informatii Produse"
+msgstr "Informatii Produs"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9107,7 +9266,7 @@ msgstr "Analitic"
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr "Creare factură"
+msgstr "Creati Factura"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9123,12 +9282,12 @@ msgstr "Va rugam sa creati niste linii ale facturii."
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr "Stimate domn/doamnă,"
+msgstr "Stimate Domn/Doamna,"
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Afisati Detaliile"
 
 #. module: account
 #: code:addons/account/account.py:3118
@@ -9142,7 +9301,7 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
-"Costurile analitice (foi de pontaj, unele produse achizitionate, ...) "
+"Costurile analitice (fise de pontaj, unele produse achizitionate, ...) "
 "rezulta din conturile analitice. Acestea genereaza facturi ciorna."
 
 #. module: account
@@ -9156,13 +9315,14 @@ msgstr ""
 "Va da vizualizarea folosita atunci cand scrieti sau rasfoiti inregistrari in "
 "acest jurnal. Vizualizarea ii spune lui OpenERP ce campuri ar trebui sa fie "
 "vizibile, necesare sau care pot fi doar citite si in ce ordine. Puteti sa va "
-"creati propria vizualizare pentru o codare mai rapida in fiecare jurnal."
+"creati propria vizualizare pentru o inregistrare mai rapida in fiecare "
+"jurnal."
 
 #. module: account
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr "Sfârşitul perioadei"
+msgstr "Sfarsitul Perioadei"
 
 #. module: account
 #: field:account.account,financial_report_ids:0
@@ -9173,7 +9333,7 @@ msgstr "Sfârşitul perioadei"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Rapoarte Financiare"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9201,17 +9361,17 @@ msgstr ""
 #: field:accounting.report,period_from:0
 #: field:accounting.report,period_from_cmp:0
 msgid "Start Period"
-msgstr "Inceput Perioada"
+msgstr "Inceputul Perioadei"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
-msgstr "Direcţia analizei"
+msgstr "Directia Analizei"
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "Companii care se raportează la partener"
+msgstr "Companii care se raporteaza la partener"
 
 #. module: account
 #: view:account.journal:0
@@ -9220,39 +9380,40 @@ msgstr "Companii care se raportează la partener"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Mod afişare jurnal"
+msgstr "Vizualizare Jurnal"
 
 #. module: account
 #: view:account.move.line:0
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "Total credit"
-msgstr "Credit total"
+msgstr "Total credit"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr "Contabilul valideaza intrarile contabile venite de la factura. "
+msgstr ""
+"Contabilul valideaza inregistrarile contabile provenite de la factura. "
 
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Cu stimă."
+msgstr "Cu stima."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr "Neplatit"
+msgstr "Neplatit(a)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Şablon cod taxă"
+msgstr "Sablon Cod Fiscal"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Document: Situație cont client"
+msgstr "Document: Extras cont client"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -9282,7 +9443,7 @@ msgstr "Conturi Incasari"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr "Extrase bancare"
+msgstr "Extrase de cont"
 
 #. module: account
 #: field:account.account,balance:0
@@ -9319,7 +9480,7 @@ msgstr "Introduse manual sau automat in sistem"
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
 msgid "Display Account"
-msgstr "Afisare Cont"
+msgstr "Afisati Contul"
 
 #. module: account
 #: view:account.account.type:0
@@ -9339,7 +9500,7 @@ msgstr "Plati"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr "Anul Acesta"
+msgstr "Anul acesta"
 
 #. module: account
 #: view:board.board:0
@@ -9350,12 +9511,12 @@ msgstr "Panou cont"
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "Legendă"
+msgstr "Legenda"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Date Contract"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9368,15 +9529,16 @@ msgid ""
 msgstr ""
 "Aceasta vizualizare este folosita de catre contabili pentru a inregistra "
 "intrarile masiv in OpenERP. Daca doriti sa inregistrati o factura a unui "
-"client, selectati perioada in bara de instrumente cautare. Apoi, incepeti "
-"prin a inregistra linia intrarii contului de venituri. OpenERP va va propune "
-"automat  Impozitul asociat acestui cont si corespondentul \"Cont incasari\"."
+"client, selectati jurnalul si perioada in bara de instrumente cautare. Apoi, "
+"incepeti prin a inregistra linia intrarii contului de venituri. OpenERP va "
+"va propune automat Impozitul asociat acestui cont si \"Contul de incasari\" "
+"corespondent."
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "Trebuie selectate conturile de reconciliat"
+msgstr "Trebuie sa selectati conturile care vor fi reconciliate"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -9396,8 +9558,8 @@ msgstr ""
 "Aici puteti defini o perioada financiara, un interval de timp in anul "
 "financiar al companiei dumneavoastra. In mod tipic, o perioada contabila "
 "este o luna sau un trimestru. Ea corespunde de obicei perioadelor "
-"declaratiei fiscale.Creati si gestionati perioade de aici si decideti daca o "
-"perioada ar trebui inchisa sau lasata deschisa, in functie de activitatile "
+"declaratiei fiscale. De aici creati si gestionati perioade si decideti daca "
+"o perioada ar trebui inchisa sau lasata deschisa, in functie de activitatile "
 "companiei dumneavoastra de-a lungul unei perioade specifice."
 
 #. module: account
@@ -9420,29 +9582,29 @@ msgstr "Inregistrare manuala"
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Mişcare"
+msgstr "Miscare"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
-"Nu puteţi modifica taxa; trebuie să ştergeţi şi să recreaţi înregistrările !"
+"Nu puteţti modifica taxa; trebuie sa stergeti si sa recreati inregistrari !"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Inregistrarile Analitice din ultimele 365 de zile"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr "A/C Numar"
+msgstr "Numar A/C"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Extrase de cont bancar"
+msgstr "Extrase de cont"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -9463,8 +9625,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"Trebuie să definiţi contul bancar\n"
-"în definirea jurnalului pentru reconciliere."
+"Trebuie sa definiti contul bancar\n"
+"in definirea jurnalului pentru reconciliere."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9480,7 +9642,7 @@ msgstr "Raport Obisnuit"
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "Subordonaţi reuniţi"
+msgstr "Subordonati reuniti"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:87
@@ -9495,7 +9657,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Facturi Client si Furnizor"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9526,7 +9688,7 @@ msgstr "Abonament"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr "Cont Sold Analitic"
+msgstr "Sold Cont Analitic"
 
 #. module: account
 #: code:addons/account/account.py:412
@@ -9535,6 +9697,8 @@ msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
 msgstr ""
+"Nu exista nicio perioada deschisa/inchisa definita, va rugam sa creati una "
+"pentru a configura soldul initial!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9562,7 +9726,7 @@ msgstr ""
 #: field:accounting.report,period_to:0
 #: field:accounting.report,period_to_cmp:0
 msgid "End Period"
-msgstr "Sfarsitul Perioadei"
+msgstr "Sfarsitul perioadei"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -9583,21 +9747,27 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Selectati 'Vanzare' pentru jurnalele facturilor clientilor. Selectati "
+"'Achizitie' pentru jurnalele facturilor furnizorilor. Selectati 'Numerar' "
+"sau 'Banca' pentru jurnalele care sunt folosite la platile clientilor sau "
+"furnizorilor. Selectati 'General' pentru jurnalele operatiunilor diverse. "
+"Selectati 'Situatie Deschidere/Inchidere' pentru inregistrarile generate "
+"pentru anii fiscali noi."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "Abonament cont"
+msgstr "Cont Abonament"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Data scadenţei"
+msgstr "Data scadentei"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "Înregistrare abonament"
+msgstr "Inregistrare Abonament"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9627,7 +9797,7 @@ msgstr "Înregistrare abonament"
 #: field:accounting.report,date_from:0
 #: field:accounting.report,date_from_cmp:0
 msgid "Start Date"
-msgstr "Dată de început"
+msgstr "Data de inceput"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -9635,13 +9805,16 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Indica faptul ca factura a fost platita, iar inregistrarea in jurnal a "
+"facturii a fost reconciliata cu una sau mai multe inregistrari in jurnal a "
+"platii."
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr "Facturi ciornă"
+msgstr "Facturi ciorna"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -9654,12 +9827,12 @@ msgstr "Nereconciliat"
 #: code:addons/account/account_invoice.py:828
 #, python-format
 msgid "Bad total !"
-msgstr "Total eronat !"
+msgstr "Total gresit !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Secvenţa înregistrării"
+msgstr "Secventa Inregistrarii"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9672,12 +9845,12 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
-"O perioada este o perioada de timp fiscala in timpul careia intrarile "
-"fiscale ar trebui inregistrate pentru activitatile contabile asocaite. "
-"Perioada lunara este media dar, in functie de tara dumneavoastra sau de "
-"nevoile companiei dumneavoastra, puteti avea, de asemenea, perioade "
+"O perioada este o perioada de timp fiscala in timpul careia inregistrarile "
+"contabile trebuie sa fie inregistrate pentru activitatile contabile "
+"asociate. Perioada lunara este norma dar, in functie de tara dumneavoastra "
+"sau de nevoile companiei dumneavoastra, puteti avea, de asemenea, perioade "
 "trimestriale. Inchiderea unei perioade va face imposibila inregistrarea unor "
-"intrari contabile noi, de aceea toate intrarile noi trebuie facute in "
+"intrari contabile noi, de aceea toate inregistrarile noi trebuie facute in "
 "urmatoarea perioada deschisa. Inchideti o perioada atunci cand nu doriti sa "
 "inregistrati intrari noi si doriti sa inchideti perioada pentru calculul "
 "impozitului aferent."
@@ -9685,18 +9858,18 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "În asteptare"
+msgstr "In asteptare"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "Din conturi analitice"
+msgstr "Din conturile analitice"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr "Nume perioadă"
+msgstr "Numele perioadei"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9711,18 +9884,18 @@ msgstr "Cod/Data"
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Comparatie"
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
 #, python-format
 msgid "Unknown Error"
-msgstr "Eroare Necunoscuta"
+msgstr "Eroare necunoscuta"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9730,20 +9903,20 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
-"Acest cont va fi folosit in locul celui predefinit drept cont plati pentur "
-"partenerul actual"
+"Acest cont va fi folosit in locul celui predefinit drept cont de plati "
+"pentru partenerul actual"
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Perioadă deschidere/închidere"
+msgstr "Deschidere/Inchidere Perioada"
 
 #. module: account
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr "Monedă secundară"
+msgstr "Moneda secundara"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
@@ -9782,7 +9955,7 @@ msgid ""
 "current invoice."
 msgstr ""
 "Puteti selecta aici jurnalul pe care sa il folositi pentru factura ramburs "
-"care va fi creata. Daca lasati acel camp necompletat, va folosi acelasi "
+"care va fi creata. Daca lasati acest camp necompletat, va folosi acelasi "
 "jurnal ca si in cazul facturii actuale."
 
 #. module: account
@@ -9790,7 +9963,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Profit & Pierdere (Contul de venituri)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9799,11 +9972,14 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Eroare de configurare! \n"
+"Nu puteti selecta un tip de cont cu o metoda de amanare diferita de "
+"\"Nereconciliat\" pentru conturile cu tipul intern \"Plati/Incasari\"! "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "Model de Inregistrare in Jurnal"
+msgstr "Model Inregistrare in Jurnal"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9813,8 +9989,8 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"Data scadenta a liniei intrarii generata de linia model '%s' este bazata pe "
-"termenul de plata al partenerului!\n"
+"Data scadenta a liniei inregistrarii generata de linia model '%s' este "
+"bazata pe termenul de plata al partenerului!\n"
 "Va rugam sa-i definiti partenerul!"
 
 #. module: account
@@ -9822,7 +9998,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr "Număr"
+msgstr "Numar"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9835,7 +10011,7 @@ msgstr "General"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Inregistrari Analitice in ultimele 30 de zile"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9871,7 +10047,7 @@ msgstr "Perioade"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr "Curs Valutar"
+msgstr "Cursul Valutar"
 
 #. module: account
 #: view:account.account:0
@@ -9892,7 +10068,7 @@ msgstr "Aprilie"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Profit (Pierdere) de raportat"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9902,7 +10078,7 @@ msgstr "Deschis pentru Reconciliere"
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "Părinte stâng"
+msgstr "Parinte stang"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
@@ -9916,13 +10092,13 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Titlu 2 (ingrosat)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr "Facturi furnizori"
+msgstr "Facturi Furnizori"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9957,16 +10133,18 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"Atunci cand este creat un extras nou, stare lui va fi 'Ciorna'.\n"
+"Iar dupa obtinerea informatiilor de la banca va fi in starea 'Confirmat'."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr "Perioadă cont"
+msgstr "Perioada cont"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Ştergere linii"
+msgstr "Stergeti Liniile"
 
 #. module: account
 #: view:account.report.general.ledger:0
@@ -9974,9 +10152,9 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
-"Acest raport va permite sa imprimati sa sa generati un pdf al registului "
-"dumneavoastra general cu detalii referitoare la toate jurnalele d-voastra "
-"contabile"
+"Acest raport va permite sa imprimati sau sa generati un pdf al registului "
+"dumneavoastra general cu detalii referitoare la toate jurnalele "
+"dumneavoastra contabile"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9997,14 +10175,14 @@ msgstr "Tip intern"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "Abonament în derulare"
+msgstr "Abonamente in derulare"
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Month"
-msgstr "Luna curentă"
+msgstr "Luna aceasta"
 
 #. module: account
 #: view:account.analytic.balance:0
@@ -10013,7 +10191,7 @@ msgstr "Luna curentă"
 #: view:account.analytic.journal.report:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr "Selectare perioadă"
+msgstr "Selectati perioada"
 
 #. module: account
 #: view:account.entries.report:0
@@ -10051,34 +10229,34 @@ msgstr "Afisat"
 #: field:accounting.report,date_to:0
 #: field:accounting.report,date_to_cmp:0
 msgid "End Date"
-msgstr "Dată de sfârsit"
+msgstr "Data de sfarsit"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Anulare înregistrări de deschidere"
+msgstr "Anulati Inregistrarile de deschidere"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr "Ziua din lună"
+msgstr "Ziua din luna"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Sursa taxă"
+msgstr "Sursa taxa"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr "Secvenţe an fiscal"
+msgstr "Secvente An fiscal"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Niciun detaliu"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
@@ -10091,14 +10269,14 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Nu puteti crea elemente ale jurnalului intr-un cont inchis."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Castig sau Pierdere nerealizat/a"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10106,17 +10284,17 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.period:0
 msgid "States"
-msgstr "Stadii"
+msgstr "Stari"
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Auto-email facturi confirmate"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Verificare Total"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10180,12 +10358,12 @@ msgstr "Jurnal: Toate"
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr "Definire Inregistrari Recurente"
+msgstr "Definiti Inregistrarile Recurente"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
@@ -10195,7 +10373,7 @@ msgstr "Data Scadentei"
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr "Totalul tranzactiilor cu numerar"
+msgstr "Total tranzactii cu numerar"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10204,14 +10382,14 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
-"Aceasta cifra reprezinta numarul total de parteneri care au trecut astazi "
-"prin procesul reconcilierii. Partenerul actual este considerat ca fiind deja "
+"Aceasta cifra prezinta numarul total de parteneri care au trecut astazi prin "
+"procesul reconcilierii. Partenerul actual este considerat ca fiind deja "
 "procesat."
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr "Creare Perioade Lunare"
+msgstr "Creati Perioade Lunare"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
@@ -10221,12 +10399,12 @@ msgstr "Semn pentru Parinte"
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Raport Sold de Incercare"
+msgstr "Raport Balanta de Verificare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Situaţii ciornă"
+msgstr "Extrase ciorna"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -10238,17 +10416,17 @@ msgstr ""
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr "Golire Conturi ? "
+msgstr "Goliti Conturile ? "
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Jurnalul si perioada aleasa trebuie sa apartina aceleiasi companii."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "Poziţii factură"
+msgstr "Linii factura"
 
 #. module: account
 #: field:account.chart,period_to:0
@@ -10258,7 +10436,7 @@ msgstr "Sfarsitul perioadei"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Codul jurnalului trebuie sa fie unic per companie !"
+msgstr "Codul jurnalului trebuie sa fie unic pe companie !"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -10267,13 +10445,13 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
-"Acest cont va fi folosit pentru a evalua stocul care iese pentru categoria "
+"Acest cont va fi folosit pentru a evalua stocul iesit pentru categoria "
 "produsului actual folosind pretul de cost"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Creati-va propriul Plan de Conturi dintr-un Sablon de planuri"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10282,27 +10460,27 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
-"Din acest raport, puteți avea o imagine de ansamblu asupra sumei facturate "
-"clientului dumneavoastră, ca ai asupra întârzierilor de plată. Unealta "
-"căutare poate fi, de asemenea, folosită pentru a personaliza rapoartele "
-"facturilor dumneavoastră și astfel să  potrivească această analiză nevoilor "
-"dumneavoastră."
+"Din acest raport, puteti avea o imagine de ansamblu asupra sumei facturate "
+"clientului dumneavoastra, ca si asupra intarzierilor de plata. Unealta "
+"cautare poate fi, de asemenea, folosita pentru a personaliza Rapoartele "
+"facturilor dumneavoastra si astfel sa  potriveasca aceasta analiza nevoilor "
+"dumneavoastra."
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Mişcare pierdere"
+msgstr "Miscare Pierdere"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr "Stadiul facturii este Efectuata"
+msgstr "Starea facturii este Efectuata"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr "Raport al Vanzarilor dupa Cont"
+msgstr "Raport Vanzari dupa Cont"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -10317,7 +10495,7 @@ msgstr "Pozitie Fiscala Conturi"
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr "Factură furnizor"
+msgstr "Factura furnizor"
 
 #. module: account
 #: field:account.account,debit:0
@@ -10346,12 +10524,12 @@ msgstr "Debit"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Titlul 3 (ingrosat, mai mic)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "Poziţii factură"
+msgstr "Linii factura"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -10361,7 +10539,7 @@ msgstr "Eroare! Nu puteti crea sabloane de cont recurente."
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Numarul Inregistrarii in Jurnal"
 
 #. module: account
 #: view:account.subscription:0
@@ -10375,32 +10553,34 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"Nu puteti schimba tipul de cont din 'Inchis' in orice alt tip care contine "
+"elemente ale jurnalului!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "Înregistrarea este deja reconciliata"
+msgstr "Inregistrarea este deja reconciliata"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "Conturi de incasari"
+msgstr "Conturi de Incasari"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Termen de Plată Partener"
+msgstr "Termen de Plata Partener"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr "Acoperire"
+msgstr "Limita"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Elementele Jurnalului Analitic asociate unui jurnal de achizitii."
 
 #. module: account
 #: help:account.account,type:0
@@ -10411,23 +10591,29 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"'Tipul Intern' este utilizat pentru caracteristici disponibile in tipuri "
+"diferite de conturi: vizualizarea nu poate sa aiba elemente ale jurnalului, "
+"consolidarea sunt conturi care pot sa aiba conturi secundare pentru "
+"consolidari multi-companii, conturile de plati si de incasari sunt pentru "
+"conturile partenere (pentru calcularea debitului/creditului), inchis pentru "
+"conturi devalorizate."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "Cu mişcări"
+msgstr "Cu miscari"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "Date cont"
+msgstr "Date Cont"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Şablon cod cont taxe"
+msgstr "Sablon Cont Cod Fiscal"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10447,17 +10633,17 @@ msgstr "Decembrie"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr "Tipărire Jurnale Analitice"
+msgstr "Tipaiti Jurnalele Analitice"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Grupati dupa luna Datei facturii"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr "Fin.Account"
+msgstr "Cont Fin."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10474,12 +10660,12 @@ msgstr "Aplicabilitate"
 #: code:addons/account/wizard/account_move_journal.py:165
 #, python-format
 msgid "This period is already closed !"
-msgstr "Aceasta perioadă este deja închisă !"
+msgstr "Aceasta perioada este deja inchisa !"
 
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Moneda opţională daca este o inregistrare multi-monedă."
+msgstr "Cealalta moneda optionala daca este o inregistrare multi-moneda."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
@@ -10530,7 +10716,7 @@ msgstr "Plan Analitic de Conturi"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "Rest sumă datorata"
+msgstr "Rest suma datorata"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -10542,12 +10728,12 @@ msgstr "Rapoarte Statistice"
 #: code:addons/account/account_move_line.py:1238
 #, python-format
 msgid "Bad account!"
-msgstr "Cont eronat !"
+msgstr "Cont gresit !"
 
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Inregistrari Clasificate dupa"
 
 #. module: account
 #: help:account.move,state:0
@@ -10558,11 +10744,16 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"Toate inregistrarile noi in jurnal create manual sunt de obicei in starea "
+"'Neafisat', dar puteti seta optiunea pentru a omite acea stare in jurnalul "
+"asociat. In acest caz, ele se vor comporta ca inregistrari in jurnal create "
+"automat de sistem la validarea documentelor (facturi, extrase de cont...) si "
+"vor fi create in starea 'Afisat'."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr "Corespondenţă conturi"
+msgstr "Reprezentare Conturi"
 
 #. module: account
 #: code:addons/account/account_invoice.py:364
@@ -10583,27 +10774,29 @@ msgstr "Noiembrie"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
 msgstr ""
+"Modificati: rambursarea facturii, reconciliati si creati o factura ciorna "
+"noua"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "Contul de venituri sau cheltuieli asociat produsului selectat."
+msgstr "Contul de venituri sau de cheltuieli asociat produsului selectat."
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "Număr de perioade"
+msgstr "Numarul de Perioade"
 
 #. module: account
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "Jurnal general"
+msgstr "Jurnal General"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr "Cautare Factura"
+msgstr "Cautati Factura"
 
 #. module: account
 #: report:account.invoice:0
@@ -10612,7 +10805,7 @@ msgstr "Cautare Factura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Restituire"
+msgstr "Rambursare"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10687,11 +10880,81 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Buna ziua${obiect.adresa_factura_id.nume si ' ' sau "
+"''}${obiect.adresa_factura_id.nume sau ''},\n"
+" \n"
+"O factura noua este disponibila pentru ${obiect.partener_id.nume}:\n"
+"        | Numar factura: *${obiect.numar}*\n"
+"        | Total factura: *${obiect.suma_total} ${obiect.moneda_id.nume}*\n"
+"        | Data facturii: ${obiect.data_facturii}\n"
+"        % daca obiect.origine:\n"
+"        | Referinta comenzii: ${obiect.origine}\n"
+"        % endif\n"
+"        | Contactul dumneavoastra: ${obiect.utilizator_id.nume} "
+"${obiect.utilizator_id.utilizator_e-mail si "
+"'<%s>'%(obiect.utilizator_id.utilizator_e-mail) sau ''}\n"
+" \n"
+"Puteti vizualiza documentul facturii, sa il descarcati si sa o platiti "
+"online folosind link-ul urmator:\n"
+"     ${ctx.get('edi_web_url_vizualizare') sau 'n/a'}\n"
+" \n"
+"% daca obiect.companie_id.cont_paypal si obiect.tip in ('iesire_factura', "
+"'intrare_rambursare'):\n"
+" <% \n"
+" nume_companie = cotare(obiect.companie_id.nume)\n"
+" inv_numar = cotare(obiect.numar)\n"
+" cont_paypal = cotare(obiect.companie_id.cont_paypal)\n"
+" inv_suma = cotare(str(obiect.suma_total))\n"
+" moneda_nume = cotare (obiect.moneda_id.nume)\n"
+" url_paypal = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"              "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"              "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+" De asemenea, este posibil sa platiti direct cu :\n"
+"     ${paypal_url}\n"
+" % endif\n"
+" \n"
+"Daca aveti intrebari, nu ezitati sa ne contactati.\n"
+" \n"
+"\n"
+"Va multumim ca ati ales ${obiect.companie_id.nume}!\n"
+" \n"
+"\n"
+"--\n"
+" ${obiect.utilizator_id.nume} ${obiect.utilizator_id.utilizator_e-mail "
+"si'<%s>'%(obiect.utilizator_id.utilizator_e-mail) sau ''}\n"
+" ${obiect.companie_id.nume}\n"
+" % daca obiect.companie_id.strada:\n"
+" ${obiect.companie_id.strada sau ''}\n"
+" % endif\n"
+" % daca obiect.companie_id.strada2:\n"
+" ${obiect.companie_id.strada2}\n"
+" % endif\n"
+" % daca obiect.companie_id.oras sau obiect.companie_id.cod postal:\n"
+" ${obiect.companie_id.cod postal sau ''} ${obiect.companie_id.oras sau ''}\n"
+" % endif\n"
+" % daca obiect.companie_id.tara_id:\n"
+" ${obiect.companie_id.stat_id si ('%s, ' % obiect.companie_id.stat_id.nume) "
+"sau ''} ${obiect.companie_id.tara_id.nume sau ''}\n"
+" % endif\n"
+" % daca obiect.companie_id.telefon:\n"
+" Telefon: ${obiect.companie_id.telefon}\n"
+" % endif\n"
+" % daca obiect.companie_id.pagina_de_internet:\n"
+" ${obiect.companie_id.pagina_de_internet sau ''}\n"
+" % endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Conturi bancare"
+msgstr "Conturi Bancare"
 
 #. module: account
 #: field:res.partner,credit:0
@@ -10704,7 +10967,7 @@ msgstr "Total de Incasat"
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr "Informatii generale"
+msgstr "Informatii Generale"
 
 #. module: account
 #: view:account.move:0
@@ -10715,13 +10978,13 @@ msgstr "Documente Contabile"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Validare Liniile Miscarii Contului"
+msgstr "Validati Liniile Miscarii Contului"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr "Registru Costuri (numai cantităţi)"
+msgstr "Registru Costuri (numai cantitati)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10736,22 +10999,22 @@ msgstr "De indata ce reconcilierea este efectuata, factura poate fi platita."
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr "Cautare Sabloane de Conturi"
+msgstr "Cautati Sabloane de Conturi"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "Taxe factură introduse manual"
+msgstr "Taxe factura manuala"
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr "Părinte Drept"
+msgstr "Parinte Drept"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr "account.addtmpl.wizard"
+msgstr "wizard.cont.addtmpl"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -10762,14 +11025,14 @@ msgstr "account.addtmpl.wizard"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr "Al partenerului"
+msgstr "A(l) partenerului"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr "Ani fiscali"
+msgstr "Ani Fiscali"
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -10789,7 +11052,7 @@ msgstr "Ref."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Model cont"
+msgstr "Model Cont"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10824,7 +11087,7 @@ msgstr "Cont bancar"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "Cont Jurnal Central"
+msgstr "Jurnal Central Cont"
 
 #. module: account
 #: report:account.overdue:0
@@ -10834,12 +11097,12 @@ msgstr "Termen"
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr "Viitor"
+msgstr "La  termen"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Caută pozitii jurnal"
+msgstr "Cautati Elementele Jurnalului"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10863,7 +11126,7 @@ msgstr "Plan de Conturi Analitice"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "Cont de cheltuieli definit în şablonul de produs"
+msgstr "Cont de cheltuieli definit in Sablonul Produsului"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -10871,12 +11134,15 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"Aceasta eticheta va fi afisata in raport pentru a arata soldul calculat "
+"pentru filtrul de comparatie dat."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr "Trebuie să introduceţi o durată a perioadei mai mare decât 0 !"
+msgstr ""
+"Trebuie sa introduceti o durată a perioadei care nu poate fi 0 sau mai mica!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -10889,7 +11155,7 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
-"Creeaza si gestioneaza conturile de care aveti nevoie pentru a inregistra "
+"Creati si gestionati conturile de care aveti nevoie pentru a inregistra "
 "intrarile in jurnal. Un cont este parte a unui registru, ceea ce ii permite "
 "companiei dumneavoastra sa inregistreze tot felul de tranzactii de debit si "
 "credit. Companiile isi prezinta conturile anuale in doua parti principale: "
@@ -10904,8 +11170,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-"Suma reziduala dintr-o inregistrare de plata (incasari sau plati) intr-un "
-"jurnal exprimata in valuta ei (poate e diferita de valuta companiei)."
+"Suma reziduala dintr-un cont de incasari sau plati ale unei inregistrari in "
+"jurnal exprimata in moneda ei (poate fi diferita de moneda companiei)."
 
 #~ msgid "OK"
 #~ msgstr "OK"
@@ -10962,9 +11228,6 @@ msgstr ""
 #~ msgid "Grand total"
 #~ msgstr "Total general"
 
-#~ msgid "Tax codes"
-#~ msgstr "Coduri taxe"
-
 #~ msgid "Tax Report"
 #~ msgstr "Raport taxe"
 
@@ -11058,6 +11321,9 @@ msgstr ""
 #~ msgid "Journal code"
 #~ msgstr "Cod jurnal"
 
+#~ msgid "Standard entries"
+#~ msgstr "Inregistrari standard"
+
 #~ msgid "3 Months"
 #~ msgstr "3 luni"
 
@@ -11106,9 +11372,6 @@ msgstr ""
 #~ msgid "Tax Group"
 #~ msgstr "Grup taxe"
 
-#~ msgid "Are you sure ?"
-#~ msgstr "Sunteti sigur ?"
-
 #~ msgid "Analytic Journal Definition"
 #~ msgstr "Definire jurnal analitic"
 
@@ -11286,9 +11549,6 @@ msgstr ""
 #~ msgid "New Analytic Account"
 #~ msgstr "Cont analitic nou"
 
-#~ msgid "Compute Code for Taxes included prices"
-#~ msgstr "Cod pentru calculul preţurilor cu taxe incluse"
-
 #~ msgid "Journal de vente"
 #~ msgstr "Jurnal de vânzări"
 
@@ -11542,9 +11802,6 @@ msgstr ""
 #~ msgid "Entry Name"
 #~ msgstr "Denumire înregistrare"
 
-#~ msgid "Standard entries"
-#~ msgstr "Înregistrări standard"
-
 #~ msgid "Define Fiscal Years and Select Charts of Account"
 #~ msgstr "Definiţi anii fiscali şi selectaţi planul de conturi"
 
@@ -12009,14 +12266,17 @@ msgstr ""
 #~ msgid "JNRL"
 #~ msgstr "JRNL"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Conturi de venituri"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
 #~ msgid "Year :"
 #~ msgstr "An :"
 
-#~ msgid "Accounts by type"
-#~ msgstr "Conturi, după tip"
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturi create in ultimele 15 zile"
 
 #~ msgid "Display accounts"
 #~ msgstr "Afişează conturile"
@@ -12100,9 +12360,6 @@ msgstr ""
 #~ msgid "Profit & Loss (Expense Accounts)"
 #~ msgstr "Profit si Pierderi (Conturi de cheltuieli)"
 
-#~ msgid "Unreconciliation transactions"
-#~ msgstr "Nereconciliere tranzacţii"
-
 #, python-format
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr "Nu puteti folosi acest cont general în acest jurnal !"
@@ -12123,9 +12380,6 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Testul Codului de taxe"
 
-#~ msgid "Go to next partner"
-#~ msgstr "Mergeti la partenerul următor"
-
 #~ msgid ""
 #~ "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 #~ msgstr ""
@@ -12168,6 +12422,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss"
 #~ msgstr "Contul de profit si pierdere"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vanzari dupa Cont"
+
 #~ msgid "Reference Number"
 #~ msgstr "Număr de referinţă"
 
@@ -12317,9 +12574,6 @@ msgstr ""
 #~ "Codul va fi folosit pentru a genera numerele inregistrarilor in jurnal ale "
 #~ "acestui jurnal."
 
-#~ msgid "Create an Account based on this template"
-#~ msgstr "Creare Cont bazat pe acest sablon"
-
 #~ msgid "Company must be same for its related account and period."
 #~ msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociate."
 
@@ -12349,6 +12603,9 @@ msgstr ""
 #~ "Nu poate fi gasit planul de conturi pentru aceasta companie, va rugam sa "
 #~ "creati unul."
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablou de bord"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Generare Plan contabil dintr-un Sablon de planuri"
 
@@ -12493,9 +12750,6 @@ msgstr ""
 #~ msgid "Multiple Analytic Plans"
 #~ msgstr "Planuri Analitice Multiple"
 
-#~ msgid "Open for bank reconciliation"
-#~ msgstr "Deschis pentru reconciliere bancară"
-
 #~ msgid "Bank and Cash Accounts"
 #~ msgstr "Conturi bancare si de Numerar"
 
@@ -12593,9 +12847,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Nu se pot sterge extrasul (extrasele) bancar(e) care sunt deja confirmate !"
 
-#~ msgid "Reconciliation transactions"
-#~ msgstr "Reconciliere tranzacţii"
-
 #, python-format
 #~ msgid ""
 #~ "Tax base different !\n"
@@ -12969,6 +13220,9 @@ msgstr ""
 #~ "Exemplu: la 14 zile nete 2 procente, suma ramasa la 30 de zile sfarsit de "
 #~ "luna."
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vanzari dupa Tipul de cont"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Cont de Rezerva si Profit/Pierderi"
 
@@ -13058,3 +13312,43 @@ msgstr ""
 #~ msgstr ""
 #~ "Nu puteti valida o Inregistrare in Jurnal decat daca toate elementele "
 #~ "jurnalului se afla in acelasi plan de conturi !"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Conturi Incasari"
+
+#~ msgid "Tax codes"
+#~ msgstr "Coduri fiscale"
+
+#~ msgid "Go to next partner"
+#~ msgstr "Mergeti la partenerul urmator"
+
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generati Planul de Conturi dintr-un Sablon de Planuri"
+
+#~ msgid "Accounts by type"
+#~ msgstr "Conturi dupa tip"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "Nereconciliere tranzactii"
+
+#~ msgid "Are you sure ?"
+#~ msgstr "Sunteti sigur(a) ?"
+
+#~ msgid "Create an Account based on this template"
+#~ msgstr "Creati un Cont pe baza acestui sablon"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Instalati-va Planul de Conturi"
+
+#~ msgid "Open for bank reconciliation"
+#~ msgstr "Deschis pentru reconcilierae bancara"
+
+#~ msgid "Compute Code for Taxes included prices"
+#~ msgstr "Calculati Codul pentru Preturi cu taxele incluse"
+
+#~ msgid "Reconciliation transactions"
+#~ msgstr "Reconciliere tranzactii"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "Descrierea in Facturi"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 237be7af3d5..daf20290592 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgstr "Счет источник"
 msgid "All Analytic Entries"
 msgstr "Все проводки аналитического учета"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Счета созданные за прошедшие 15 дней"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -693,18 +688,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 "Для проведения сверки, организация в проводках не должна различаться."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Счета к получению"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1687,11 +1670,6 @@ msgstr "Раздельные нумерации журнала"
 msgid "Responsible"
 msgstr "Ответственный"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Продажи по типу счета"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2788,13 +2766,6 @@ msgstr "Финансовые настройки новой организаци
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Продажи по бух. счетам"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3192,8 +3163,8 @@ msgstr "Шаблоны планов счетов"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Основной план счетов на основе шаблона"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6386,11 +6357,6 @@ msgstr "Введите дату начала !"
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Инфо-панель"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6961,11 +6927,6 @@ msgstr ""
 "\n"
 "пример: Моя модель на %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Счета доходов"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7184,7 +7145,7 @@ msgstr "Шаблон основного счета"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11222,6 +11183,9 @@ msgstr ""
 #~ msgid "Display accounts "
 #~ msgstr "Показать счета "
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Основной план счетов на основе шаблона"
+
 #~ msgid "Journal d'ouverture"
 #~ msgstr "Открытие журнала"
 
@@ -11498,6 +11462,10 @@ msgstr ""
 #~ msgid "General Credit"
 #~ msgstr "Общий кредит"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Счета к получению"
+
 #~ msgid "Date payment"
 #~ msgstr "Дата оплаты"
 
@@ -11613,6 +11581,9 @@ msgstr ""
 #~ msgid "Display accounts"
 #~ msgstr "Показать счета"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Счета созданные за прошедшие 15 дней"
+
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
@@ -11628,6 +11599,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Переход к следующему партнеру"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажи по типу счета"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года"
 
@@ -11641,6 +11615,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Ошибка! Нельзя создать рекурсивные категории."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Продажи по бух. счетам"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -11708,6 +11685,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  оценка: процент"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Счета доходов"
+
 #~ msgid "9"
 #~ msgstr "9"
 
@@ -11952,6 +11932,9 @@ msgstr ""
 #~ msgid "Sort By"
 #~ msgstr "Сортировать по"
 
+#~ msgid "Dashboard"
+#~ msgstr "Инфо-панель"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Выполнение настройки"
 
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index b53c814c401..441bc63a679 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 79dc339c435..ce373d93122 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "minulý mesiac"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -31,7 +31,7 @@ msgstr "Systém platieb"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Iné konfigurácie"
+msgstr "Iné nastavenia"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -159,7 +159,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varovanie!"
 
 #. module: account
 #: code:addons/account/account.py:3112
@@ -178,11 +178,6 @@ msgstr "Zdroj účtu"
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktúry vytvorené za posledných 15 dní"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Účty pohľadávok"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10456,9 +10417,16 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Účty pohľadávok"
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neuhradené dodávateľské faktúry"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktúry vytvorené za posledných 15 dní"
+
 #~ msgid "Customer Invoices to Approve"
 #~ msgstr "Zákaznícke faktúry na schválenie"
 
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index d820c1afab8..01bb129d711 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 17:14+0000\n"
+"PO-Revision-Date: 2012-06-20 16:03+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <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-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgstr "Vir konta"
 msgid "All Analytic Entries"
 msgstr "Vse analitične postavke"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi narejeni v zadnjih 15-ih dneh"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -683,18 +678,6 @@ msgstr "Obdobje Dnevnika"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Usklajeni vnosi podjetja bi morali biti enaki za vse vpise"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konti terjatev"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1684,11 +1667,6 @@ msgstr "Ločeno zaporedje dnevnikov"
 msgid "Responsible"
 msgstr "Odgovoren"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodaja glede na vrsto konta"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2671,7 +2649,7 @@ msgstr "Samodejno usklajevanje"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "Plaćano/usklajeno"
+msgstr "Plačano/usklajeno"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2764,13 +2742,6 @@ msgstr "Finančne nastavitve novega podjetja"
 msgid "Configure Your Chart of Accounts"
 msgstr "Konfiguracija kontnega načrta"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodaja po kontih"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3165,8 +3136,8 @@ msgstr "Predloge kontnih načrtov"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generiraj kontni načrt iz predloge"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -5745,6 +5716,8 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Izberite vrso izračuna.Vaša zadnja vrstica mora biti tipa 'saldo' , da bo "
+"upoštevan celoten znesek."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -6324,7 +6297,7 @@ msgstr "Ime dnevnika mora biti enotno za podjetje!"
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Ustvari-opcijsko"
 
 #. module: account
 #: code:addons/account/account.py:664
@@ -6348,11 +6321,6 @@ msgstr "Vnesite začetni datum!"
 msgid "Supplier Refund"
 msgstr "Vrnitev dobavitelju"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Nadzorna plošča"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6603,6 +6571,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Označite , če želite dovoliti naknadno spreminjanje postavk ali računov "
+"povezanih z tem dnevnikom."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6699,7 +6669,7 @@ msgid ""
 "reconciliation functionality, OpenERP makes its own search for entries to "
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
-msgstr ""
+msgstr "Račun dobi status 'plačan' , ko je popolnoma izenačen z plačili."
 
 #. module: account
 #: view:account.move:0
@@ -6715,6 +6685,8 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Če ste se odločili za filtriranje po datumu ali obdobju , vam to polje "
+"omogoča dodati kolono za pregled stanja."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6738,6 +6710,8 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Ni možno spreminjati usklajenih postavk!\n"
+"%s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6753,14 +6727,14 @@ msgstr "Dnevnik"
 msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
-msgstr ""
+msgstr "To poročilo vsebuje kumulativni saldo po partnerju."
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
-msgstr ""
+msgstr "Izbrane postavke nimajo nobenih vknjižb v statusu 'Osnutek'."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6836,7 +6810,7 @@ msgid ""
 "This report allows you to print or generate a pdf of your trial balance "
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6844,6 +6818,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Označite , če niste sigurni v pravilnost knjiženja in želite da nekdo to "
+"preveri."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6868,6 +6844,8 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Določite BIC / SWIFT kodo banke za bančni račun tipa IBAN"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6894,16 +6872,16 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konti prihodkov"
+"Leto, mesec i dan v nazivu modela lahko določite s pomočjo oznak:\n"
+"\n"
+"%(year)s: za leto \n"
+"%(month)s: za mesec \n"
+"%(date)s: tenutni datum"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Referenca dokumenta , ki je osnova za ta račun."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6961,11 +6939,13 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
+"Nastavite bančne račune vašega podjetja in izberite tiste , ki se bodo "
+"izpisali na poročilih."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Izpisek z ročnimi vnosi bo v statusu \"Osnutek\""
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6976,7 +6956,7 @@ msgid ""
 "days). OpenERP then calculates a table of credit balance by period. So if "
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
-msgstr ""
+msgstr "Analiza terjatev po obdobjih "
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -6988,7 +6968,7 @@ msgstr "Izvorni dokument"
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "Ni možno brisati že vknjižene postavke \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -7017,6 +6997,8 @@ msgstr "Davki:"
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
 msgstr ""
+"Za davke , ki se izračunajo v procentih vpišite vrednost med 0 in 1. "
+"(0,25=25%)."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -7025,12 +7007,12 @@ msgid ""
 "from a specific date, i.e. corresponding to the signature of a contract or "
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
-msgstr ""
+msgstr "Ponavljajoči vnosi omogočajo avtomatizacijo vknjižb"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hierarhija finančnih poročil"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7046,14 +7028,14 @@ msgid ""
 "This feature provides an easy way to follow up cash payments on a daily "
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
-msgstr ""
+msgstr "Blagajna omogoča upravljanje gotovine"
 
 #. module: account
 #: help:account.invoice.refund,date:0
 msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
-msgstr ""
+msgstr "Ta datum bo uporabljen kot datum računa za vračilo."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7080,7 +7062,7 @@ msgstr "Kontna predloga davkov"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Ali res želite odpreti postavke dnevnika?"
 
 #. module: account
 #: view:account.state.open:0
@@ -7094,12 +7076,12 @@ msgstr "Ali res želite odpreti ta račun?"
 msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
-msgstr ""
+msgstr "Ni kontnega načrta!"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Otvoritve stroškovnega konta"
 
 #. module: account
 #: code:addons/account/account_move_line.py:999
@@ -7110,11 +7092,11 @@ msgstr "Računovodske vknjižbe"
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr ""
+msgstr "Predloga nadrejenega konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Namestitev kontnega načrta"
 
 #. module: account
@@ -7128,24 +7110,24 @@ msgstr "Izpisek"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Privzeti konto za debetni znesek"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
 msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
-msgstr ""
+msgstr "Za iskanje postavk, odprite dnevnik in izberite določeno vrstico"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Vknjižene posatvke"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Za procent vnesite vrednost med 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7158,7 +7140,7 @@ msgstr "Datum računa"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Združeno po letu raćuna"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7168,7 +7150,7 @@ msgstr "Skupni znesek, ki vam ga dolguje ta stranka."
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7193,6 +7175,7 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"Označite če želite da se postavke dnevnika seštevajo na en proti-konto."
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7212,12 +7195,12 @@ msgstr "Končni datum"
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Privzeti davek nabave"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Otvoritve konta prihodkov"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7238,12 +7221,12 @@ msgstr ""
 #: code:addons/account/account.py:1088
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Izbrati bi morali obdobja , ki pripadajo istemu podjetju"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "Pregled plačilnih pogojev"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7280,7 +7263,7 @@ msgstr "Opozorilo"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Pogodbe/analitični konti"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -7305,7 +7288,7 @@ msgid ""
 "This field shows you the next partner that will be automatically chosen by "
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
-msgstr ""
+msgstr "To polje vsebuje naslednjega partnerja za usklajevanje"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7321,13 +7304,13 @@ msgstr "Domena"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Model uporabe"
 
 #. module: account
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Napaka začetnega salda (negativna vrednost)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7337,6 +7320,8 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Obrazec za množične vnose.Če želite vnesti dobaviteljev račun, začnite z "
+"vnosom konta , program vam bo predlagal davek in proti-konto."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7348,7 +7333,7 @@ msgstr "Postavka računa"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Vračila kupcev in dobaviteljev"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7359,18 +7344,18 @@ msgstr "Podpis na poročilih"
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "Obdobje ni bilo najdeno"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Osnova/Pogled"
 
 #. module: account
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
@@ -7423,6 +7408,8 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"To polje se uporablja za saldakonte kupcev in dobaviteljev. Tu lahko "
+"nastavite zadnji rok plačila."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
@@ -7450,7 +7437,7 @@ msgstr "Dnevnik prodaje"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Odpri postavke dnevnika!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7461,13 +7448,13 @@ msgstr "Davek računa"
 #: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "No piece number !"
-msgstr ""
+msgstr "Ni številke kosa"
 
 #. module: account
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Hierarhija računovodskih poročil"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7478,11 +7465,13 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"To polje vam omogoča da lahko predlogo konta povežete z predlogo grafikona , "
+"ki ni enako kot osnovna predloga."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Postavke v statusu 'Osnutek'"
 
 #. module: account
 #: view:product.product:0
@@ -7511,7 +7500,7 @@ msgstr "Za"
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Nastavitev valute"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7530,6 +7519,7 @@ msgstr "Preklic izbranih računov"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"To polje se uporablja za kreiranje poročil : poslovni izid,bilanca stanja."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7539,6 +7529,8 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Plačilni pogoji določajo način plačila v enkratnem ali več zneskih. Vsakemu "
+"partnerju lahko priredite različne plačilne pogoje."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7559,13 +7551,13 @@ msgstr "Maj"
 #: code:addons/account/report/account_partner_balance.py:299
 #, python-format
 msgid "Payable Accounts"
-msgstr ""
+msgstr "Konti obveznosti"
 
 #. module: account
 #: code:addons/account/account_invoice.py:732
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
-msgstr ""
+msgstr "Davki so določeni , vendar jih ni na postavkah računa!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7577,7 +7569,7 @@ msgstr "Predloge za kontne načrte"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "Polje zaporedja razvršča objekte po rastočem zaporedju."
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -7588,7 +7580,7 @@ msgstr "Oznaka davka"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Vknjižba postavk dnevnika"
 
 #. module: account
 #: view:product.product:0
@@ -7615,7 +7607,7 @@ msgstr "Gotovina"
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Ciljni konto"
 
 #. module: account
 #: code:addons/account/account.py:1431
@@ -7662,7 +7654,7 @@ msgstr "Napaka! Ne morete ustvariti rekurzivne kategorije."
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "Neobvezna količina"
 
 #. module: account
 #: view:account.financial.report:0
@@ -7677,12 +7669,12 @@ msgstr "Da"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Prodaja po vrsti konta"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Povezava na avtomatsko kreirane postavke"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7697,7 +7689,7 @@ msgid ""
 "Select the fields you want to appear in a journal and determine the sequence "
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
-msgstr ""
+msgstr "Tu lahko prilagodite ali ustvarite nov pogled dnevnika."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7712,7 +7704,7 @@ msgstr "    7 dni    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Izračunani saldo"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7734,7 +7726,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Zakonska poročila"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7747,12 +7739,12 @@ msgid ""
 "The sequence field is used to order the tax lines from the lowest sequences "
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
-msgstr ""
+msgstr "Polje zaporedja razvrsti vrstice davka v rastočem zaporedju."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Postavka blagajne"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7789,12 +7781,12 @@ msgstr "Opozorilo!"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Stanje postavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr ""
+msgstr "Uskladitev vknjižbe"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7830,20 +7822,20 @@ msgstr "Partner"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Izberite valuto na računu"
 
 #. module: account
 #: code:addons/account/account.py:3446
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "Bančni račun , povezan z izbranim kontnim načrtom, nima kode."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Nije možno opraviti operacije na računu %s."
 
 #. module: account
 #: code:addons/account/account_invoice.py:810
@@ -7875,14 +7867,14 @@ msgstr "Vrsta poročila"
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "Regija"
+msgstr "Status"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
 msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
-msgstr ""
+msgstr "Izberite poslovno leto"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7896,12 +7888,14 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Saldo dokumenta ni pravi!\n"
+"Pričakovani saldo (%.2f) je različen od izračunanega (%.2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr ""
+msgstr "Postavke na kontu nimajo pravilnega statusa."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -7913,6 +7907,8 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Normalni kontni načrt je narejen po zakonskih zahtevah. Analitični kontni "
+"načrt pa odraža vaše specifične zahteve."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7941,12 +7937,14 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Označite , če želite združevanje enakih postavk računa v eno vknjižbo na "
+"konto."
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr ""
+msgstr "Označite če želite dovoliti usklajevanje postavk dnevnikov."
 
 #. module: account
 #: help:account.period,state:0
@@ -7954,11 +7952,13 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Ko se kreirajo mesečna obdobja. Status je \"Osnutek\". Ob zaključku mesece "
+"se status spremeni v \"Zaključeno\"."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "Obrnjen saldo analitike"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -8006,12 +8006,17 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * \"Osnutek\" račun je kreiran a še nima številke         \n"
+"* \"Predračun\" račun je kreiran a še nima številke        \n"
+"* \"Odprt\" račun je potrjen in čaka na plačilo    \n"
+"* \"Plačano\" račun je plačan    \n"
+"* \"Storno\" račun je bil preklican"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Skupni ostanek"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -8025,24 +8030,24 @@ msgid ""
 "The chart of taxes is used to generate your periodical tax statement. You "
 "will see the taxes with codes related to your legal statement according to "
 "your country."
-msgstr ""
+msgstr "Načrt davkov se uporablja za izdelavo mesečnega izračuna davkov."
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Ni kontnega načrta za to podjetje!"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Predračun"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -8053,12 +8058,12 @@ msgstr "Izberi poslovno leto"
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Dnevnik vračil dobaviteljem"
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Za procent vnesite vrednost med 0-1 (20%=0.2)"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8076,6 +8081,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Sprememba računa : Prekličite obstoječi račun in napravite kopijo , ki jo "
+"lahko spremenite."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8107,7 +8114,7 @@ msgstr "Obdobje"
 msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
-msgstr ""
+msgstr "Skupni znesek transakcij v sekundarni valuti."
 
 #. module: account
 #: report:account.invoice:0
@@ -8117,7 +8124,7 @@ msgstr "Skupaj (brez davkov):"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Splošna poročila"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -8130,6 +8137,8 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Ti plačilni pogoji se bodo uporabljali namesto privzetih za trenutnega "
+"partnerja"
 
 #. module: account
 #: view:account.tax.template:0
@@ -8142,7 +8151,7 @@ msgstr "Koda izračuna za davke v cenah"
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
-msgstr ""
+msgstr "Ne morete preklicati delno plačanega računa!"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8152,7 +8161,7 @@ msgstr "Oznaka konta prihodkov"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Prilagoditev salda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8163,7 +8172,7 @@ msgstr "Predloge davčnih območij"
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Int.tip"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -8173,7 +8182,7 @@ msgstr "Znesek davka/osnove"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Ovrednotenej:procent"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8182,7 +8191,7 @@ msgid ""
 "refund is a document that credits an invoice completely or partially. You "
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
-msgstr ""
+msgstr "Z Vračili kupcem lahko urejate dobropise kupcem."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8193,7 +8202,7 @@ msgid ""
 "payments, in some countries). This data is updated in real time. That’s very "
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
-msgstr ""
+msgstr "Izpis DDV-ja"
 
 #. module: account
 #: report:account.invoice:0
@@ -8241,6 +8250,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Tu lahko označite , da je ta postavka stvar spora (usklajevanja) z "
+"partnerjem."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -8251,12 +8262,12 @@ msgstr "Delno usklajevanje"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Analitika - Obrnjena bilanca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Računovodska poročila"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8270,23 +8281,23 @@ msgstr "tekoči mesec"
 msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
-msgstr ""
+msgstr "Obdobje za datum: %s ni definirano!"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Avtomatski uvoz banke"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr ""
+msgstr "Pogledi dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Usklajevanje banke"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8298,7 +8309,7 @@ msgstr "Vrste kontov"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Vrednost : n.a."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8330,11 +8341,13 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Ta gumb se pojavi če ima račun status \"Zaprto\" , plačila pa niso "
+"usklajena. Pritisnite gumb in odprite račun , da bo omogočeno usklajevanje."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Zaključek poslovnega leta"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -8349,7 +8362,7 @@ msgstr "Dnevnik vračil"
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Filtriraj po"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8358,7 +8371,7 @@ msgid ""
 "your customers. OpenERP can also generate draft invoices automatically from "
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
-msgstr ""
+msgstr "Izdani računi"
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8366,13 +8379,15 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Če želite zapreti obdobje , morate najprej zaključiti vse postavke z "
+"statusom \"Osnutek\"."
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Analize podjetja"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -8411,7 +8426,7 @@ msgstr "Dnevnik nakupov"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr ""
+msgstr "Kreiranje dobropisa"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8421,12 +8436,12 @@ msgstr "Delni seštevek"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Izpis davčne napovedi"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Modelna vrstica dnevnika"
 
 #. module: account
 #: view:account.invoice:0
@@ -8451,14 +8466,14 @@ msgstr "Dovoljene vrste kontov (prazno - brez kontrole)"
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "Računovodstvo dobaviteljev - lasnosti"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
-msgstr ""
+msgstr "Preostali znesek terjatev ali obveznosti"
 
 #. module: account
 #: view:account.tax.code:0
@@ -8474,12 +8489,12 @@ msgstr "Od"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Zapiranje poslovnega leta"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Koda konta že obstaja!"
 
 #. module: account
 #: view:account.invoice:0
@@ -8491,7 +8506,7 @@ msgstr "Neplačani računi"
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr ""
+msgstr "Dobaviteljevi plačilni pogoji nimajo nobene vrstice!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8523,7 +8538,7 @@ msgstr "Dovoljeni konti (prazno - ni kontrole)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Mapiranje predloge konta"
 
 #. module: account
 #: view:board.board:0
@@ -8556,7 +8571,7 @@ msgstr "Naziv dnevnika"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Naslednje postavke za usklajevanje"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8581,7 +8596,7 @@ msgstr ""
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Znesek mora biti enak kot na vrstici dokumenta"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8598,14 +8613,14 @@ msgstr "Pustite prazno za vsa poslovna leta"
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "Vknjižba na kontu (%s) je potrjena!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr ""
+msgstr "Vrednost v drugi valuti"
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -8614,7 +8629,7 @@ msgid ""
 "You can not validate a non-balanced entry !\n"
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
-msgstr ""
+msgstr "Ni možno potrditi neusklajene postavke !"
 
 #. module: account
 #: view:account.account:0
@@ -8650,12 +8665,12 @@ msgstr "Valuta"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "Zaporedje postavk bančnega izpiska"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Knjigovodja potrjuje vknjižbe iz računov."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8667,7 +8682,7 @@ msgid ""
 "30, 2011, then everything between December 1, 2010 and November 30, 2011  "
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
-msgstr ""
+msgstr "Določite obdobje poslovnega leta."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8694,7 +8709,7 @@ msgstr "Vsili obdobje"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Izpis stanja partnerja"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8704,7 +8719,7 @@ msgid ""
 "the sign of the balance; e.g.: Expense account. The same applies for "
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
-msgstr ""
+msgstr "Predznak za za debetne konte naj bo negativen in obratno."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8729,7 +8744,7 @@ msgstr "Dnevnik otvoritev"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Osnutki računov so potrjeni in izpisani."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8737,13 +8752,13 @@ msgid ""
 "This Account is used for transferring Profit/Loss(If It is Profit: Amount "
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
-msgstr ""
+msgstr "Ta konto se uporablja za prenos dobička/izgube."
 
 #. module: account
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Določiti morate zaporedje v povezanem dnevniku."
 
 #. module: account
 #: view:account.move:0
@@ -8756,7 +8771,7 @@ msgstr "Interni Zaznamek"
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Prodaja po vrstah"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8776,7 +8791,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Python programska koda"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8789,14 +8804,14 @@ msgid ""
 "You can specify here the coefficient that will be used when consolidating "
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
-msgstr ""
+msgstr "Predznak s katerim se vrednost prenaša v nadrejeni konto."
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Preostali znesek"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -8807,7 +8822,7 @@ msgstr "Postavke"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Pregled finančnih kontov"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -8818,7 +8833,7 @@ msgstr "Odpri dnevnik"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -8831,7 +8846,7 @@ msgstr "Obdobje od"
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Dnevnik vračil kupcem"
 
 #. module: account
 #: view:account.move:0
@@ -8843,12 +8858,12 @@ msgstr "Podrobnosti"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Registrirana plačila"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Status poslovnega leta in obdobij."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8872,13 +8887,13 @@ msgstr "Ustvari račun"
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Nabavni davek(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Ustvarite postavke računa"
 
 #. module: account
 #: report:account.overdue:0
@@ -8888,13 +8903,13 @@ msgstr "Dragi gospod/gospa,"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Podrobnosti"
 
 #. module: account
 #: code:addons/account/account.py:3118
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8902,6 +8917,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
+"Analitični stroški prihajajo iz analitičnih kontov.Na osnovi le teh je možno "
+"kreirati račune."
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8910,7 +8927,7 @@ msgid ""
 "view tells OpenERP which fields should be visible, required or readonly and "
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
-msgstr ""
+msgstr "Pogled za iskanje in vnos v dnevnik."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8986,7 +9003,7 @@ msgstr "Skupaj v dobro"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "Knjigovodja mora potrdi kontiranje računov. "
 
 #. module: account
 #: report:account.overdue:0
@@ -9006,12 +9023,12 @@ msgstr "Davčna predloga"
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument:Kartica kupca"
 
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "P&L / BS Category"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -9020,12 +9037,12 @@ msgid ""
 "suppliers. A refund is a document that credits an invoice completely or "
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
-msgstr ""
+msgstr "Z Vračili dobaviteljev lahko urejate dobropise dobaviteljev."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Terjatve"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@@ -9063,18 +9080,18 @@ msgstr "Saldo"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Ročno ali samodejno vneseno v sistem"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
 msgid "Display Account"
-msgstr ""
+msgstr "Prikaz konta"
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "Način zapiranja"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9105,7 +9122,7 @@ msgstr "Legenda"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Pogodbeni podatki"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9116,17 +9133,19 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Obrazec za množične vnose.Če želite vnesti izdan račun, začnite z vnosom "
+"konta , program vam bo predlagal davek in proti-konto."
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr ""
+msgstr "Izbrati morate konte za usklajevanje"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Vknjižbe so prvi vhod za usklajevanje."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9137,13 +9156,13 @@ msgid ""
 "Create and manage periods from here and decide whether a period should be "
 "closed or left open depending on your company's activities over a specific "
 "period."
-msgstr ""
+msgstr "Tu lahko določite obračunska obdobja."
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Filter"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9165,17 +9184,17 @@ msgstr "Prenos"
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr ""
+msgstr "Ni možno spremeniti davka!"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Analitične vknjižbe za zadnjih 365 dni."
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "A/C No."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -9186,7 +9205,7 @@ msgstr "Bančni izpiski"
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
-msgstr ""
+msgstr "Kreiranje konta po izbrani predlogi."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9199,7 +9218,7 @@ msgstr "Datum dneva"
 msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
-msgstr ""
+msgstr "Definirati morate bančni račun"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9209,13 +9228,13 @@ msgstr "transakcije zapiranja"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Skupno poročilo"
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Konsolidacija podrejenih postavk"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:87
@@ -9224,6 +9243,8 @@ msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"Dnevnik mora imeti določen zbirni proti-konto in polje \"Preskoči Osnutek\" "
+"ne sme biti označeno!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9259,7 +9280,7 @@ msgstr "Naročnina"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Saldo Analitike"
 
 #. module: account
 #: code:addons/account/account.py:412
@@ -9267,7 +9288,7 @@ msgstr ""
 msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
-msgstr ""
+msgstr "Ni določeno obdobje otvoritve/zaključka!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9315,12 +9336,12 @@ msgid ""
 "customer or supplier payments. Select 'General' for miscellaneous operations "
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
-msgstr ""
+msgstr "Izberite vrsto dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Naročnine konta"
 
 #. module: account
 #: report:account.overdue:0
@@ -9330,7 +9351,7 @@ msgstr "Datum zapadlosti"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Naročnine"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9367,7 +9388,7 @@ msgstr "Začetni datum"
 msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
-msgstr ""
+msgstr "Pomeni da je račun plačan in so plačila usklajena"
 
 #. module: account
 #: view:account.invoice:0
@@ -9404,7 +9425,7 @@ msgid ""
 "accounting entries, all new entries should then be made on the following "
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
-msgstr ""
+msgstr "Obdobje knjiženja (običajno mesec)"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9415,7 +9436,7 @@ msgstr "Na čakanju"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Iz analitičnih kontov"
 
 #. module: account
 #: field:account.period,name:0
@@ -9425,7 +9446,7 @@ msgstr "Naziv obdobja"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Koda/Datum"
 
 #. module: account
 #: field:account.account,active:0
@@ -9446,19 +9467,19 @@ msgstr "Primerjava"
 #: code:addons/account/account_invoice.py:372
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Neznana napaka"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr ""
+msgstr "Ta konto bo uporabljen namesto privzetega"
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Obdobje otvoritve/zakljućka"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -9470,7 +9491,7 @@ msgstr "Druga valuta"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Potrditev vknjižbe"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9503,13 +9524,15 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Tu lahko izberete dnevnik.Če pustite polje prazno , bo uporabljen isti "
+"dnevnik kot za trenutni račun."
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Konto prihodkov"
 
 #. module: account
 #: constraint:account.account:0
@@ -9518,11 +9541,13 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Napaka nastavitev!  \n"
+"Način letnega zaključevanja konta je napačen. "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Model dnevnika"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9532,6 +9557,8 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Datum zapadlost temelji na modelu '%s'  in plačilnih pogojih partnerja!\n"
+"Izberite partnerja!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9551,7 +9578,7 @@ msgstr "Splošno"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Analitične vknjižbe zadnjih 30 dni."
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9608,29 +9635,29 @@ msgstr "April"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Prihodek"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Odprite za usklajevanje"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Nadrejeni levo"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr ""
+msgstr "Ni možno spreminjati zaključenih računov."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Naslov 2 (krepko)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9661,6 +9688,7 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"Potrjevanje dnevnika (temeljnice) pomeni prenos postavk v glavno knjigo."
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9668,6 +9696,8 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"Ko bo izpisek kreiran bo imel status \"Osnutek\" , dokler ne bo potrjen od "
+"banke."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -9684,7 +9714,7 @@ msgstr "Odstrani postavke"
 msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
-msgstr ""
+msgstr "Izpis podrobnosti glavne knjige."
 
 #. module: account
 #: selection:account.account,type:0
@@ -9700,12 +9730,12 @@ msgstr "Običajno"
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Vrsta konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Tekoče naročnine"
 
 #. module: account
 #: view:report.account.sales:0
@@ -9765,7 +9795,7 @@ msgstr "Končni datum"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "Preklic začetnih stanj"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9776,35 +9806,35 @@ msgstr "Dan v mesecu"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr ""
+msgstr "Davek"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Zaporedje poslovnih let"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Ni podrobnosti"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Ni opredeljenega konta prihodkov za ta izdelek:\"%s\" (id:%d)"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Konto je zaprt."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Nerealiziran dobiček ali izguba"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9817,12 +9847,12 @@ msgstr "Stanja"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Potrjeni računi (Avto-Email)"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Orodje za potrjevanje"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -9841,7 +9871,7 @@ msgstr "Skupaj"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Dnevnik: Vse"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9891,17 +9921,17 @@ msgstr "Podjetje"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Definicija ponavljajočih vnosov"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Datum zapadlosti"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "Skupaj gotovinske transakcije"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9909,7 +9939,7 @@ msgid ""
 "This figure depicts the total number of partners that have gone throught the "
 "reconciliation process today. The current partner is counted as already "
 "processed."
-msgstr ""
+msgstr "Število partnerjev , ki so bili danes v procesu usklajevanja."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9919,12 +9949,12 @@ msgstr "Ustvari mesečna obdobja"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Predznak za nadrejenega"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9935,17 +9965,17 @@ msgstr "Pripravljeni izpiski"
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "Ročno ali samodejno kreiranje plačil iz izpiska"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Konti brez vknjižb ? "
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Dnevnik in obdobje knjiženja morata pripadati istemu podjetju."
 
 #. module: account
 #: view:account.invoice:0
@@ -9955,12 +9985,12 @@ msgstr "Postavke računa"
 #. module: account
 #: field:account.chart,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Konec obdobja"
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Koda dnevnika mora biti edinstvena za podjetje!"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9968,12 +9998,12 @@ msgstr ""
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
-msgstr ""
+msgstr "Ta konto se bo uporabljal za vrednotenje zalog za trenutni izdelek."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Kreirajte Kontni načrt na osnovi podloge"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -9981,7 +10011,7 @@ msgid ""
 "From this report, you can have an overview of the amount invoiced to your "
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
-msgstr ""
+msgstr "Poročilo o računih in zakasnitvah plačil."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9992,17 +10022,17 @@ msgstr "Knjiženje odpisa"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Račun je zaprt"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Prodaja po kontih"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Davčno območje konta"
 
 #. module: account
 #: report:account.invoice:0
@@ -10041,7 +10071,7 @@ msgstr "V breme"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Naslov 3 (krepko,manjše)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10056,7 +10086,7 @@ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Številka dokumenta"
 
 #. module: account
 #: view:account.subscription:0
@@ -10070,6 +10100,7 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"Ni možno spremeniti vrste konta v katerokoli vrsto , ki vsebuje vknjižbe!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10095,7 +10126,7 @@ msgstr "Območje"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Analitične postavke povezane z dnevniki nabav."
 
 #. module: account
 #: help:account.account,type:0
@@ -10105,7 +10136,7 @@ msgid ""
 "can have children accounts for multi-company consolidations, "
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
-msgstr ""
+msgstr "Vrsta konta"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -10117,12 +10148,12 @@ msgstr "S premiki"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr ""
+msgstr "Podatki konta"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Predloga davčne skupine"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10152,7 +10183,7 @@ msgstr "Združeno po mesecu računa"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10163,7 +10194,7 @@ msgstr "Zastarane terjatve"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Uporaba"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -10174,18 +10205,18 @@ msgstr "To obdobje je že zaprto!"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Druga valuta (če gre za več-valutni vnos)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Uvoz naloga iz računov"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Izdaja računov"
 
 #. module: account
 #: view:account.account:0
@@ -10202,7 +10233,7 @@ msgid ""
 "the nature of its activities and the number of daily transactions, a company "
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
-msgstr ""
+msgstr "Urejanje vrst dnevnikov."
 
 #. module: account
 #: view:account.payment.term:0
@@ -10212,17 +10243,17 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Analitični kontni načrt"
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Ostanek"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Statistična poročila"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
@@ -10234,7 +10265,7 @@ msgstr "Napačni konto!"
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Urejeno po"
 
 #. module: account
 #: help:account.move,state:0
@@ -10244,18 +10275,18 @@ msgid ""
 "journal. In that case, they will be behave as journal entries automatically "
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
-msgstr ""
+msgstr "Potrjeni računi (Avto-Email)"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Mapiranje kontov"
 
 #. module: account
 #: code:addons/account/account_invoice.py:364
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "Račun  '%s' čaka na potrditev."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10269,12 +10300,12 @@ msgstr "November"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Urejanje: dobropis"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
+msgstr "Konto prihodkov ali odhodkov"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -10374,6 +10405,75 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+"       | Invoice number: *${object.number}*\n"
+"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Invoice date: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -10402,7 +10502,7 @@ msgstr "Računovodski dokumenti"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Potrjevanje postavk"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -10413,17 +10513,17 @@ msgstr "Knjiga stroškov (samo količine)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Račun je zaključen."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Takoj ko bo uskladitev končana je lahko račun plačan."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Iskanje predlog"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -10433,12 +10533,12 @@ msgstr "Ročno zaračunan davek"
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Nadrejeni desno"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -10463,7 +10563,7 @@ msgstr "Poslovna leta"
 msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
-msgstr ""
+msgstr "To polje omogoča skriti analitični dnevnik."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -10506,7 +10606,7 @@ msgstr "Bančni račun"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Glavni dnevnik"
 
 #. module: account
 #: report:account.overdue:0
@@ -10521,7 +10621,7 @@ msgstr "Prihodnost"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Iskanje postavk dnevnika"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10540,25 +10640,25 @@ msgstr "Ponavadi 1 ali -1."
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Analitični kontni načrt"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Konto stroškov za izdelek"
 
 #. module: account
 #: help:accounting.report,label_filter:0
 msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
-msgstr ""
+msgstr "Ta tekst bo izpisan na poročilu."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr ""
+msgstr "Obdobje mora biti večje od 0"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -10570,14 +10670,14 @@ msgid ""
 "account). The annual accounts of a company are required by law to disclose a "
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
-msgstr ""
+msgstr "Urejanje kontov"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
-msgstr ""
+msgstr "Preostali znesek terjatev ali obveznosti"
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neplačani računi dobaviteljem"
@@ -11243,6 +11343,9 @@ msgstr ""
 #~ msgid "Close states"
 #~ msgstr "Zaprta stanja"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generiraj kontni načrt iz predloge"
+
 #~ msgid "Third party"
 #~ msgstr "Tretja stanka"
 
@@ -11267,6 +11370,10 @@ msgstr ""
 #~ msgid "Analytic Journal -"
 #~ msgstr "Analitični dnevnik"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konti terjatev"
+
 #~ msgid "Journal Voucher"
 #~ msgstr "Dnevnik za kupone."
 
@@ -11418,12 +11525,18 @@ msgstr ""
 #~ msgid "Account Manager"
 #~ msgstr "Odgovorni za stranko"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konti prihodkov"
+
 #~ msgid "Total :"
 #~ msgstr "Skupaj:"
 
 #~ msgid "Year :"
 #~ msgstr "Leto:"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi narejeni v zadnjih 15-ih dneh"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot remove/deactivate an account which is set as a property to any "
@@ -11495,9 +11608,15 @@ msgstr ""
 #~ msgid "Total With Tax"
 #~ msgstr "Skupaj z davkom"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodaja glede na vrsto konta"
+
 #~ msgid "Tax codes"
 #~ msgstr "Davčne skupine"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodaja po kontih"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Vrste kontov"
 
@@ -11632,5 +11751,14 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Kreiraj  konto na osnovi predloge"
 
+#~ msgid "Dashboard"
+#~ msgstr "Nadzorna plošča"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Namestitev kontnega načrta"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Opis računov"
+
+#~ msgid "Cost Ledger for period"
+#~ msgstr "Knjiga stroškov za obdobje"
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index b8e211a83b1..c88c990e3dd 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:47+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "Burimi i Llogarisë"
 msgid "All Analytic Entries"
 msgstr "Të Gjitha Shënimet Analitike"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2692,13 +2670,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3084,7 +3055,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6214,11 +6185,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6758,11 +6724,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6977,7 +6938,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 3333bb1475e..2bac460adf9 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "Originalni konto"
 msgid "All Analytic Entries"
 msgstr "Svi analitički unosi"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -668,18 +663,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta potraživanja"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1641,11 +1624,6 @@ msgstr "Odvojene sekvence dnevnika"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2700,13 +2678,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3096,8 +3067,8 @@ msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generiraj kontni plan iz predloška"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6236,11 +6207,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6784,11 +6750,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konto Prihoda"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7003,7 +6964,7 @@ msgstr "Predložak nadređenog konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10775,6 +10736,9 @@ msgstr ""
 #~ msgid "Print General Journal"
 #~ msgstr "Stampa glavne knjige"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generiraj kontni plan iz predloška"
+
 #~ msgid "Positive"
 #~ msgstr "Pozitivan"
 
@@ -11480,6 +11444,10 @@ msgstr ""
 #~ msgid "Control Invoice"
 #~ msgstr "Kontrolisi račun"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta potraživanja"
+
 #~ msgid "Date payment"
 #~ msgstr "Datum plaćanja"
 
@@ -11693,12 +11661,18 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Zatvaranje izvoda"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konto Prihoda"
+
 #~ msgid "Total :"
 #~ msgstr "Ukupno:"
 
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrsti"
 
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index 3d79f55385c..efba4df07d4 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgstr "Originalni konto"
 msgid "All Analytic Entries"
 msgstr "Svi analitički unosi"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -675,18 +670,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta potraživanja"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1648,11 +1631,6 @@ msgstr "Odvojene sekvence dnevnika"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2707,13 +2685,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3103,8 +3074,8 @@ msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generiraj kontni plan iz predloška"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6243,11 +6214,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6791,11 +6757,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konto Prihoda"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7010,7 +6971,7 @@ msgstr "Predložak nadređenog konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10798,6 +10759,9 @@ msgstr ""
 #~ msgid "Invoice Movement"
 #~ msgstr "Knjiženja računa"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generiraj kontni plan iz predloška"
+
 #~ msgid "Legal Statements"
 #~ msgstr "Zakonski izveštaji"
 
@@ -11520,6 +11484,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Trošak i prihod konta po dnevniku (ovaj mesec)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta potraživanja"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Otvori za poništenje zatvaranja"
 
@@ -11748,12 +11716,18 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Izračunaj datume stavki"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konto Prihoda"
+
 #~ msgid "Total :"
 #~ msgstr "Ukupno:"
 
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrsti"
 
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index a981ac13182..16e0bbd2ddb 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
+"PO-Revision-Date: 2012-06-20 16:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <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-05-11 04:52+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -44,7 +44,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Avstämning av journalpost"
+msgstr "Avstämning av verifikat"
 
 #. module: account
 #: view:account.account:0
@@ -77,18 +77,18 @@ msgstr "Kontovaluta"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Barndefinitioner"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Journalposten %s är inte giltig"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Åldrade fordringar till idag"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -103,7 +103,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Total Debit"
+msgstr "Summa Debet"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -121,7 +121,7 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
-"Konfigurations fel! Den valuta bör delas mellan standard-konton också."
+"Konfigurationsfel! Vald valuta bör delas mellan standard-konton också."
 
 #. module: account
 #: report:account.invoice:0
@@ -171,7 +171,7 @@ msgstr "Varning!"
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr "Övrigjournal"
+msgstr "Övrig journal"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -184,15 +184,10 @@ msgstr "Konto Källa"
 msgid "All Analytic Entries"
 msgstr "Alla objektposter"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktura skapad inom 15 dagar"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr "Kolumn Etikett"
+msgstr "Kolumnetikett"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -207,9 +202,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Ger typ av analytisk journal. När det behövs ett dokument (t.ex. en faktura) "
-"för att skapa analytiska poster, kommer OpenERP leta efter en matchande "
-"journal av samma typ."
+"Ger typ av objektjournal. När det behövs ett dokument (t.ex. en faktura) för "
+"att skapa objektposter, kommer OpenERP leta efter en matchande journal av "
+"samma typ."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -225,7 +220,7 @@ msgstr "account.tax"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Välj affärshändelserader för avstämning"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -246,7 +241,7 @@ msgstr "Faktura '%s' är delbetald: %s%s av %s%s (%s%s återstår)"
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Bokföringsposter är en inmatning på balanseringen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -257,7 +252,7 @@ msgstr "Belgiska rapporter"
 #: code:addons/account/account_move_line.py:1200
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "You can not add/modify entries in a closed journal."
+msgstr "Du kan inte lägga till/ändra poster i en stängd journal"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -266,6 +261,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Kontotyp används för informationsändamål, för att skapa landsspecifika "
+"juridiska rapporter och ange reglerna för att stänga ett räkenskapsår och "
+"generera öppningsposter."
 
 #. module: account
 #: report:account.overdue:0
@@ -327,17 +325,21 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Journal av typen %s saknas för detta företag.\n"
+"\n"
+"Du kan skapa en i menyn: \n"
+"Inställningar/Finansiell bokföring/Kontoplan/Journaler."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Gör konto oavstämt"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Inköp av tillgångar"
+msgstr "Inköpsegenskaper"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -346,6 +348,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Du kan ställa in det format du vill denna att post ska visas med. Om du "
+"lämnar det för automatisk formatering, kommer det att beräknas baserat på "
+"den finansiella rapporthierarkin (auto-beräknade fältet \"nivå\")."
 
 #. module: account
 #: view:account.installer:0
@@ -368,11 +373,14 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Denna vy används för att registrera uppgifter massivt i OpenERP. "
+"Journalobjekt skapas av OpenERP om du använder kontoutdrag, kassaapparater "
+"eller kund-/leverantörsbetalningar."
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan inte skapa transaktioner med rubrikkonton."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -398,7 +406,7 @@ msgstr "Återbetala inköp"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr "Öppning/Stängning Situation"
+msgstr "Öppnings-/stängningsstatus"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -416,8 +424,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Detta fält innehåller information i samband med numreringen av journalposter "
-"av denna journal."
+"Detta fält innehåller information knuten till numreringen av journalens "
+"verifikat."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -450,7 +458,7 @@ msgstr "The amount expressed in an optional other currency."
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Aktivera jämförelse"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -471,6 +479,11 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"Skattetabellen är en trädvy som återspeglar strukturen i de skatteklasser "
+"(eller skattekoder) och visar den aktuella skattesituationen. Tabellen "
+"representerar den mängd varje område av deklarationen för ditt land. Det "
+"presenteras i en hierarkisk struktur, som kan ändras för att passa dina "
+"behov."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -510,7 +523,7 @@ msgstr "Bekräfta valda fakturor"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Föräldramål"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -553,7 +566,7 @@ msgstr "AB"
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Not reconciled transactions"
+msgstr "Icke avstämda transaktioner"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -577,7 +590,7 @@ msgstr "Stäng ett verksamhetsår"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "Bokföraren bekräftar verifikatet."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -591,7 +604,7 @@ msgstr "Alla"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr "Fakturaadress"
+msgstr "Fakturaadressnamn"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -621,7 +634,7 @@ msgstr "Sekvenser"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Värderapport"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -642,7 +655,7 @@ msgstr "Huvudsekvensen skall skilja sig från nuvarande!"
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr ""
+msgstr "Period saknas eller flera perioder finns för det givna datumet."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -664,12 +677,12 @@ msgstr "Stäng period"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Försäljningsrapport per konto"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Opening Entries Period"
+msgstr "Öppningsposter för perioden"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -685,24 +698,14 @@ msgstr ""
 "Bolaget måste vara samma genomgående för alla poster, för att kunna stämma "
 "av dem korrekt."
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Kundfordringskonton"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Verifikationsdatumet är inte inom den definierade perioden! Du bör ändra "
+"datum eller ta bort denna begränsning från journalen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -717,7 +720,7 @@ msgstr "Reaktivera"
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "Are you sure you want to create entries?"
+msgstr "Är du säker på att du vill skapa verifikat?"
 
 #. module: account
 #: view:account.invoice:0
@@ -732,12 +735,12 @@ msgstr "Partners Sammanslagna Idag"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "Försäljningstransaktioner i år"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Visa barn i hierarkin"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -755,12 +758,12 @@ msgstr "Kontoplaner"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Objekttransaktioner per rad"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Återbetalningsmetod"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -771,7 +774,7 @@ msgstr "Ni kan enbart ändra valuta på fakturor som är i utkastläge"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Finansiella rapporter"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -795,6 +798,8 @@ msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Skatter saknas!\n"
+"Klicka på beräknaknappen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -809,7 +814,7 @@ msgstr "Företagsreferens för denna faktura"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Leverantörsfakturor och öppna transaktioner"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -823,6 +828,8 @@ msgstr "Unreconciliation"
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
 msgstr ""
+"Vid 14 nettodagar 2 procent, återstående belopp vid 30 dagar i slutet av "
+"månaden."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
@@ -837,7 +844,7 @@ msgstr "Automatisk avstämning"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "JC/Affärshändelse"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -847,6 +854,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"När du gör flera valutatransaktioner kan du förlora eller vinna en viss "
+"mängd på grund av förändringar i växelkursen. Denna meny ger dig en prognos "
+"för vinsten eller förlusten du skulle insett om dessa transaktioner "
+"avslutades idag. Endast för konton som har en sekundär valuta satt."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -891,7 +902,7 @@ msgstr "Beräkning"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "Avbryt: kreditera faktura och avstäm"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -902,7 +913,7 @@ msgstr "Värden"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Ledtid för betalning i medeltal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -914,7 +925,7 @@ msgstr "Skattetabell"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Create 3 Months Periods"
+msgstr "Skapa 3-månadersperioder"
 
 #. module: account
 #: report:account.overdue:0
@@ -928,6 +939,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Du kan inte validera detta verifikat eftersom kontot \"% s\" inte hör till "
+"kontoplanen \"% s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -936,6 +949,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Det här kontot tillåter inte avstämning! Du bör uppdatera kontodefinitionen "
+"för att ändra på detta."
 
 #. module: account
 #: view:account.invoice:0
@@ -998,12 +1013,15 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Om skattekontot är en skattekontokod, kommer detta fält innehålla "
+"skattedelen. Om skattekontot är basskattekod, innehåller det här fältet  "
+"taxerat belopp  (utan skatt)."
 
 #. module: account
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Förälderkonto saknas för kontomallen!"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1060,7 +1078,7 @@ msgstr "Kontonamn"
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "Reserverad vinst/förlust-konto"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1070,7 +1088,7 @@ msgstr "Veckonummer"
 #. module: account
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr "Landscape Mode"
+msgstr "Landskapsmod"
 
 #. module: account
 #: code:addons/account/account.py:645
@@ -1079,11 +1097,13 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Du kan inte ändra typen av konto från '%s' till '%s' typ eftersom den har "
+"transaktioner!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Sortera efter"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
@@ -1096,6 +1116,8 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Dessa typer är definierade för ditt land. Typen innehåller mer information "
+"om  kontoklassen och dess särdrag."
 
 #. module: account
 #: code:addons/account/account_move_line.py:842
@@ -1103,6 +1125,7 @@ msgstr ""
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
 msgstr ""
+"Du måste registrera ett konto för avskrivning av transaktionens differens !"
 
 #. module: account
 #: view:account.tax:0
@@ -1141,7 +1164,7 @@ msgstr "Skapa transaktioner före:"
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Obalanserade transaktioner"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1167,6 +1190,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totalt belopp (i sekundär valuta) för transaktioner i sekundär valuta för "
+"detta konto"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1182,7 +1207,7 @@ msgstr "Credit Centralisation"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "Försäljning per typ och alla månader"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1211,12 +1236,12 @@ msgstr "Avbryt faktura"
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Koden visas på rapporter"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Moms vid inköp"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1239,7 +1264,7 @@ msgstr "Situation"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Affärshändelsen för transaktionen"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -1248,6 +1273,8 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Du kan inte använda detta allmänna konto i denna journal, kontrollera fliken "
+"\"gränskontroll\" på den relaterade journalen !"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1283,7 +1310,7 @@ msgstr "Övriga"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Preleminär prenumeration"
 
 #. module: account
 #: view:account.account:0
@@ -1324,7 +1351,7 @@ msgstr "Inkluderat i basbelopp"
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Transaktionsanalys"
 
 #. module: account
 #: field:account.account,level:0
@@ -1357,7 +1384,7 @@ msgstr "Ange en start och en slutperiod"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Resultaträkning"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1374,7 +1401,7 @@ msgstr "Sök momsmallar"
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "Reconcile Entries"
+msgstr "Avstäm verifikat"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -1407,7 +1434,7 @@ msgstr "Rapportinställningar"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Transaktionsanalyser"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1449,12 +1476,12 @@ msgstr "Sök moms"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Huvudbok för objektskostnader"
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "Create entries"
+msgstr "Skapa poster"
 
 #. module: account
 #: field:account.entries.report,nbr:0
@@ -1464,7 +1491,7 @@ msgstr "# artiklar"
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Maximum write-off amount"
+msgstr "Största belopp att skriva av"
 
 #. module: account
 #: view:account.invoice:0
@@ -1496,6 +1523,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Ett verifikat består av flera transaktioner, som alla är antingen debet-"
+"eller kredit-transaktion. OpenERP skapar automatiskt ett verifikat per "
+"redovisningsdokument: faktura, återbetalning, leverantör betalning, "
+"kontoutdrag, etc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1508,11 +1539,13 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Genom att kryssa bort det aktiva fältet, kan du gömma skatteregion utan att "
+"radera det."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "En temporärtabell används för infopanelvyn"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1534,12 +1567,12 @@ msgstr "Avslutad"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Återkommande verifikat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "Template for Fiscal Position"
+msgstr "Mall för skatteregion"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1570,7 +1603,7 @@ msgstr "Grupper"
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Untaxed"
+msgstr "Före skatt"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -1585,7 +1618,7 @@ msgstr "Sök kontoutdrag"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Icke bokförda transaktioner"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1615,6 +1648,12 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Ett bankutdrag är en sammanfattning av alla finansiella transaktioner som "
+"sker under en viss tidsperiod på ett inlåningskonto, ett kreditkort eller "
+"någon annan typ av finansiellt konto. En ingående balans kommer att föreslås "
+"automatiskt och utgående balans återfinns på ditt kontoutdrag. När du är i "
+"betalningskolumnen i en rad kan du trycka på F1 för att öppna "
+"avstämningsformuläret."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1631,7 +1670,7 @@ msgstr "Huvudkonton"
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr "Payable Limit"
+msgstr "Skuldgräns"
 
 #. module: account
 #: report:account.invoice:0
@@ -1647,7 +1686,7 @@ msgstr "Faktura"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Objektkostnader som skall faktureras"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1664,17 +1703,14 @@ msgstr "Separerade nummerserier för böcker"
 msgid "Responsible"
 msgstr "Ansvarig"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Försäljning per kontotyp"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Avbryt faktura: Skapar kreditfaktura, validera och stämma av dem att för att "
+"avbryta det aktuella fakturan."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1685,7 +1721,7 @@ msgstr "Fakturering"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Okänt företag"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1712,13 +1748,13 @@ msgid ""
 "on an account."
 msgstr ""
 "Visar bolagets kontoplan per bokföringsår och vald period. Du får en "
-"komplett trädvy över alla verifikationer per konto genom att klicka på ett "
+"komplett trädvy över alla transaktioner per konto genom att klicka på ett "
 "konto."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Väntande konton"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1735,7 +1771,7 @@ msgstr "Gör journalperioden genom att sätta aktiv til falsk."
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr "Supplier Debit"
+msgstr "Leverantörsskuld"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1745,7 +1781,7 @@ msgstr "Kund- och leverantörsfakturor"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Vanlig kontotransakrionsrapport"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1792,7 +1828,7 @@ msgstr "Skattedeklaration: Kreditfakturor"
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Credit amount"
+msgstr "Kreditbelopp"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1800,12 +1836,12 @@ msgstr "Credit amount"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Fel kredit- eller debitvärde i bokföringstransaktionerna."
+msgstr "Fel kredit- eller debetvärde i bokföringstransaktionerna."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1832,13 +1868,13 @@ msgstr "Transaktiomer per rad"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Baserad på"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Registrera verifikation"
+msgstr "Verifikat"
 
 #. module: account
 #: view:account.tax:0
@@ -1867,30 +1903,30 @@ msgstr "Fel! Du kan inte skapa rekursiva företag."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Sälj-/inköpsjournal"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "Analytic account"
+msgstr "Objektkonto"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Please verify that an account is defined in the journal."
+msgstr "Vänligen kontrollera att ett konto är definierat i journalen."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr "Valid"
+msgstr "Giltig"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Utskrift kontotransaktioner"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -1909,6 +1945,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Detta konto används för överföring av vinst/förlust (Om det är Vinst: "
+"beloppet kommer att adderas, förlust: belopp kommer att dras bort), beräknat "
+"i enlighet med resultaträkningsrapporten"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1920,7 +1959,7 @@ msgstr "Jämför konterings och betalningstransaktioner"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Tax Definition"
+msgstr "Skattedefinition"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1928,8 +1967,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
-"Check this box if you want to use a different sequence for each created "
-"journal. Otherwise, all will use the same sequence."
+"Kryssa denna ruta om du vill använda en annan ordning för varje skapad "
+"journaler. I annat fall, kommer alla använda samma ordningsföljd."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1950,7 +1989,7 @@ msgstr "Registreringsdatum måste vara i perioden om denna är markerad."
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Du måste definiera objektjournal för '%s' journalen!"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1965,11 +2004,15 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Det valda kontot till ditt verifikat tvingar fram användandet av en sekundär "
+"valuta. Du bör ta bort den sekundära valutan på kontot eller välj en multi-"
+"valuta-vy för journalen."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
+"Gör ett generiskt system för att enkelt skapa  finansiella rapporter."
 
 #. module: account
 #: view:account.invoice:0
@@ -1987,12 +2030,12 @@ msgstr "Du kan gömma momsen utan att ta bort den om denna är falsk."
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Objektjournal med transaktioner relaterade till inköpsjournalen"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Kursiverad text (mindre)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2015,24 +2058,24 @@ msgstr "Skattedeklaration"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Partial Entry lines"
+msgstr "Partiella verifikatrader"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr "Fiscalyear"
+msgstr "Räkenskapsår"
 
 #. module: account
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "Open Entries"
+msgstr "Öppna verifikat"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Konton att balansera"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -2081,7 +2124,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Du måste definiera objektjournal för '%s' journalen!"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2098,6 +2141,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Standard kostnadskonto ej definierat\n"
+"på journal \"%s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2109,6 +2154,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Denna typ används för att skilja olika typer med specialfunktioner i "
+"OpenERP: rubriker kan inte ha poster, konsolidering är konton som kan ha "
+"barn står för koncernkonsolideringar och obetalda / förutbetalda intäkter är "
+"för företags redovisning (för debet / kredit beräkningar), stängt för "
+"avskrivna konton."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2123,6 +2173,9 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Kan inte skapa en automatisk löpnummerserie för denna del!\n"
+"Välj ett löpnummer i journaldefinitionen för automatisk numrering eller "
+"skapa ett sekvensnummer manuellt."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2131,11 +2184,13 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Du kan inte ändra bolag på denna journal eftersom den innehåller "
+"transaktioner."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Kundkod"
 
 #. module: account
 #: view:account.installer:0
@@ -2170,7 +2225,7 @@ msgstr "Beskrivning"
 #: code:addons/account/account.py:3119
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2183,18 +2238,18 @@ msgstr "Pågående"
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr "Income Account"
+msgstr "Intäktskonto"
 
 #. module: account
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr "Kontojournal av typen försäljning/inköp saknas!"
 
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB och/eller IBAN är felaktig"
 
 #. module: account
 #: view:product.category:0
@@ -2206,7 +2261,7 @@ msgstr "Bokföringsegenskaper"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr "Entries Sorted By"
+msgstr "Verifikat sorterade med"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
@@ -2258,7 +2313,7 @@ msgstr "Produktmall"
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr "Verksamhetsår"
+msgstr "Räkenskapsår"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2277,12 +2332,12 @@ msgstr "Verksamhetsår"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Keep empty for all open fiscal year"
+msgstr "Håll tomt för alla öppna räkenskapsår"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Kontorad"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2299,6 +2354,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Ställ in dina bokföringsjournaler. För bankkonton, är det bättre att använda "
+"\"Ställ in dina bankkonton\"-verktyget som automatiskt kommer att skapa "
+"konton och journaler för dig."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2308,7 +2366,7 @@ msgstr "Account Entry"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2322,6 +2380,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"För att radera ett bankuttdrag, måste du först avbryta relaterade "
+"transaktioner."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2355,7 +2415,7 @@ msgstr "Kryssa i rutan"
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr "Filters"
+msgstr "Filter"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2381,7 +2441,7 @@ msgstr "Preliminär status för en faktura"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Avstämning företag"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2398,12 +2458,16 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Journal av typen %s saknas för detta företag.\n"
+"\n"
+"Du kan skapa en i menyn: \n"
+"Inställningar/Finansiell bokföring/Kontoplan/Journaler."
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30 dagar månadsskiftet"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2419,7 +2483,7 @@ msgstr "Baskod"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Sorteringsordning vid presentation av fakturaskatter."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2491,7 +2555,7 @@ msgstr "Leverantörsskatter"
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "poster"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2537,11 +2601,12 @@ msgstr ""
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Denna rapport ger en översikt för situationen för en specifik journal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Transaktionsavstämning (avskrivning)"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2579,7 +2644,7 @@ msgstr "Konton"
 #: code:addons/account/account_invoice.py:369
 #, python-format
 msgid "Configuration Error!"
-msgstr "Configuration Error!"
+msgstr "Konfigurationsfel!"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
@@ -2595,7 +2660,7 @@ msgstr "Datum:"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr ""
+msgstr "Etikett"
 
 #. module: account
 #: view:account.tax:0
@@ -2632,17 +2697,18 @@ msgstr "Ref"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "Kontot kan antingen vara en skattebaskod eller ett skattekodkonto."
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Felaktigt kredit eller debet-värde i modellen, de måste vara positiva!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automatisk avstämning"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2672,7 +2738,7 @@ msgstr "Datum"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Förlaga för kontoplan"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2684,7 +2750,7 @@ msgstr "Parent Tax Account"
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "Nya valutan är inte korrekt konfigurerad !"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2692,6 +2758,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Automatisk skapade transaktioner på grundval av inmatningar i systemet före "
+"ett visst datum."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2709,7 +2777,7 @@ msgstr "Redovisningstransaktioner"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Kommunikationstyp"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2725,6 +2793,11 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Markera den här rutan om du inte vill att nya verifikat skall passera genom "
+"\"utkast\"-läget och i stället går direkt till \"bokförd\" utan någon "
+"manuell validering.\n"
+"Observera att verifikat som automatiskt skapas av systemet alltid hoppar "
+"över detta tillstånd."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2735,14 +2808,7 @@ msgstr "Nya bolags finansiella inställningar"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Försäljning per konto"
+msgstr "Installera din kontoplan"
 
 #. module: account
 #: view:account.use.model:0
@@ -2753,7 +2819,7 @@ msgstr "Denna assistent kommer att skapa återkommande bokföringsposter"
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "Nummerserie saknas för denna journal !"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -2770,6 +2836,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Du behöver en öppningsjournal med centralisering kryssad för att sätta "
+"ingående balanser!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2781,7 +2849,7 @@ msgstr "Momskoder"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Orealiserade vinster och förluster"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2803,12 +2871,12 @@ msgstr "Period till"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr "Augusti"
+msgstr "augusti"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Betalningstransationer är den andra inmatningen för en avstämning"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2817,7 +2885,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr "Oktober"
+msgstr "oktober"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2825,6 +2893,9 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Den valfria mängden uttrycks av den här raden, t.ex.: antal sålda produkter. "
+"Mängden är inte ett rättsligt krav, men är mycket användbart för vissa "
+"rapporter."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2852,7 +2923,7 @@ msgstr "Om värde saknas används perioden från (faktura)datum."
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr ""
+msgstr "används i avstämning domänen, men bör inte användas annorstädes."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2866,6 +2937,8 @@ msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
+"Du kan inte radera en faktura som är öppen eller betalats. Vi föreslår att "
+"du krediterar den i stället."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2876,7 +2949,7 @@ msgstr "Standardmoms"
 #: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Fakturan '%s' är granskad."
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2885,6 +2958,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Förfallodagen för de genererade posterna för denna modell. Du kan välja "
+"mellan datum för skapande eller datum för skapande av de uppgifter samt "
+"företagens betalningsvillkor."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2908,7 +2984,7 @@ msgstr "Resultaträkning"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Fiscal Position"
+msgstr "Skatteregion"
 
 #. module: account
 #: code:addons/account/account_invoice.py:735
@@ -2917,6 +2993,8 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Skatteunderlag avviker!\n"
+"Klicka på beräkna för att uppdatera skattebasen."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2964,7 +3042,7 @@ msgstr "Fakturavaluta"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Kontorapporter"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2989,7 +3067,7 @@ msgstr "Tax Template List"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Sälj-/inköpsjournal"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3031,7 +3109,7 @@ msgstr "Alltid"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Månad-1"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3078,7 +3156,7 @@ msgstr "Objektrader"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proformafakturor"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3093,7 +3171,7 @@ msgstr "Kundkredit"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Dag i månad: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3103,12 +3181,12 @@ msgstr "Börjar den"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Kund och leverantörsreskontra"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Ger ordningsföljd för journalkolumnerna"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3124,8 +3202,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Denna assistent kommer att validera alla journalposter för en specifik "
-"journal och period. När en journalpost är validerad går den ej att updatera."
+"Denna assistent kommer att bokföra alla verifikat för en specifik journal "
+"och period. När ett verifikat väl är bokfört går det inte längre att ändra."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3135,18 +3213,18 @@ msgstr "Förlaga för kontoplan"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Denna månads försäljning per typ"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Kontoavstämning"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3166,6 +3244,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Ställ in metoden som ska användas för att generera årsavslutsposter för alla "
+"konton av detta slag.\n"
+"\n"
+"  \"Ingen\" betyder att ingenting kommer att ske.\n"
+"  \"Balans\" i allmänhet användas för kontantkonton.\n"
+"  \"Detalj\" kommer att kopiera varje befintligt verifikat i det föregående "
+"året, även de avstämda.\n"
+"  \"Oavstämd\" kommer att kopiera endast oavstämda verifikat från första "
+"dagen av det nya räkenskapsåret."
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3216,7 +3303,7 @@ msgstr "Journaler"
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Återstående företag"
 
 #. module: account
 #: view:account.subscription:0
@@ -3244,7 +3331,7 @@ msgstr "Konfiguration av bokföringen"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Värdebelopp: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3274,7 +3361,7 @@ msgstr "Stäng en period"
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Visa detaljer"
 
 #. module: account
 #: report:account.overdue:0
@@ -3284,7 +3371,7 @@ msgstr "Moms:"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ogiltig BBA-strukturerad kommunikation!"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3292,6 +3379,8 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Det belopp som uttrycks i den berörda kontovalutan om inte lika med första "
+"bolaget."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3316,17 +3405,17 @@ msgstr "Skattetabell"
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Stängningsbalansen bör vara samma som beräknad balans!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Sök transaktioner"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Väntande faktura"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3346,6 +3435,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Alla valda transaktioner kommer bli bokförda. Detta innebär att du inte kan "
+"ändra dessa när detta är gjort."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3392,17 +3483,17 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "Kvantitet:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Periodlängd (dagar)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Skriv ut sälj-/inköpsjournal"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3429,7 +3520,7 @@ msgstr "Försäljningskonto per kontotyp"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Obalanserade transaktioner"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3450,6 +3541,11 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Kan inte skapa fakturan!\n"
+"Det relaterade betalningsvillkoret är förmodligen felkonfigurerad eftersom "
+"det ger ett beräknat belopp som är större än det fakturerade totalbeloppet. "
+"Den senaste raden av din betalning tid måste vara av typen \"balans\" för "
+"att undvika avrundningfrågor."
 
 #. module: account
 #: report:account.invoice:0
@@ -3483,12 +3579,12 @@ msgstr "Centralised counterpart"
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "Du kan inte skapa transaktioner med rubrikkonton %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Avstämningsprocess företag för företag"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3544,7 +3640,7 @@ msgstr "Datum"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Bokför"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3575,6 +3671,8 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Förfallodagen på inmatningsraden som genereras av klassraden  \"%s\" klass "
+"\"%s\" bygger på företagets betalningsvillkor! Vänligen ange företag på det!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:837
@@ -3609,12 +3707,12 @@ msgstr "Budgetar"
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr ""
+msgstr "Inga filter"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Pro-formafakturor"
 
 #. module: account
 #: view:res.partner:0
@@ -3656,12 +3754,12 @@ msgstr "Process"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Sök objektrader"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Account Payable"
+msgstr "Leverantörsskuldskonto"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3689,7 +3787,7 @@ msgstr "Styckpris"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Objekttransaktioner"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
@@ -3700,12 +3798,12 @@ msgstr "Unable to change tax !"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#Poster"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "Skapa preleminär återbetalning"
 
 #. module: account
 #: view:account.state.open:0
@@ -3715,12 +3813,12 @@ msgstr "Öppen faktura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Multiplikationsfaktor för skattekod"
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Fältmappning"
 
 #. module: account
 #: code:addons/account/account_invoice.py:921
@@ -3730,6 +3828,8 @@ msgid ""
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Du kan inte skapa en faktura på en centraliserad journal. Avmarkera "
+"centraliserade rutan i motsatt journal på konfigurationsmenyn."
 
 #. module: account
 #: field:account.account,name:0
@@ -3753,18 +3853,18 @@ msgstr "Råbalans, periodiserad"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "Du kan inte skapa transaktioner med rubrikkonton %s %s."
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Effective date"
+msgstr "Effektivt datum"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Ställ in dina bankkonton"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3775,7 +3875,7 @@ msgstr "Standard Encoding"
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Journal för objekttransaktioner"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -3813,7 +3913,7 @@ msgstr "Bokföring"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Verifikat med period inom året"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3824,6 +3924,7 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Skriv ut rapport med valutakolumnen om valutan avviker från bolagsvalutan"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -3831,6 +3932,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Värdet på förlust eller vinst beror på förändringar i växelkursen när man "
+"gör flera valutatransaktioner."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3840,7 +3943,7 @@ msgstr "Allmän bokföring"
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr "Balance :"
+msgstr "Balans:"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3850,6 +3953,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Det bästa praxis här är att använda en journal tillägnad att innehålla årets "
+"ingående balanser. Observera att du bör fastställa den med "
+"standardinställningarna debet / kredit-konton av typen \"situation\" och med "
+"en centraliserad motpart."
 
 #. module: account
 #: view:account.installer:0
@@ -3862,12 +3969,12 @@ msgstr "titel"
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Set to Draft"
+msgstr "Sätt till utkast"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Återkommande rader"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
@@ -3890,7 +3997,7 @@ msgstr "Huvudbok"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Tillgångar"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -3907,7 +4014,7 @@ msgstr "Medelkurs"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Visningskonton"
 
 #. module: account
 #: view:account.state.open:0
@@ -3944,11 +4051,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Du kan gömma prislistan utan att ta bort den genom att markera denna."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Bokförda tranksationer"
 
 #. module: account
 #: view:account.tax.template:0
@@ -3963,12 +4071,12 @@ msgstr "Preliminära transaktioner"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  Dag i månaden= -1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  Antal dagar: 30"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3979,7 +4087,7 @@ msgstr "Genväg"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "Fel! Startdatum för verksamhetsåret måste vara före slutdatum."
 
 #. module: account
 #: view:account.account:0
@@ -4000,7 +4108,7 @@ msgstr "Kontotyp"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Bankkontoägare"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4023,6 +4131,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
+"Detta konto kommer att användas för att värdera utgående lager för den "
+"aktuella produktkategorin utifrån försäljningspriset"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4036,6 +4146,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Du har inte levererat tillräckligt argument för att beräkna den ursprungliga "
+"balansen, välj en period och tidskriften i sammanhanget."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4055,7 +4167,7 @@ msgstr "Stäng kassalåda"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Ledtid för betalning i medeltal"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4081,11 +4193,14 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Du kan inte göra denna ändring på ett bokfört verifikat! Du kan endast ändra "
+"icke legala uppgifter alternativt göra verifikatet icke bokfört! \n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypalkonto"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4101,7 +4216,7 @@ msgstr "Anteckning"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Tecken för omvänd balans"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4146,6 +4261,7 @@ msgstr "Kundens bokföringsinställningar"
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal-användarnamn (vanligtvis e-post) för att ta emot betalningar online."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4168,13 +4284,13 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "All Posted Entries"
+msgstr "Alla bokförda verifikat"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "Kontoutdrag %s är konfirmerad, journaltransaktioner har skapats."
+msgstr "Kontoutdrag %s är konfirmerad, transaktioner har skapats."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4184,7 +4300,7 @@ msgstr "Månadsintervall"
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr "Check if you want to display Accounts with 0 balance too."
+msgstr "Kryssa om du vill lista konton med nollbalans också."
 
 #. module: account
 #: view:account.tax:0
@@ -4200,17 +4316,17 @@ msgstr "Standardmoms"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "End of Fiscal Year Entry"
+msgstr "Avslutning av räkenskapsårsverifikat"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr "Periodisk processering"
+msgstr "Återkommande handläggning"
 
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Du kan inte skapa objekttransaktioner med rubrikkonton."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4219,7 +4335,7 @@ msgid ""
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
 "Nya affärshändelserader skapas i statusen 'Förslag'.\n"
-"* När alla betalningar är gjorda så övergår statusen till 'Valid'."
+"* När alla betalningar är gjorda så övergår statusen till 'Giltig'."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4239,7 +4355,7 @@ msgstr "Kontoplan"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Huvudtitel 1 (fet, understruken)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4260,7 +4376,7 @@ msgstr "Fakturastatistik"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Växelkurs"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4293,12 +4409,12 @@ msgstr "Inte implementerat"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Kan vara synlig?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Kontojournalval"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4328,6 +4444,9 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Sätt den här till falskt om du inte vill att mallen ska användas aktivt i "
+"guiden som genererar kontoplan från mallar, detta är användbart endast när "
+"du vill skapa kontomallen först när du fyller i dess barnmall."
 
 #. module: account
 #: view:account.use.model:0
@@ -4367,19 +4486,19 @@ msgstr "Skatt inkluderad i pris"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Objektkostnadskontohuvudbok för journalrapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Mallar för återkommande transaktioner"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "Fel vid avkodning"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4412,7 +4531,7 @@ msgstr "Det fungerar som standardkonto för kreditbelopp"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Bokför journaltransaktioner"
+msgstr "Bokför verifikat"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4429,7 +4548,7 @@ msgstr "Utgående balans på kassalåda"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Example"
-msgstr ""
+msgstr "Exempel"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828
@@ -4451,14 +4570,14 @@ msgstr "Om blankt används intäktskontot"
 #: code:addons/account/account.py:3299
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Inköpsmoms %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Skapa transaktioner"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4499,11 +4618,14 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Kunde inte skapa transaktion med annan valuta än den sekundära för kontot "
+"\"% s -% s\". Rensa det sekundära valuta-fältet för kontodefinitionen om du "
+"vill acceptera alla valutor."
 
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4527,6 +4649,9 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
+"Alla utkast till kontotransaktioner i den här journalen och perioden kommer "
+"att godkännas. Det betyder att du inte kommer att kunna ändra något i "
+"räkenskaperna längre."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4547,7 +4672,7 @@ msgstr "Income Account on Product Template"
 #: code:addons/account/account.py:3120
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "Övr"
 
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
@@ -4558,12 +4683,12 @@ msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a' })"
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr ""
+msgstr "Datum för senaste avstämning av företagets transaktioner"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr "Nytt verksamhetsår"
+msgstr "Nytt räkenskapsår"
 
 #. module: account
 #: view:account.invoice:0
@@ -4580,7 +4705,7 @@ msgstr "Fakturor"
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Mina fakturor"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4603,7 +4728,7 @@ msgstr "Fakturerad"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Bokförda verifikat"
 
 #. module: account
 #: view:account.use.model:0
@@ -4617,6 +4742,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Bankkontonummer som skall knytas till faktureringen. Ett bolagsbankkonto om "
+"detta är en kundfaktura eller kredit från leverantör, annars en företags "
+"bankkontonummer."
 
 #. module: account
 #: view:account.state.open:0
@@ -4661,17 +4789,20 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurationsfel!\n"
+"Du kan inte definiera underkonto till ett konto med annan typ än av "
+"\"Rubrik\"! "
 
 #. module: account
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Öppningsperiod"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Verifikat att granska"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4707,7 +4838,7 @@ msgstr "Tax Application"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Journalrader"
+msgstr "Transaktioner"
 
 #. module: account
 #: code:addons/account/account.py:1088
@@ -4746,7 +4877,7 @@ msgstr "Slutdatum"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr "Bank Details"
+msgstr "Bankdetaljer"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -4754,6 +4885,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Denna rapport är en företagsanalys. En PDF-rapport som innehåller en rad per "
+"företag som representerar det kumulativa saldot."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4761,6 +4894,8 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
+"Att skriva ut objekts (eller kostnades)-journal för en viss period. "
+"Rapporten ger koden, transaktionsnamn, kontonummer,  belopp och obektbelopp."
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -4775,12 +4910,12 @@ msgstr "Saldo på kontotyp"
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "Skapa ingående balans för verksamhetsår"
+msgstr "Skapa ingående balans för ett räkenskapsår"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Bokförare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -4788,6 +4923,9 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Från denna vy kan du få en genomlysning av dina finanser. Det summerar "
+"balansen av varje enskild transaktion som görs på likviditetskonton per "
+"period."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4808,7 +4946,7 @@ msgstr "Affärshändelse"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "Försäljningsjournal denna månad"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4824,12 +4962,12 @@ msgstr "Pris"
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Att stänga"
 
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Början på periodens datum"
 
 #. module: account
 #: code:addons/account/account.py:1351
@@ -4839,9 +4977,9 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"You can not modify a posted entry of this journal !\n"
-"You should set the journal to allow cancelling entries if you want to do "
-"that."
+"Du kan inte ändra ett bokfört verifikat !\n"
+"Du måste tillåta i journalen att avbryta verifikat om du skall kunna göra "
+"detta."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -4914,7 +5052,7 @@ msgstr "Vald affärshändelse"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 dagar"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4931,7 +5069,7 @@ msgstr "Betalningar"
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Backberäknings kod"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4957,13 +5095,17 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Denna boolean hjälper dig att välja om du vill föreslå för användaren att "
+"koda försäljning och inköpsnivåer eller välja från listan av skatter. Det "
+"sista valet förutsätter att uppsättningen av skatt definieras på den här "
+"mallen är klar"
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Kontorapport"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -4975,6 +5117,7 @@ msgstr "Column Name"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Denna rapport ger en överblick av situationen för dina allmänna journaler"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5016,7 +5159,7 @@ msgstr "månad"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Nästa företag att stämma av"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -5039,12 +5182,12 @@ msgstr "Balansräkning"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr ""
+msgstr "Huvudbok"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Kontrollera datum i perioden"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5095,7 +5238,7 @@ msgstr "Försäljning"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5120,7 +5263,7 @@ msgstr "Belopp"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr "Validering"
+msgstr "Granskning"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5131,7 +5274,7 @@ msgstr "Tax on Children"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Förlaga för skatteregion"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5141,12 +5284,12 @@ msgstr "Tillåt makulering av post"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Koefficient för föräldern"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "Objektkonton som passerat tidsfristen."
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5183,7 +5326,7 @@ msgstr "Objektposter statistikKredit ber"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Bank och kontant"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5232,7 +5375,7 @@ msgstr "Startdatum"
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Allmän kontorapport"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -5249,7 +5392,7 @@ msgstr "Objektsredovisning"
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Inkludera ingående balans"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5262,7 +5405,7 @@ msgstr "Återbetalning till kund"
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
-msgstr ""
+msgstr "Du kan inte skapa mer än en transaktion per period i huvudboken."
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5280,7 +5423,7 @@ msgstr "Rapport som visar fakturor som skapats de senaste 15 dagarna"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  Antal dagar: 14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -5303,7 +5446,7 @@ msgstr "Configuration Error !"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Summa att betala"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5312,6 +5455,8 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Detta är de återstående företagen som bör kontrolleras om det finns något "
+"att stämma av eller inte. Denna siffra betecknar företaget som redan avstämt."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5365,7 +5510,7 @@ msgstr "Objektkonton"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Kundfakturor och kreditfakturor"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5387,7 +5532,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr ""
+msgstr "Rader att balansera"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5412,12 +5557,12 @@ msgstr "Nummer (Affärshändelse)"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "Objekttransaktioner från de senaste 7 dagarna"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Normal text"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5430,6 +5575,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Antal delbelopp som tillsammans kan balansera ett belopp för automatisk "
+"avstämning"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5459,6 +5606,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Om inga ytterligare uppgifter skall registreras i ett räkenskapsår, kan du "
+"stänga det här. Det kommer att stänga alla öppna perioder i år som kommer "
+"att göra det omöjligt att skapa nya transaktioner. Stäng ett räkenskapsår "
+"när det är dags att göra årets resultat definitivt. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5468,7 +5619,7 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr "With Currency"
+msgstr "Med valuta"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5478,7 +5629,7 @@ msgstr "Öppna kassalåda"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatisk formattering"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5487,6 +5638,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Inget räkenskapsår definierat för detta datum!\n"
+"Vänligen skapa ett från konfiguration i bokföringsmenyn."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5512,7 +5665,7 @@ msgstr "Fakturainformation"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Automatisk kontoavstämning"
 
 #. module: account
 #: view:account.move:0
@@ -5535,7 +5688,7 @@ msgstr "Skapa ingående balanser"
 #: code:addons/account/account_move_line.py:759
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "Redan avstämd!"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5545,12 +5698,12 @@ msgstr "Beräkningsmetod för moms."
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Förfallodatumberäkning"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr "Skapat datum"
+msgstr "Registreringsdatum"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -5568,7 +5721,7 @@ msgstr "Underliggande konton"
 #: code:addons/account/account_move_line.py:1214
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Transaktions namn (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5609,7 +5762,7 @@ msgstr "Mars"
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "Account Template"
+msgstr "Kontomall"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -5640,18 +5793,18 @@ msgstr "Värdering"
 #: code:addons/account/report/account_partner_balance.py:301
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Fordrings- och skuldkonton"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Fiskal mappning"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "Kontots status öppen"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5675,6 +5828,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Från denna vy, har en analys av dina olika finansiella konton. Dokumentet "
+"visar din debet och kredit att ta i beaktande vissa kriterier som du kan "
+"välja med hjälp av sökverktyget."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5683,6 +5839,9 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
+"Skattekoderna beror på skattedeklarationens utseende i ditt land. OpenERP "
+"tillåter en egen definition av strukturen vilket sker i  den här menyn. Du "
+"kan definiera både numeriska och alfanumeriska skattekoder."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5690,6 +5849,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Visar de framsteg som gjorts idag i avstämningsproceseen med avseende på\n"
+"företag avstämda idag \\ (Återstående företag + Avstämda företag Idag)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5698,6 +5859,10 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Välj här typen av utvärdering att knyta till denna betalningstransaktion. "
+"Observera att sista transaktionen bör vara av typen 'balans' för att "
+"säkerställa hela beloppet du bör ha din sista raden med den typ \"Balance\" "
+"för att säkerställa att hela beloppet kommer behandlas."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5736,37 +5901,37 @@ msgstr "Filtrera efter"
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Du har fel uttryck \"%(...)s\" i din mall !"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "Transaktionsdatum"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1155
 #: code:addons/account/account_move_line.py:1238
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr "You can not use an inactive account!"
+msgstr "Du kan inte använda ett inaktivt konto!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:830
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
-msgstr "Entries are not of the same account or already reconciled ! "
+msgstr "Verifikat är inte knutna till samma konto eller är redan avstämda ! "
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Beräknad balans baserad på ingående balans och transaktioner"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "Aktuell valuta är inte konfigurerad korrekt !"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5778,7 +5943,7 @@ msgstr "Invoice Tax Account"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Konto huvudbok"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5791,18 +5956,18 @@ msgstr "Antal dagar"
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr "Invalid action !"
+msgstr "Felaktig åtgärd!"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr ""
+msgstr "Period: %s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "Granska de finansiella journalerna"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5836,7 +6001,7 @@ msgstr "Återbetalningar till kund"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Främmande balans"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5872,19 +6037,19 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Pågående prenumeration"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Fiscal Position Remark :"
+msgstr "Anteckning skatteregion :"
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Objektanalys"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5898,6 +6063,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurationsfel !\n"
+"Du kan inte definiera underkonton till ett konto med annan typ än "
+"\"Rubrik\"! "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -5905,6 +6073,8 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Denna journal kommer att skapas automatiskt för detta bankkonto när du "
+"sparar posten"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5925,11 +6095,15 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"Denna vy kan användas av bokförare för att snabbt registrera poster i "
+"OpenERP. Om du vill rgistrera en leverantörsfaktura, börja med att "
+"registrera raden för kostnadskontot. OpenERP kommer att föreslå automatiskt "
+"Skatt hänförlig till detta konto och motkonto för  leverantörsskulder."
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr "Datum skapad"
+msgstr "Registreringsdatum"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -5947,6 +6121,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Så snart avstämning är gjord, blir faktureringsstatus \"klar\" (eg betalad) "
+"i systemet."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5977,7 +6153,7 @@ msgstr "This is a model for recurring accounting entries"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Försäljningsskatter(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5994,7 +6170,7 @@ msgstr "Rapport konfiguration"
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr "Tax Type"
+msgstr "Skattetyp"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
@@ -6010,6 +6186,10 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Denna boolean hjälper dig att välja om du vill föreslå för användaren att "
+"koda försäljning och priser köper eller använder de vanliga M2O fälten. Det "
+"sista valet förutsätter att uppsättningen av skatt som definierats för den "
+"valda mallen är klar"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6024,12 +6204,12 @@ msgstr "Företag"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Öppna och betalade fakturor"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Visar underliggare utan trädstruktur"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6038,6 +6218,8 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Du kan inte ta bort / avaktivera ett konto som är knutet till kund eller "
+"leverantör."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6067,7 +6249,7 @@ msgstr "Verksamhetsår"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "Partial Reconcile Entries"
+msgstr "Delvis avstämda verifikat"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6122,7 +6304,7 @@ msgstr "Fordringar"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Bolaget måste överenstämma för alla konton och perioder."
 
 #. module: account
 #: view:account.invoice:0
@@ -6167,13 +6349,13 @@ msgstr "Journal & företag"
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr "Power"
+msgstr "Kraft"
 
 #. module: account
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Kan inte generera en oanvänd journalkod."
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6198,7 +6380,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Avstämning: gå till nästa företag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6209,7 +6391,7 @@ msgstr "Inverterad objektbalans"
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr "Applicable Type"
+msgstr "Tillämplig typ"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
@@ -6238,7 +6420,7 @@ msgstr "Likviditet"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Analysjournal transaktioner"
+msgstr "Objekttransaktioner"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6265,6 +6447,9 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Från denna vy, har en analys av dina olika objektposter efter den struktur "
+"av objektkonton som passar för ditt företags verksamhet. Använd sökverktyget "
+"för att analysera information om objekten som genereras i systemet."
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -6274,7 +6459,7 @@ msgstr "Journalnamnet måste vara unikt per företag!"
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Skapa (valfritt)"
 
 #. module: account
 #: code:addons/account/account.py:664
@@ -6283,6 +6468,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"D kan inte ändra kontots bolag för ett konto som det redan registrerats "
+"transaktioner på."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6298,11 +6485,6 @@ msgstr "Registrera startdatum !"
 msgid "Supplier Refund"
 msgstr "Återbetalning till leverantör"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6344,7 +6526,7 @@ msgstr "Skrivskyddad"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  Utvärdera: balans"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -6363,7 +6545,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Har standardbolag"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6385,12 +6567,12 @@ msgstr "Objektjournal"
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr ""
+msgstr "Du kan inte avaktivera ett konto som innhar transaktioner."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Avstämd"
 
 #. module: account
 #: report:account.invoice:0
@@ -6411,13 +6593,13 @@ msgstr "Utgiftskategorikonto"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Kontanttransaktioner"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr "Invoice is already reconciled"
+msgstr "Fakturan redan avstämd"
 
 #. module: account
 #: view:account.account:0
@@ -6435,30 +6617,30 @@ msgstr "Anteckningar"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Objektstatistik"
 
 #. module: account
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "Du kan inte radera ett konto som har transaktioner."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
 #: code:addons/account/account_move_line.py:933
 #, python-format
 msgid "Entries: "
-msgstr "Entries: "
+msgstr "Verifikat: "
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Skapa manuella återkommande verifikat i en vald journal."
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Valuta på relaterade kontojournaler"
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6477,13 +6659,19 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"Kontotyp används för att bestämma hur ett konto används i varje journal. Den "
+"uppskov metoden för en kontotyp avgör processen för årsbokslutet. Rapporter "
+"såsom balansräkningen och resultaträkningen använder kategorin (vinst / "
+"förlust eller balansräkning). Till exempel kan kontotyp vara kopplat till "
+"ett tillgångskonto, kostnad konto eller betalas konto. Från denna vy kan du "
+"skapa och hantera kontotyper du behöver för ditt företag."
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Balansräkning (tillgångar)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6492,24 +6680,26 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Bankavstämning består av verifiering att dina bankutdrag överenstämmer med "
+"transaktioner (eller poster) för det kontot i bokföringen."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "Preleminär status"
 
 #. module: account
 #: view:account.move.line:0
 #: code:addons/account/account_move_line.py:1043
 #, python-format
 msgid "Total debit"
-msgstr "Total debit"
+msgstr "Total debet"
 
 #. module: account
 #: code:addons/account/account_move_line.py:808
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "Entry \"%s\" is not valid !"
+msgstr "Verifikat \"%s\" är inte giltigt !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6549,7 +6739,7 @@ msgstr "Pythonkod"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Verifikat i aktuell period"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6557,23 +6747,25 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Kryssa denna ruta om du vill tillåta att avbryta transaktioner eller "
+"fakturor knutna till denna journal"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Create"
+msgstr "Skapa"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Create entry"
+msgstr "Skapa post"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Resultaträkning (Utgifter)"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6604,17 +6796,17 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
-msgstr "Error !"
+msgstr "Fel !"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Stil för ekonomiska rapporter"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Bevara balanstecknet"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -6633,7 +6825,7 @@ msgstr "Printed"
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "Error :"
-msgstr ""
+msgstr "Fel :"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6654,12 +6846,17 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"För att en faktura skall anses som betald, måste fakturauppgifterna förenas "
+"med motparter, vanligen betalningar. Med automatisk "
+"avstämningsfunktionaliteten gör OpenERP en egen sökning efter poster som är "
+"avstämningsbara i en serie av konton. Den finner poster för varje företag "
+"för de belopp som passar."
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Att granska"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -6669,6 +6866,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Om du valt att filtrera på datum eller period, så tillåter detta fält att "
+"lägga till en rad med beloppen för debet/kredit/balans som föregår valt "
+"filter."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6677,12 +6877,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Verifikat"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Visa huvudbok med ett företag per sida"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1218
@@ -6692,6 +6892,10 @@ msgid ""
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Du kan inte göra denna ändring på en avstämd transaktion! Du kan bara ändra "
+"vissa icke bokföringsinformation eller så måste du göra transaktionen "
+"oavstämd först!\n"
+"% s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6699,7 +6903,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
-msgstr ""
+msgstr "JRNL"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6708,6 +6912,8 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
+"Denna rapport är en företagsanalys. Det är en PDF-rapport som innehåller en "
+"rad per företag som representerar det kumulativa saldot"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6738,18 +6944,19 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "All Entries"
+msgstr "Alla poster"
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fel: Standardmåttenheten och inköpsmåttenheten måste vara i samma kategori."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Journalval"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6757,7 +6964,7 @@ msgstr ""
 #: code:addons/account/account.py:432
 #, python-format
 msgid "Opening Balance"
-msgstr ""
+msgstr "Ingående balans"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6783,7 +6990,7 @@ msgstr "Huvudbok"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Betalordern är skickat till banken."
 
 #. module: account
 #: view:account.balance.report:0
@@ -6792,6 +6999,8 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Denna rapport kan du skriva ut eller generera en pdf av din balansomslutning "
+"så att du snabbt kontrollera saldot på alla dina konton i en enda rapport"
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6799,6 +7008,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Kryssa denna ruta om det finns oklarheter på detta verifikat och du vill "
+"märka det 'att granskas av bokföringsexpert'."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6823,6 +7034,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
 #: report:account.analytic.account.cost_ledger:0
@@ -6849,16 +7063,19 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
+"Du kan ange år, månad och datum i namnet på mallen med följande etiketter:\n"
+"\n"
+"%(year)s: anger år\n"
+"%(month)s:  anger månad\n"
+"%(date)s:  anger aktuellt datum\n"
+"\n"
+"t ex Min mall  på %(date)s"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
+"En hänvisning till det dokument som genererade denna faktureringsrapport."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6892,7 +7109,7 @@ msgstr "Avskrivning belopp"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Försäljning"
 
 #. module: account
 #: view:account.journal.column:0
@@ -6916,11 +7133,15 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
+"Konfigurera ditt bolagsbankkonto och välja ut dem som måste finnas på "
+"sidfoten i rapporter. Du kan ordna banker i listvyn. Om du använder "
+"bokföringsmodulen av OpenERP kommer journaler och konton skapas automatiskt "
+"baserat på dessa uppgifter."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Ett kontoutdrag med manuella verifikat får status utkast"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6932,18 +7153,24 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"Kassaflödesanalysen är en mer utförlig redovisning av dina fordringar per "
+"intervall. När du öppnar denna rapport OpenERP anger du bolaget, "
+"räkenskapsperioden och storleken av intervallet som skall analyseras (i "
+"dagar). OpenERP beräknar sedan en tabell över tillgodohavande per period. Så "
+"om du begär ett intervall på 30 dagar genereras en analys av borgenärerna "
+"för den senaste månaden, senaste två månaderna, och så vidare. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: account
 #: code:addons/account/account.py:1432
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "Du kan inte radera ett bokfört verifikat \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -6951,17 +7178,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Ej avstämda transaktioner"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Avstämning kontoutdrag"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Bokföringsrapport"
 
 #. module: account
 #: report:account.invoice:0
@@ -6971,7 +7198,7 @@ msgstr "Skatter:"
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Skatter av typen procent, ange % kvoten mellan 0-1."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6981,18 +7208,22 @@ msgid ""
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
+"En återkommande post är en diversepost som sker regelbundet från ett visst "
+"datum, det vill säga motsvarande undertecknandet av ett kund eller "
+"leverantörsavtal. Med skapa återkommande händelser, kan du skapa sådana "
+"automatiserade inlägg i systemet."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hierarki för finansiella rapporter"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Produktenhet"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -7002,6 +7233,10 @@ msgid ""
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
 msgstr ""
+"Med ett kassaregister kan du hantera kontantposter i din kontantjournal. Den "
+"här funktionen ger ett enkelt sätt att följa upp kontantbetalningar på en "
+"daglig basis. Du kan ange de mynt och kontantslag som finns i din kassalåda, "
+"och sedan skapa en dagjournal som speglar händelserna i kassalådan."
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7015,7 +7250,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Månatlig omsättning"
 
 #. module: account
 #: view:account.move:0
@@ -7037,7 +7272,7 @@ msgstr "Account Tax Template"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Är du säker på att du vill öppna verifikatet?"
 
 #. module: account
 #: view:account.state.open:0
@@ -7058,7 +7293,7 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Ingående balans utgiftskonton"
 
 #. module: account
 #: code:addons/account/account_move_line.py:999
@@ -7069,11 +7304,11 @@ msgstr "Accounting Entries"
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Parent Account Template"
+msgstr "Överliggande kontomall"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "Installera din kontoplan"
 
 #. module: account
@@ -7087,7 +7322,7 @@ msgstr "Bokföringsutdrag"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Det fungerar som standardkonto för debetbelopp"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7095,16 +7330,18 @@ msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
+"Du kan söka efter enskilda verifikat via godtycklig information. För att "
+"söka efter verifikat, öppna en journal, och välj sedan en rad."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Bokförda poster"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "För procent, ange ett förhållande mellan 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7117,7 +7354,7 @@ msgstr "Fakturadatum"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Gruppera årsvis på fakturadatum"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7127,7 +7364,7 @@ msgstr "Kundens totala skuld"
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7152,14 +7389,14 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
-"Check this box to determine that each entry of this journal won't create a "
-"new counterpart but will share the same counterpart. This is used in fiscal "
-"year closing."
+"Kryssa denna ruta för att förhindra att journalen skapar nya motparter för "
+"sina transaktioner utan knyter dem till en och samma. Detta används vid "
+"bokslut."
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Stängt på"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -7169,7 +7406,7 @@ msgstr "Bank Statement Line"
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
@@ -7179,7 +7416,7 @@ msgstr "Standardmoms för inköp"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Ingående balans intäktskonton"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7193,24 +7430,24 @@ msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 msgstr ""
-"This field is only used if you develop your own module allowing developers "
-"to create specific taxes in a custom domain."
+"Detta fält används endast då du utvecklat din egen modul som implementerar "
+"specifika skatteregler i en anpassad domän."
 
 #. module: account
 #: code:addons/account/account.py:1088
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Du måste välja perioder knutna till samma bolag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "Granska betalningsvillkoren"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "Name of new entries"
+msgstr "Namn på nya verifikat"
 
 #. module: account
 #: view:account.use.model:0
@@ -7220,12 +7457,12 @@ msgstr "Skapa poster"
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Bankinformation"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "Rapportering"
+msgstr "Rapporter"
 
 #. module: account
 #: code:addons/account/account_move_line.py:759
@@ -7237,17 +7474,17 @@ msgstr "Rapportering"
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
-msgstr "Warning"
+msgstr "Varning"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Avtal/objektkonto"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Stäng kassalåda"
 
 #. module: account
 #: view:account.journal:0
@@ -7268,6 +7505,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"I det här fältet visar nästa företag som automatiskt kommer att väljas av "
+"systemet för att gå igenom avstämningsprocessen, baserad på förra "
+"avstämningstillfället."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7283,13 +7523,13 @@ msgstr "Domän"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Använd mall"
 
 #. module: account
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Obenägen att anta ingående balans (negativt värde)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7299,6 +7539,10 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Denna vy används av bokförare för att registrera uppgifter i mängd i "
+"OpenERP. Om du villregistrera en leverantörsfaktura, börja med att "
+"registrera raden för kostnadskonto,  OpenERP föreslå då  Skatt hänförlig "
+"till detta konto och motkonto för  leverantörsskulder."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7310,29 +7554,29 @@ msgstr "Fakturarad"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Kund och leverantörsäterbetalning"
 
 #. module: account
 #: field:account.financial.report,sign:0
 msgid "Sign on Reports"
-msgstr "Sign on Reports"
+msgstr "Tecken på rapporten"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "Perioderna som skapar ingående balanser saknas"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Root-vy"
 
 #. module: account
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
@@ -7345,7 +7589,7 @@ msgstr "PRO-FORMA"
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Obalanserad"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7356,7 +7600,7 @@ msgstr "Normal"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-postmallar"
 
 #. module: account
 #: view:account.move.line:0
@@ -7367,7 +7611,7 @@ msgstr "Valfri information"
 #: code:addons/account/wizard/account_fiscalyear_close.py:84
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "The journal must have default credit and debit account"
+msgstr "Journalen måste ha standard kredit och debet-konton"
 
 #. module: account
 #: report:account.general.journal:0
@@ -7377,7 +7621,7 @@ msgstr ":"
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr "At Date"
+msgstr "Vid datum"
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -7385,16 +7629,18 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Detta fält används för leverantörsskulds- och kundfordrings-verifikat. Du "
+"kan sätta sista betalningsdag för denna rad."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Fler-valuta"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Förfallodag"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -7406,13 +7652,13 @@ msgstr "Bad account !"
 #: code:addons/account/account.py:3108
 #, python-format
 msgid "Sales Journal"
-msgstr "Sales Journal"
+msgstr "Försäljningsjournal"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr ""
+msgstr "Öppna transaktioner !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7423,13 +7669,13 @@ msgstr "Fakturaskatt"
 #: code:addons/account/account_move_line.py:1277
 #, python-format
 msgid "No piece number !"
-msgstr "No piece number !"
+msgstr "Stycknummer saknas !"
 
 #. module: account
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Hierarki för kontorapporten"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7440,11 +7686,16 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Detta valfria fält ger dig möjlighet att koppla en kontomall för en viss "
+"kontoplansmall som kan avvika från kontoplanen rotkontot tillhör. Detta gör "
+"att du kan definiera kontoplanmallar som utökar befintliga mallar med endast "
+"de nya kontona  (Du behöver inte definiera hela strukturen som är gemensam "
+"för båda flera gånger)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Icke bokförda verifikat"
 
 #. module: account
 #: view:product.product:0
@@ -7455,7 +7706,7 @@ msgstr "Sales Properties"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Manuell avstämning"
 
 #. module: account
 #: report:account.overdue:0
@@ -7473,13 +7724,13 @@ msgstr "Till"
 #: code:addons/account/account.py:1518
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Valutajusteringar"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to close"
-msgstr "Fiscal Year to close"
+msgstr "Räkenskapsår att stänga"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -7492,6 +7743,8 @@ msgstr "Avbryt valda fakturor"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Detta fält används för att generera juridiska rapporter: resultaträkning, "
+"balansräkning."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7501,6 +7754,10 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Betalningsvillkor fastställer de villkor för att betala en kund- eller "
+"leverantörs-faktura i en eller flera betalningar. Kunder återkommande "
+"påminnelser kommer att använda betalningsvillkor för varje utskick. Varje "
+"kund eller leverantör kan tilldelas ett av dessa betalningsvillkor."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7521,13 +7778,13 @@ msgstr "Maj"
 #: code:addons/account/report/account_partner_balance.py:299
 #, python-format
 msgid "Payable Accounts"
-msgstr "Payable Accounts"
+msgstr "Skuldkonton"
 
 #. module: account
 #: code:addons/account/account_invoice.py:732
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
-msgstr ""
+msgstr "Globala skatter definierade, men de saknas på fakturaraderna !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7539,18 +7796,18 @@ msgstr "Mall för kontoplan"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "Numreringsfältet används för stigande sortering"
 
 #. module: account
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Case Code"
+msgstr "Ärendekod"
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Bokför verifikat"
 
 #. module: account
 #: view:product.product:0
@@ -7560,7 +7817,7 @@ msgstr "Utgående moms"
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Rapportnamn"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7599,7 +7856,7 @@ msgstr "UserError"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Betalning av fakturor"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7619,17 +7876,17 @@ msgstr "Sekvens"
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva kategorier"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "Möjliga kvantitetstillägg på transaktionerna."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Överliggande rapport"
 
 #. module: account
 #: view:account.state.open:0
@@ -7639,12 +7896,12 @@ msgstr "Ja"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Försäljning per kontotyp"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Länk till automatiskt genererade transaktioner."
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7660,6 +7917,10 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
+"Här kan du anpassa en befintlig Journalvy eller skapa en ny vy. Journalvyer "
+"avgör hur du kan visa transaktioner i din journal. Markera de fält som du "
+"vill ska visas i en journal och bestäm i vilken ordning de skall visas. "
+"Därefter kan du skapa en ny journal och länka vyn till den."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7669,12 +7930,12 @@ msgstr "Tillgång"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dagar    "
 
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Utgående balans"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7696,7 +7957,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Myndighetsrapporter"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7717,7 +7978,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Kassarad"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7802,7 +8063,7 @@ msgstr "Välj valuta för fakturan"
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "Bankkontot definierat på vald kontoplan saknar kod."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7814,12 +8075,12 @@ msgstr "Kan inte %s för preliminär-, proforma- eller makuleradfaktura."
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Inga faktura rader !"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Rapporttyp"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -7861,12 +8122,14 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Kontoutdragets balans är felaktig!\n"
+"Det förväntade saldot (%.2f) avviker från det beräknade. (% .2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr "The account entries lines are not in valid state."
+msgstr "Kontots transaktioner är inte giltiga."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -7878,6 +8141,12 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Den vanliga kontoplanen har en struktur som definieras av lokala riktlinjer "
+"i landet. Den objektkontoplanens struktur speglar i stället dina egna "
+"affärsbehov av exempelvis intäkts/kostnads och lönsamhetsrapporter. De är "
+"oftast strukturerade av avtal, projekt, produkter eller "
+"kostnadsställen/avdelningar. De flesta affärssystemsfunktionerna genererar "
+"analytiska uppgifter även på objektkonton."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7893,7 +8162,7 @@ msgstr "Fakturan '%s' är betald"
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Automatisk post"
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -7913,7 +8182,7 @@ msgstr ""
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr ""
+msgstr "Kryssa denna ruta om kontot tillåter avstämning av transaktioner."
 
 #. module: account
 #: help:account.period,state:0
@@ -7921,6 +8190,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"När månaliga perioder skapas. Status är 'preleminärt'. I slutet av en månad "
+"är den i 'klar'-status."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -7941,7 +8212,7 @@ msgstr "Objektposter"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "Denna månads försäljning per typ"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -7973,18 +8244,28 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * \"Utkast\"-status  används när en användare matar in en ny och obekräftad "
+"faktura.\n"
+"* \"Pro-forma\"-status när fakturan är i Pro-forma tillstånd och fakturan "
+"inte har ett fakturanummer.\n"
+"* Det \"Öppna\" tillståndet används när användaren skapat en faktura och ett "
+"fakturanummer genererats. Den stannar i öppet läge tills användaren betalar "
+"eller inte inte betalar faktura.\n"
+"* \"Betalat\"-status  ställs in automatiskt när fakturan är betald. Dess "
+"närstående transaktioner kan eller inte kan stämmas av.\n"
+"* \"Avbruten\"-status  används när användaren avbryter en faktura."
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Totalt kvarvarande"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "Fakturans status är öppen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7993,6 +8274,9 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"Skattetabellen används för att generera den periodiska skatterapporten. Du "
+"kommer se skatt med koder relaterade till finansiella rapporter för ditt "
+"land."
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
@@ -8004,12 +8288,12 @@ msgstr "Kontoplan saknas för detta företag, du måste skapa en."
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "JC/Affärshändelsenamn"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -8020,7 +8304,7 @@ msgstr "Välj verksamhetsår"
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Inköpskreditjournal"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8030,12 +8314,12 @@ msgstr "For Tax Type percent enter % ratio between 0-1."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Aktuella konton"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Gruppera på fakturadatum"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8043,6 +8327,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Ändra faktura: Avbryter den aktuella fakturan och skapar en ny kopia av den "
+"klar för redigering."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8075,6 +8361,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totalt belopp (i bolaget valuta) för transaktioner som hölls i sekundära "
+"valutan för det här kontot."
 
 #. module: account
 #: report:account.invoice:0
@@ -8084,7 +8372,7 @@ msgstr "Nettototal:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Vanliga rapporter"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -8112,6 +8400,8 @@ msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"Du kan inte avbryta en faktura som är delvis betalt! Du måste göra redan "
+"gjorda betalningstransaktioner ogjorda!"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8121,7 +8411,7 @@ msgstr "Intäktskontokategori"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Justerad balans"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8142,7 +8432,7 @@ msgstr "Tax/Base Amount"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  Värde: procent"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8152,6 +8442,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"Med återbetalning till kund kan du hantera kreditfakturor för dina kunder. "
+"En återbetalning är ett dokument som krediterar en faktura helt eller "
+"delvis. Du kan enkelt skapa återbetalningar och balansera dem direkt från "
+"fakturaformuläret."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8217,28 +8511,30 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Du kan kryssa denna ruta för att märka denna transaktion som tvistig med det "
+"relaterade företaget"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "Partial Reconcile"
+msgstr "Delvis avstämt"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Objektkonto med omvänd balans"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Vanlig kontorapport"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "Innevarande månad"
 
 #. module: account
 #: code:addons/account/account.py:1052
@@ -8247,17 +8543,19 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"Ingen perdion definierad för detta datum: %s !\n"
+"Vänligen skapa en."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Automatisk import av bankutdrag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr ""
+msgstr "Journalvyer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8274,7 +8572,7 @@ msgstr "Kontotyper"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  Värdebelopp: uppgift saknas"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8306,11 +8604,18 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Den här knappen visas bara när fakturans status är \"betalad\" (som visar "
+"att den fullt ut är avstämd) och auto-beräknade boolean \"avstämd\" är "
+"falskt (föreställande att det inte är fallet längre). Med andra ord har "
+"fakturan blivit oavstämd och det passar inte längre i \"betald\"-"
+"tillståndet. Du bör trycka på knappen för att öppna den igen och låta den "
+"fortsätta sin normala process efter att ha löst de eventuella undantagen det "
+"kan ha skapat."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Bokföringsårets stängningsstatus"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -8335,6 +8640,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Med kundfakturor kan du skapa och hantera fakturor som utfärdas till dina "
+"kunder. OpenERP kan även generera utkast till fakturor automatiskt från "
+"kundorder eller leveranser. Det räcker då endast att bekräfta dem innan de "
+"skickas till dina kunder."
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8342,6 +8651,7 @@ msgstr ""
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"För att stänga en period, måste du först bokföra alla öppna verifikat."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8359,12 +8669,12 @@ msgstr "Företagskonton använt för denna faktura"
 #: code:addons/account/account.py:3296
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Skatt %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakter"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8382,7 +8692,7 @@ msgstr "Payment Term Line"
 #: code:addons/account/account.py:3109
 #, python-format
 msgid "Purchase Journal"
-msgstr "Purchase Journal"
+msgstr "Inköpsjournal"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8402,7 +8712,7 @@ msgstr "Skriv ut momsrapport"
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Verifikatmallrad"
 
 #. module: account
 #: view:account.invoice:0
@@ -8427,7 +8737,7 @@ msgstr "Tillåtna kontotyper (blankt för ingen kontroll)"
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Supplier Accounting Properties"
+msgstr "Leverantörsbokföringsinställningar"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8435,6 +8745,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"Återstående belopp på en fordran eller skuld från ett verifikat uttryckt i "
+"bolagets valuta"
 
 #. module: account
 #: view:account.tax.code:0
@@ -8467,7 +8779,7 @@ msgstr "Obetalda fakturor"
 #: code:addons/account/account_invoice.py:495
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr ""
+msgstr "Betalningsvillkor för leverantörer saknar betalningsvillkorsrader!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8478,7 +8790,7 @@ msgstr "Debet belopp"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Finans"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -8499,7 +8811,7 @@ msgstr "Tillåtna konton (lämna blankt om ingen kontroll skall göras)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Mallkonto räkenskapsmappning"
 
 #. module: account
 #: view:board.board:0
@@ -8532,17 +8844,17 @@ msgstr "Journalnamn"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Nästa företagsverifikat att stämma av"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Minsta texten"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Fakturor och betalningar"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8557,6 +8869,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
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8567,7 +8880,7 @@ msgstr "Utgift"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Håll tomt för alla öppna räkenskapsår"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1105
@@ -8592,6 +8905,9 @@ msgid ""
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"Du kan inte bokföra ett icke-balanserad verifikat!\n"
+"Se till att du har konfigurerat betalningsvillkor ordentligt!\n"
+"Den sista betalningsvillkorraden skall vara av typen \"Balans\"!"
 
 #. module: account
 #: view:account.account:0
@@ -8627,12 +8943,12 @@ msgstr "Valuta"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "Ger ordningsföljd som används vid listning av bankutdragrader."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Bokförare granskar verifikaten som skapas från faktureringen."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8645,6 +8961,12 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
+"Definiera bolagets räkenskapsår efter dina behov. Ett finansiellt år är den "
+"period bolagets bokslut avser (vanligtvis 12 månader). Det finansiella året "
+"brukar döpas efter den dag som det slutar. Till exempel, om ett företags "
+"räkenskapsår slutar 30:e november 2011, så allt mellan 1:a december 2010 och "
+"den 30:e november 2011 ingår, skulle året kallas RÅ 2011. Du är inte skyldig "
+"att följa den faktiska kalenderåret."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8655,13 +8977,13 @@ msgstr "Avstämda transaktioner"
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr "Contact Address"
+msgstr "Kontaktadress"
 
 #. module: account
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Fel mall !"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8671,7 +8993,7 @@ msgstr "Forcera period"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Skriv ut företagsbalansen"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8682,11 +9004,16 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"För konton som i regel är mer debeterade än krediterade och att du vill "
+"skriva ut som negativa belopp i dina rapporter bör du vända tecken på "
+"balansen, t.ex.: Utgiftskonto. Detsamma gäller för konton som är typiskt mer "
+"krediterade än debeterade och att du vill skriva ut som positiva belopp i "
+"dina rapporter, t.ex.: Intäktskonto."
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr "Kontrakt"
+msgstr "Avtal"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
@@ -8715,12 +9042,15 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
+"Detta konto används för överföring av vinst/förlust (om det är vinst: "
+"adderas beloppet, förlust minskas det). på det sätt som det beräknas på "
+"resultaträkningsrapporten."
 
 #. module: account
 #: code:addons/account/account_invoice.py:808
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Vänligen definiera ordningen på journalen knuten till fakturan."
 
 #. module: account
 #: view:account.move:0
@@ -8728,12 +9058,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Intern notering"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "Årets försäljning per typ"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8767,13 +9097,16 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Du kan här ange koefficienten som skall användas vid konsolidering av "
+"beloppen till överliggande nivå. Till exempel anger 1/-1 om du vill lägga "
+"till / subtrahera den."
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Återstående belopp"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -8784,7 +9117,7 @@ msgstr "Entry Lines"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "Granska kontoplanen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -8808,7 +9141,7 @@ msgstr "Period från och med"
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Kreditjournal"
 
 #. module: account
 #: view:account.move:0
@@ -8820,7 +9153,7 @@ msgstr "Information"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Registrerad betalning"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -8855,7 +9188,7 @@ msgstr "Inköpsmoms(%)"
 #: code:addons/account/account_invoice.py:810
 #, python-format
 msgid "Please create some invoice lines."
-msgstr "Vänligen skapa några faktura rader."
+msgstr "Vänligen skapa några fakturarader."
 
 #. module: account
 #: report:account.overdue:0
@@ -8865,13 +9198,13 @@ msgstr "Dear Sir/Madam,"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Visa detaljer"
 
 #. module: account
 #: code:addons/account/account.py:3118
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8890,6 +9223,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Ger vy som används när du skriver eller bläddrar bland poster i denna "
+"journal. Vyn talar om för OpenERP vilka fält som ska vara synliga, krävas "
+"eller skrivskyddas och ordningsföljden. Du kan skapa din egen vy för en "
+"snabbare kodning i varje journal."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8906,7 +9243,7 @@ msgstr "Slutdatum"
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Finansiella rapporter"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8965,7 +9302,7 @@ msgstr "Total credit"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "Bokföraren validerar verifikaten från fakturan. "
 
 #. module: account
 #: report:account.overdue:0
@@ -8990,7 +9327,7 @@ msgstr "Document: Customer account statement"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "RR / BR-kategori"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -9000,11 +9337,15 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"Med Leverantörsåterbetalning kan du hantera kreditnotor du får från dina "
+"leverantörer. En återbetalning är ett dokument som krediterar en faktura "
+"helt eller delvis. Du kan enkelt skapa kreditnotor och stämma av dem direkt "
+"i fakturaformuläret."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Fordringskonton"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@@ -9053,7 +9394,7 @@ msgstr "Vy-konton"
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "Bokslutsmetod"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9061,7 +9402,7 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "Payable"
+msgstr "Skulder"
 
 #. module: account
 #: view:report.account.sales:0
@@ -9073,7 +9414,7 @@ msgstr "Innevarande år"
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Kontoinfopanel"
 
 #. module: account
 #: view:account.model:0
@@ -9084,7 +9425,7 @@ msgstr "Radanmärkning"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Avtalsdata"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9095,6 +9436,11 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Denna vy används av bokförare för att registrera uppgifter massivt i "
+"OpenERP. Om du vill registrera en kundfaktura, välj journalen och perioden "
+"under verktygsfältet. Börja sedan registreringen med raden för intäktskonto. "
+"OpenERP kommer att automatiskt föreslå skatt hänförlig till detta konto och "
+"lämligt motkonto från \"kundfordringar\"."
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -9105,7 +9451,7 @@ msgstr "You must select accounts to reconcile"
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Bokföringsposter är den första inmatningen på avstämningen."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9117,6 +9463,12 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Här kan du definiera en räkenskapsperiod, ett tidsintervall i bolagets "
+"räkenskapsår. En redovisningsperiod är typiskt en månad eller ett kvartal. "
+"Det motsvarar vanligtvis de perioder som bolaget skall redovisa i sin "
+"skattedeklaration. Skapa och hantera perioder härifrån och besluta om en "
+"period bör stängas eller lämnas öppen beroende på företagets verksamhet "
+"under en viss period."
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -9150,12 +9502,12 @@ msgstr ""
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "Objektverifikat senaste 365 dagarna"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "A/C Nummer"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -9166,7 +9518,7 @@ msgstr "Bankkontoutdrag"
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
-msgstr ""
+msgstr "Skapar ett konto med vald mall under existerande förälderkonto."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9180,8 +9532,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"You have to define the bank account\n"
-"in the journal definition for reconciliation."
+"Du måste ange det bankkonto\n"
+"i journaldefinitionen för balansering."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9191,7 +9543,7 @@ msgstr "Reconciliation Transactions"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Vanlig rapport"
 
 #. module: account
 #: view:account.account:0
@@ -9212,7 +9564,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Kund och leverantörsfakturor"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9243,7 +9595,7 @@ msgstr "Subscription"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Objektbalans"
 
 #. module: account
 #: code:addons/account/account.py:412
@@ -9252,6 +9604,8 @@ msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
 msgstr ""
+"Öppnings/stängningsperiod saknas, vänligen skapa en för att sätta ingående "
+"balans!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9300,6 +9654,11 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Välj \"Försäljning\" för kundfakturorjournal. Välj \"Köp\" för "
+"leverantörsfakturajournal. Välj \"Kontant\" eller \"Banke\" för journaler "
+"som används i kund- eller leverantörsbetalningar. Välj \"Allmänt\" för "
+"diverse operationer journaler.  Välj \"öppning / stängning Situation\" för "
+"som genereras för nya räkenskapsår."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9352,6 +9711,8 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Detta indikerar att fakturan är betald och fakturans verifikat har stämts av "
+"med en eller flera betalningstransaktioner."
 
 #. module: account
 #: view:account.invoice:0
@@ -9371,7 +9732,7 @@ msgstr "Oavstämd"
 #: code:addons/account/account_invoice.py:828
 #, python-format
 msgid "Bad total !"
-msgstr "Bad total !"
+msgstr "Bristande total !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9389,6 +9750,13 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"En period är en räkenskapsperiod under vilken bokföringsposter bör "
+"registreras för redovisning verksamhet. Månatliga perioder är normen men "
+"beroende på dina behov, kan du också ha kvartalsperioder. Stänga en period "
+"kommer att göra det omöjligt att registrera nya bokföringsposter, alla nya "
+"transaktioner bör göras på följande öppna period. Stäng en period först när "
+"du inte vill registrera några nya affärshändelser och vill låsa perioden för "
+"att kunna göra bokslut och göra myndighetsrapportering."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9424,7 +9792,7 @@ msgstr "Aktiv"
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Jämförelse"
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
@@ -9444,7 +9812,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Opening/Closing Period"
+msgstr "Öppnings-/stängningsperiod"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -9489,13 +9857,15 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Välj den journal för användning vid kreditfakturor, Om du lämnar detta fält "
+"tomp, kommer samma journal att användas som för fakturan."
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Resultaträkning (intäktskonton)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9504,11 +9874,14 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Konfigurationsfel!\n"
+"Du kan inte välja en kontotyp med uppskovsmetod för annan av \"oavstämd\" "
+"för konton med interna typen \"skulder/fordringar\"! "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Verifikatmall"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9518,13 +9891,16 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Förfallodatum för verifikatet skapa från mallraden '%s' är baserad på "
+"företagets betalningsvillkor!\n"
+"Vänligen definiera ett företage på det!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr "Number"
+msgstr "Nummer"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9532,12 +9908,12 @@ msgstr "Number"
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr "General"
+msgstr "Allmän"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Objektverifikat senaste 30 dagarna"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9594,12 +9970,12 @@ msgstr "April"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Resultaträkning"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Öppna för avstämning"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -9612,11 +9988,13 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
+"Kredirfakura baseras på denna typ. Du kan inte ändra eller avbryta om "
+"fakturan redan är avstämd och bokförd"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Rubrik 2 (fet)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9647,6 +10025,9 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"Processen granskning av transaktioner kallas också \"räkenskapsbokföring\" "
+"och är processen att överföra debet och kredit från en journal till en "
+"huvudbok."
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9654,6 +10035,9 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"När ett nytt kontoutdrag skapas kommer det vara i status \"Utkast\".\n"
+"Och efter att få bekräftelse från banken att det kommer att vara i "
+"\"Bekräftat\" tillstånd."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -9671,13 +10055,15 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Denna rapport kan du skriva ut eller generera en pdf av din huvudboken med "
+"uppgifter om alla dina kontojournaler"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Vanlig"
 
 #. module: account
 #: view:account.account:0
@@ -9707,7 +10093,7 @@ msgstr "Denna månad"
 #: view:account.analytic.journal.report:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr "Select Period"
+msgstr "Välj period"
 
 #. module: account
 #: view:account.entries.report:0
@@ -9716,7 +10102,7 @@ msgstr "Select Period"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Posted"
+msgstr "Bokförd"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9751,7 +10137,7 @@ msgstr "Slutdatum"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Cancel Opening Entries"
+msgstr "Bokslutsposter"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9772,7 +10158,7 @@ msgstr "Nummerserier för verksamhetsåret"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Inga detaljer"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:102
@@ -9783,14 +10169,14 @@ msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Du kan inte skapa transaktioner på ett stängt konto"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Orealiserad vinst eller förlust"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9803,12 +10189,12 @@ msgstr "Stater"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "Automatisk e-post bekräftade fakturor"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Verifikattotal"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -9827,7 +10213,7 @@ msgstr "Total"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Journal: Alla"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -9872,22 +10258,22 @@ msgstr ""
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Skapa återkommande händelser"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Förfallodatum"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "Totala kontanttransaktionerna"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9896,6 +10282,9 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Denna siffra visar det totala antalet företag som har gått genom "
+"avstämningsprocessen i dag. Det aktuella företaget räknas som redan "
+"behandlat."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9905,7 +10294,7 @@ msgstr "Skapa månatliga perioder"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Tecken för förälder"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@@ -9922,16 +10311,17 @@ msgstr "Preleminära rapporter"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Manuell eller automatiskt skapande av betalningar från ett bankkontoutdrag"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr "Empty Accounts ? "
+msgstr "Tomma konton ? "
 
 #. module: account
 #: 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
 #: view:account.invoice:0
@@ -9946,7 +10336,7 @@ msgstr "Slutperiod"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Journalkoden måste vara unik per bolag!"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9955,6 +10345,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Detta konto kommer att användas för att värdera utgående lager för den "
+"aktuella produktkategorin med självkostnadspris"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -9968,6 +10360,9 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
+"Av denna rapport kan du få en överblick av det belopp som faktureras kunden "
+"såväl som försenad betalning. Verktygssökningen kan också användas för att "
+"anpassa dina fakturarapporter efter dina behov."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9988,7 +10383,7 @@ msgstr "Försäljningsrapport per konto"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "Kontots momsregion"
+msgstr "Kontots skatteregion"
 
 #. module: account
 #: report:account.invoice:0
@@ -10022,12 +10417,12 @@ msgstr "Leverantörsfaktura"
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Titel 3 (fet, mindre)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10037,12 +10432,12 @@ msgstr "Fakturarader"
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva analyskonton."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Verifikatnummer"
 
 #. module: account
 #: view:account.subscription:0
@@ -10056,6 +10451,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"Du kan inte ändra kontot från 'Stängt' till en annan typ som innehåller "
+"transaktioner!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10081,7 +10478,7 @@ msgstr "Intervall"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Objektjournal med poster relaterade till inköpsjournalen"
 
 #. module: account
 #: help:account.account,type:0
@@ -10092,6 +10489,10 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"\"interna Typ\" används för funktioner som finns på olika typer av konton: "
+"visa kan inte ha transaktioner, konsolidering är konton som kan ha "
+"underkonton står för koncernredovisning, skulder/fordringar är för företags "
+"konton (för debet/kredit-beräkningar ), stängt för avlutade konton."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -10133,12 +10534,12 @@ msgstr "Skriv ut objektjournal"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Gruppera månadsvis på fakturadatum"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10149,7 +10550,7 @@ msgstr "Kundreskontra, periodiserad"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Tillämplighet alternativ"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -10166,12 +10567,12 @@ msgstr "The optional other currency if it is a multi-currency entry."
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Importera kontoutdrag från leverantörs- eller kundfaktura."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr "Debitering"
+msgstr "Fakturering"
 
 #. module: account
 #: view:account.account:0
@@ -10189,6 +10590,13 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
+"Skapa och hantera ditt företags journaler från denna meny. En journal som "
+"används för att registrera transaktioner för alla redovisningsdata knutet "
+"till den dagliga verksamheten i ditt företag som använder dubbel bokföring "
+"system. Beroende på arten av sin verksamhet och antalet dagliga "
+"transaktioner kan ett företag ha flera typer av specialiserade journaler som "
+"till exempel journalen för kontantförsäljning,  inköpsjournalen och "
+"försäljningsjournalen ..."
 
 #. module: account
 #: view:account.payment.term:0
@@ -10203,7 +10611,7 @@ msgstr "Objektkontoplan"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "Remaining amount due."
+msgstr "Utestående belopp"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -10220,7 +10628,7 @@ msgstr "Bad account!"
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Poster sorterade på"
 
 #. module: account
 #: help:account.move,state:0
@@ -10231,6 +10639,11 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"Alla manuellt skapade nya verifikat är vanligtvis i statusen \"icke "
+"bokförda\", men du kan ställa in alternativet att hoppa över detta tillstånd "
+"på journalen posterna är knuten till. I så fall kommer de att bete sig som i "
+"systemet automatiskt skapade transaktioner på dokumentvalidering (fakturor, "
+"kontoutdrag ...) som skapas i \"bokfört\" tillstånd."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10255,7 +10668,7 @@ msgstr "November"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Ändra: kreditera, stäm av och skapa en ny preleminär faktura"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10265,13 +10678,13 @@ msgstr "The income or expense account related to the selected product."
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "Number of Periods"
+msgstr "Antal perioder"
 
 #. module: account
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "General Journal"
+msgstr "Transaktionslista"
 
 #. module: account
 #: view:account.invoice:0
@@ -10285,7 +10698,7 @@ msgstr "Sök faktura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Refund"
+msgstr "Återbetalning"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10360,11 +10773,78 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hej ${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"En ny faktura är tillgänglig för ${object.partner_id.name}:\n"
+"       | Fakturanummer: *${object.number}*\n"
+"       | Total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Datum: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Orderreferense: ${object.origin}\n"
+"       % endif\n"
+"       | Din kontaktperson: ${object.user_id.name} "
+"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Du kan se fakturan, ladda ned den och betala den online med denna länk:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"Du kan även betala direkt via Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Om du har några frågor, tveka inte att kontakta oss.\n"
+"\n"
+"Tack för att du valt ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Bank Accounts"
+msgstr "Bankkonton"
 
 #. module: account
 #: field:res.partner,credit:0
@@ -10383,7 +10863,7 @@ msgstr "Allmän information"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Affärshandlingar"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -10404,7 +10884,7 @@ msgstr "Fakturans status är klar."
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Så snart avstämningen är gjord, kan fakturan betalas."
 
 #. module: account
 #: view:account.account.template:0
@@ -10419,7 +10899,7 @@ msgstr "Manuell fakturaskatt"
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr "Parent Right"
+msgstr "Högerparentes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -10462,7 +10942,7 @@ msgstr "Ref."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Account Model"
+msgstr "Kontoklass"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10471,7 +10951,7 @@ msgstr "Account Model"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr "Februari"
+msgstr "februari"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -10480,6 +10960,9 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"om du anger namn annat än /, kommer dess transaktioner skapa "
+"bokföringsposter med samma namn som verifikatet. Detta tillåter "
+"transaktioner att ha samma referens som verifikatet i övrigt."
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10494,7 +10977,7 @@ msgstr "Bankkonto"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Huvudbok"
 
 #. module: account
 #: report:account.overdue:0
@@ -10509,7 +10992,7 @@ msgstr "Framtida"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Sök journaltransaktioner"
+msgstr "Sök transaktioner"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10521,7 +11004,7 @@ msgstr "Sök journaltransaktioner"
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr "Usually 1 or -1."
+msgstr "Vanligen 1 eller -1."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -10541,6 +11024,8 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"Denna etikett kommer att visas på rapporten för att visa beräknad balans för "
+"det givna jämförelsefiltret."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
@@ -10559,6 +11044,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Skapa och hantera de konton du behöver för att registrera verifikat. Ett "
+"konto är en del av en huvudbok som låter ditt företag att registrera alla "
+"typer av debet och kredit transaktioner. Företag presenterar sina "
+"årsredovisningar i två huvuddelar: den balans-och resultaträkningen "
+"(resultaträkning). Den årliga redovisning för ett bolag är skyldiga enligt "
+"lag att lämna ut en viss mängd information. De måste vara certifierad av en "
+"extern revisor årligen om företaget uppfyller en av flera kriterier."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -10566,6 +11058,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+"Återstående belopp på en fordran eller skuld på ett verifikat uttryckt i sin "
+"valuta (kan skilja sig från bolagsvalutan)."
 
 #~ msgid "Value"
 #~ msgstr "Värde"
@@ -11414,6 +11908,9 @@ msgstr ""
 #~ "1. Line 1: percent 0.02 14 days\n"
 #~ "2. Line 2: balance 30 days"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generate Chart of Accounts from a Chart Template"
+
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "The statement balance is incorrect !\n"
@@ -11563,9 +12060,6 @@ msgstr ""
 #~ msgid "O_k"
 #~ msgstr "O_k"
 
-#~ msgid "Reconciliation transactions"
-#~ msgstr "Reconciliation transactions"
-
 #~ msgid "_Go"
 #~ msgstr "_Go"
 
@@ -12096,6 +12590,9 @@ msgstr ""
 #~ "The optional quantity expressed by this line, eg: number of product sold. "
 #~ "The quantity is not a legal requirement but is very usefull for some reports."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktura skapad inom 15 dagar"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "Balansräkning"
 
@@ -12140,6 +12637,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Hoppa till nästa företag"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Försäljning per kontotyp"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Fel! Su kan inte definiera överlappande bokföringsår."
 
@@ -12153,6 +12653,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Fel ! Du kan inte skapa rekursiva kategorier."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Försäljning per konto"
+
 #~ msgid "Narration"
 #~ msgstr "berättelse"
 
@@ -12396,5 +12899,33 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "Du kan inte radera ett konto med affärshändelser! "
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Kundfordringskonton"
+
 #~ msgid "Tax codes"
 #~ msgstr "Skattedeklarationsrubriker"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "Installera din kontoplan"
+
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "Öppna för oavstämning"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Intäktskonton"
+
+#~ msgid "Unreconciliate transactions"
+#~ msgstr "Oavstämda transaktioner"
+
+#~ msgid "Dashboard"
+#~ msgstr "Infopanel"
+
+#~ msgid "Cost Ledger for period"
+#~ msgstr "Kostnadsredovisning för perioden"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "Fakturabeskrivning"
+
+#~ msgid "Reconciliation transactions"
+#~ msgstr "Avstämningstransaktioner"
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 6d344889cb1..44786a8eb8f 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 3a94285df92..aa40c2a25b5 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 99c43de7ff7..7bcb63005c5 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr "ข้อมูลทางการบัญชี"
 msgid "All Analytic Entries"
 msgstr "วิเคราะห์ทุกรายการ"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "ใบแจ้งหนี้ที่สร้างขึ้นภายใน 15 วันที่ผ่านมา"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "บัญชีลูกหนี้"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr "รับผิดชอบ"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10450,6 +10411,10 @@ msgstr ""
 #~ msgid "Positive"
 #~ msgstr "ค่าเป็นบวก"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "บัญชีลูกหนี้"
+
 #~ msgid "Profit & Loss (Expense Accounts)"
 #~ msgstr "กำไรขาดทุน(บัญชีค่าใช้จ่าย)"
 
@@ -10499,6 +10464,9 @@ msgstr ""
 #~ "loss in a single document"
 #~ msgstr "งบกำไรขาดทุนทำให้คุณเห็นกำไรขาดทุนในภาพรวมของบริษัทในเอกสารฉบับเดียว"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "ใบแจ้งหนี้ที่สร้างขึ้นภายใน 15 วันที่ผ่านมา"
+
 #~ msgid "Your Reference"
 #~ msgstr "การอ้างอิงของคุณ"
 
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 25f2f14b749..b71be74a6c8 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -177,11 +177,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -663,18 +658,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1636,11 +1619,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2686,13 +2664,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3075,7 +3046,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6202,11 +6173,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6746,11 +6712,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6965,7 +6926,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 81bcee9c85a..bac7c3efaab 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgstr "Hesap Kaynağı"
 msgid "All Analytic Entries"
 msgstr "Bütün Analitik hareketler"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Son 15 Günde Oluşturulmuş Faturalar"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -693,18 +688,6 @@ msgstr "Yevmiye Dönemi"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Girişin uzlaştırılması için bütün girişler için firma aynı olmalı"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Alıcılar Hesabı"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1685,11 +1668,6 @@ msgstr "Ayrılmış Yevmiye Sıraları"
 msgid "Responsible"
 msgstr "Sorumlu"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Hesap Türüne göre Satışlar"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2785,13 +2763,6 @@ msgstr "New Company Financial Setting"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Hesaba Göre Satışlar"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3190,8 +3161,8 @@ msgstr "Hesap Planı Kartları Şablonu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6409,11 +6380,6 @@ msgstr "Enter a Start date !"
 msgid "Supplier Refund"
 msgstr "Supplier Refund"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6994,11 +6960,6 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Gelir Hesapları"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7229,7 +7190,7 @@ msgstr "Ana Hesap Şablonu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11364,6 +11325,10 @@ msgstr ""
 #~ msgid "A/c No."
 #~ msgstr "A/c No."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Alıcılar Hesabı"
+
 #~ msgid "Control Invoice"
 #~ msgstr "Fatura Kontrol Et"
 
@@ -11469,6 +11434,9 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Giriş Tarihlerini Hesapla"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Gelir Hesapları"
+
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
@@ -11627,6 +11595,9 @@ msgstr ""
 #~ "You cannot modify company of this journal as its related record exist in "
 #~ "Entry Lines"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Hesaba Göre Satışlar"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -11639,6 +11610,9 @@ msgstr ""
 #~ msgid "All periods if empty"
 #~ msgstr "All periods if empty"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generate Chart of Accounts from a Chart Template"
+
 #, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "Cannot delete invoice(s) that are already opened or paid !"
@@ -11907,6 +11881,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Account Profit And Loss Report"
 
@@ -12300,6 +12277,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Sıra alanı, kaynakları küçükten büyüğe doğru sıralamak için kullanılır."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Son 15 Günde Oluşturulmuş Faturalar"
+
 #, python-format
 #~ msgid " Journal"
 #~ msgstr " Yevmiye"
@@ -12460,6 +12440,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Sonraki paydaşa geç"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Hesap Türüne göre Satışlar"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Başlangıç bakiyelerini içer"
 
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index fb762661f43..18f4503dc69 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 1c27f910e29..5e005a010ee 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -177,11 +177,6 @@ msgstr "Джерело Рахунку"
 msgid "All Analytic Entries"
 msgstr "Всі Аналітичні Записи"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -665,18 +660,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Рахунки дебіторів"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1638,11 +1621,6 @@ msgstr "Різні Порядки Журналу"
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2688,13 +2666,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3077,7 +3048,7 @@ msgstr "Шаблони Планів Рахунків"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6205,11 +6176,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr "Повернення постачальнику"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6749,11 +6715,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Рухунки доходів"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6968,7 +6929,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -10991,5 +10952,12 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Вивірка виписки"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Рахунки дебіторів"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Рухунки доходів"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Рахунки за типом"
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 58649e5ed28..1640d64e352 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index e39ff409581..559890531fb 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:53+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgstr "Tài khoản đầu vào"
 msgid "All Analytic Entries"
 msgstr "Các bút toán quản trị"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Hoá đơn được tạo trong 15 ngày qua"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -696,18 +691,6 @@ msgstr "Chu kỳ của Sổ nhật ký"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Các tài khoản phải thu"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1691,11 +1674,6 @@ msgstr "Separated Journal Sequences"
 msgid "Responsible"
 msgstr "Chịu trách nhiệm"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Doanh số theo loại tài khoản"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2784,13 +2762,6 @@ msgstr "New Company Financial Setting"
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Doanh thu theo tài khoản"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3190,8 +3161,8 @@ msgstr "Chart of Accounts Templates"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6421,11 +6392,6 @@ msgstr "Nhập vào Ngày bắt đầu !"
 msgid "Supplier Refund"
 msgstr "Hoàn tiền cho Nhà cung cấp"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Bảng điều khiển"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -7003,11 +6969,6 @@ msgstr ""
 "\n"
 "e.g. My model on %(date)s"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Các Tài khoản Thu nhập"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7239,7 +7200,7 @@ msgstr "Parent Account Template"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -11077,6 +11038,9 @@ msgstr ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Generate Chart of Accounts from a Chart Template"
+
 #~ msgid "  value amount: n.a"
 #~ msgstr "  value amount: n.a"
 
@@ -11601,6 +11565,10 @@ msgstr ""
 #~ msgid "Are you sure ?"
 #~ msgstr "Bạn có chắc chắn?"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Các tài khoản phải thu"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
@@ -11628,6 +11596,12 @@ msgstr ""
 #~ msgid "Bank account owner"
 #~ msgstr "Chủ tài khoản ngân hàng"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Doanh số theo loại tài khoản"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Doanh thu theo tài khoản"
+
 #~ msgid "Tax codes"
 #~ msgstr "Các mã thuế"
 
@@ -11792,6 +11766,9 @@ msgstr ""
 #~ msgid "Balance Sheet (Liability Accounts)"
 #~ msgstr "Bảng cân đối kế toán (Các Tài khoản Nợ)"
 
+#~ msgid "Dashboard"
+#~ msgstr "Bảng điều khiển"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Báo cáo Tài khoản Lợi nhuận và Lỗ"
 
@@ -11802,6 +11779,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Loại tiền hiện tại không được cấu hình đúng !"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Các Tài khoản Thu nhập"
+
 #~ msgid "Period length (days)"
 #~ msgstr "Thời gian của Chu kỳ (ngày)"
 
@@ -11835,6 +11815,9 @@ msgstr ""
 #~ "Báo cáo Lãi và Lỗ cho bạn một cái nhìn tổng quan về tình trạng lãi hay lỗ "
 #~ "của công ty bạn chỉ trong một tài liệu đơn."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Hoá đơn được tạo trong 15 ngày qua"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 5fdcede3686..09b4a8b9ac4 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-05-10 17:47+0000\n"
+"PO-Revision-Date: 2012-06-20 16:17+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:55+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -177,11 +177,6 @@ msgstr "源科目"
 msgid "All Analytic Entries"
 msgstr "所有辅助核算"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "过去15天开的发票"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -666,18 +661,6 @@ msgstr "账簿的会计期间"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "要核销这些凭证，这些凭证所属公司必须一致"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "应收款科目"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1640,11 +1623,6 @@ msgstr "分散的账簿序列"
 msgid "Responsible"
 msgstr "负责人"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "销售科目类型"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2701,13 +2679,6 @@ msgstr "新公司财务设置"
 msgid "Configure Your Chart of Accounts"
 msgstr "科目表设置"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "销售科目"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3093,8 +3064,8 @@ msgstr "科目一览表模板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "从模板产生科目一览表"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6240,11 +6211,6 @@ msgstr "输入开始日期"
 msgid "Supplier Refund"
 msgstr "供应商红字发票"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "仪表盘"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6797,11 +6763,6 @@ msgstr ""
 "\n"
 "例如：日期为 %(date)s 的定期发生凭证"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "损益科目"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7020,7 +6981,7 @@ msgstr "上级科目模板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "导入会计科目表"
 
 #. module: account
@@ -10800,6 +10761,10 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Control Invoice"
 #~ msgstr "控制发票"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "应收款科目"
+
 #~ msgid "Date payment"
 #~ msgstr "付款日期"
 
@@ -11217,6 +11182,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "End of Year Treatments"
 #~ msgstr "结束会计年度处理"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "从模板产生科目一览表"
+
 #~ msgid "Select Chart"
 #~ msgstr "选择一览表"
 
@@ -11993,6 +11961,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 #~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "过去15天开的发票"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -12027,6 +11998,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "invoiced amount."
 #~ msgstr "无法建立发票！"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "销售科目类型"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "错误！你不能重复定义会计年度"
 
@@ -12042,6 +12016,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Reserve & Profit/Loss Account"
 #~ msgstr "损益类科目"
 
+#~ msgid "Sales by Account"
+#~ msgstr "销售科目"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "计算余额"
 
@@ -12324,6 +12301,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "当前的货币没设置正确！"
 
+#~ msgid "Income Accounts"
+#~ msgstr "损益科目"
+
 #~ msgid ""
 #~ "Account Voucher module includes all the basic requirements of Voucher "
 #~ "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
@@ -12601,5 +12581,11 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "科目一览表是根据贵公司所在国家的会计制度建立的。辅助核算项一览表是按贵公司管理需要或者需要查看成本/收益。一般用于管理合同、项目、产品或部门。很多Open"
 #~ "ERP业务（发票、计工单、费用报销）都会生成相关辅助核算项的记录"
 
+#~ msgid "Dashboard"
+#~ msgstr "仪表盘"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "导入会计科目表"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "发票上的描述"
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index 5358e427e3d..c4c18dd951e 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:54+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgstr ""
 msgid "All Analytic Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -664,18 +659,6 @@ msgstr ""
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1637,11 +1620,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2687,13 +2665,6 @@ msgstr ""
 msgid "Configure Your Chart of Accounts"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3076,7 +3047,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
+msgid "Set Your Accounting Options"
 msgstr ""
 
 #. module: account
@@ -6203,11 +6174,6 @@ msgstr ""
 msgid "Supplier Refund"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6747,11 +6713,6 @@ msgid ""
 "e.g. My model on %(date)s"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -6966,7 +6927,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 9a935b5ab11..de258142216 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-05 02:38+0000\n"
+"PO-Revision-Date: 2012-06-20 16:16+0000\n"
 "Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -177,11 +177,6 @@ msgstr "源科目"
 msgid "All Analytic Entries"
 msgstr "所有輔助核算"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "過去15天開的發票"
-
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
@@ -665,18 +660,6 @@ msgstr "賬簿的會計期間"
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "要核銷這些憑證，這些憑證所屬公司必須一致"
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "應收款科目"
-
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
@@ -1639,11 +1622,6 @@ msgstr "分散的賬簿序列"
 msgid "Responsible"
 msgstr "負責人"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "銷售科目類型"
-
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
@@ -2698,13 +2676,6 @@ msgstr "新公司財務設置"
 msgid "Configure Your Chart of Accounts"
 msgstr "科目表設置"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "銷售科目"
-
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
@@ -3090,8 +3061,8 @@ msgstr "科目一覽表模板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "從模板產生科目一覽表"
+msgid "Set Your Accounting Options"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
@@ -6237,11 +6208,6 @@ msgstr "輸入開始日期"
 msgid "Supplier Refund"
 msgstr "供應商紅字發票"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "儀表盤"
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6794,11 +6760,6 @@ msgstr ""
 "\n"
 "例如：日期為 %(date)s 的定期發生憑證"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "損益科目"
-
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
@@ -7017,7 +6978,7 @@ msgstr "上級科目模板"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Install your Chart of Accounts"
+msgid "Configure your Chart of Accounts"
 msgstr "導入會計科目表"
 
 #. module: account
@@ -10609,15 +10570,31 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Display accounts"
 #~ msgstr "顯示帳號"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "過去15天開的發票"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "打開反核銷"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "應收款科目"
+
 #~ msgid "Go to next partner"
 #~ msgstr "下一個業務夥伴"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "銷售科目類型"
+
+#~ msgid "Sales by Account"
+#~ msgstr "銷售科目"
+
 #~ msgid "Tax codes"
 #~ msgstr "稅編碼"
 
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "從模板產生科目一覽表"
+
 #~ msgid "Accounts by type"
 #~ msgstr "按類型劃分的科目"
 
@@ -10636,6 +10613,15 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Create an Account based on this template"
 #~ msgstr "基於此模板建立科目"
 
+#~ msgid "Dashboard"
+#~ msgstr "儀表盤"
+
+#~ msgid "Income Accounts"
+#~ msgstr "損益科目"
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "導入會計科目表"
+
 #~ msgid "Open for bank reconciliation"
 #~ msgstr "開始銀行對賬"
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 6cf52f58f6c..5a2b0b346c4 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -30,11 +30,11 @@ from tools.translate import _
 from osv import fields, osv
 import netsvc
 import tools
+_logger = logging.getLogger(__name__)
 
 class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
-    __logger = logging.getLogger(_name)
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
@@ -149,7 +149,7 @@ class account_installer(osv.osv_memory):
             cr, uid, ids, context=context)
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
-        self.__logger.debug('Installing chart of accounts %s', chart)
+        _logger.debug('Installing chart of accounts %s', chart)
         return modules | set([chart])
 
 account_installer()
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 5ed15139448..4f5e86290ee 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <group col="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
@@ -104,8 +104,8 @@
                                         <div>
                                             <field name="street" placeholder="Street..."/>
                                             <div>
-                                                <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                                <field name="city" class="oe_form_inline" placeholder="City"/>
+                                                <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                                <field name="city" class="oe_inline" placeholder="City"/>
                                             </div>
                                             <field name="state_id" placeholder="State"/>
                                             <field name="country_id" placeholder="Country"/>
@@ -114,7 +114,7 @@
                                     <group name="bank" string="Information About the Bank">
                                         <field name="bank" on_change="onchange_bank_id(bank)"/>
                                         <field name="bank_name"/>
-                                        <field name="bank_bic"/>
+                                        <field name="bank_bic" placeholder="[Identifier code]"/>
                                     </group>
                                 </group>
                             </form>
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cd1860b6d98..73bf64893ba 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,19 +9,16 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group name="properties">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
-                    <newline/>
-                    <group colspan="2">
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <separator string="Purchase Taxes" colspan="2"/>
-                        <field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
+                        <group name="properties">
+                            <group>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                            <group>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
+                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index ec89d280774..2ca0e50e784 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -3,102 +3,85 @@
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
             <field name="name" model="res.company" use="name" search="[]"/>
-            <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
-            <field name="code">1</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">2</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
-            <field name="code">100</field>
             <field name="state">open</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
-            <field name="code">101</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
-            <field name="code">102</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">4</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_in_house" model="account.analytic.account">
             <field name="name">In House</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_online" model="account.analytic.account">
             <field name="name">Online</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">support</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_partners" model="account.analytic.account">
             <field name="name">Partners</field>
-            <field name="code">partners</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_customers" model="account.analytic.account">
             <field name="name">Customers</field>
-            <field name="code">customers</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">3</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_integration" model="account.analytic.account">
             <field name="name">Integration</field>
-            <field name="code">integration</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
-            <field name="code">4</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">5</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
-            <field name="code">1</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="state">open</field>
@@ -106,7 +89,6 @@
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
@@ -114,14 +96,12 @@
         </record>
         <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
-            <field name="code">7</field>
             <field name="type">normal</field>
             <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
             <field eval="time.strftime('%Y-12-31')" name="date"/>
@@ -131,28 +111,24 @@
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
-            <field name="code">4</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
-            <field name="code">7</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
-            <field name="code">2</field>
             <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
             <field eval="time.strftime('%Y-05-08')" name="date"/>
             <field name="parent_id" ref="analytic_partners"/>
@@ -162,7 +138,6 @@
         </record>
         <record id="analytic_thymbra" model="account.analytic.account">
             <field name="name">Thymbra</field>
-            <field name="code">3</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="time.strftime('%Y-07-01')" name="date"/>
             <field name="type">normal</field>
@@ -172,7 +147,6 @@
         </record>
         <record id="analytic_leclerc" model="account.analytic.account">
             <field name="name">Leclerc</field>
-            <field name="code">10</field>
             <field eval="time.strftime('%Y-04-24')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
             <field name="type">normal</field>
@@ -181,7 +155,6 @@
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
-            <field name="code">12</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
             <field name="type">normal</field>
@@ -190,14 +163,12 @@
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
-            <field name="code">15</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
-            <field name="code">21</field>
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field name="type">normal</field>
@@ -207,67 +178,56 @@
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_2_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_1_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_project_1_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_our_super_product_development" model="account.analytic.account">
             <field name="name">Our Super Product Development</field>
-            <field name="code">3</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_stable" model="account.analytic.account">
             <field name="name">Stable</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_trunk" model="account.analytic.account">
             <field name="name">Trunk</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_paid" model="account.analytic.account">
             <field name="name">Paid</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
         <record id="analytic_unpaid" model="account.analytic.account">
             <field name="name">Unpaid</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 3d6cace4ac5..7658ab111d9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -19,6 +19,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -30,13 +31,13 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>
@@ -59,7 +60,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="code"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -71,50 +72,11 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Account" version="7.0">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name" colspan="4"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Account Data">
-                            <group>
-                                <group string="Contacts">
-                                    <field name="partner_id"/>
-                                    <field name="user_id"/>
-                                </group>
-                                <group name="contract" string="Contract Data">
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                    <field name="quantity_max"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Description">
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>
 
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
@@ -173,16 +135,16 @@
                             <field name="amount"/>
                             <label for="amount_currency"/>
                             <div>
-                                <field name="amount_currency" class="oe_form_inline"/>
-                                <field name="currency_id" class="oe_form_inline"/>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="Product Information">
                             <field name="product_id"/>
                             <label for="unit_amount"/>
                             <div>
-                                <field name="unit_amount" class="oe_form_inline"/>
-                                <field name="product_uom_id" class="oe_form_inline"/>
+                                <field name="unit_amount" class="oe_inline"/>
+                                <field name="product_uom_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="General Accounting">
@@ -210,6 +172,7 @@
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -220,16 +183,17 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group>
+                        <field name="name" string="Analytic Line"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                        <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -325,12 +289,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                  <group>
-                      <field name="code"/>
-                      <field name="name"/>
-                      <field name="type"/>
-                  </group>
-                  <newline/>
+                    <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                        <field name="type"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -392,75 +355,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-        #
-        # Statistics [where is this object in py file ?]
-        #
-
-        <!--<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.form</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">form</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Analytic Entries Stats" version="7.0">-->
-        <!--            <group col="4">-->
-        <!--                <field name="name"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--                <field name="journal_id"/>-->
-        <!--            </group>-->
-        <!--        </form>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.tree</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">tree</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <tree string="Analytic Entries Stats">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="account_id"/>-->
-        <!--            <field name="journal_id"/>-->
-        <!--            <field name="quantity"/>-->
-        <!--            <field name="revenue"/>-->
-        <!--            <field name="cost"/>-->
-        <!--        </tree>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.graph</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">graph</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <graph string="Analytic Entries Stats" type="bar">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="cost" operator="+"/>-->
-        <!--            <field name="revenue" operator="+"/>-->
-        <!--            <field group="True" name="journal_id"/>-->
-        <!--        </graph>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.search</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">search</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <search string="Analytic Entries Stats">-->
-        <!--            <group>-->
-        <!--                <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>-->
-        <!--                   <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>-->
-        <!--                   <separator orientation="vertical"/>-->
-        <!--                <field name="name"/>-->
-        <!--                   <field name="month"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--            </group>-->
-        <!--        </search>-->
-        <!--    </field>-->
-        <!--</record>-->
 
         <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index c7423675c15..6ca17a7ac0a 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -75,10 +75,10 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
         return res
 
     def _account_sum_debit(self, account, date1, date2):
-        return self._sum_debit(self, [account], date1, date2)
+        return self._sum_debit([account], date1, date2)
 
     def _account_sum_credit(self, account, date1, date2):
-        return self._sum_credit(self, [account], date1, date2)
+        return self._sum_credit([account], date1, date2)
 
     def _account_sum_balance(self, account, date1, date2):
         debit = self._account_sum_debit(account, date1, date2)
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 408e76fdcb9..da60b59a8f4 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,37 +34,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
+                <group>
+                    <field name="day" string="Day"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                            name="month"
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 30 days"/>
-                    <filter icon="terp-go-week"
-                            string="    7 Days    "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries during last 7 days"/>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
-                    <field name="user_id">
-                    <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 92906604f63..f2b0cceddc0 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -68,6 +68,10 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_maturity"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"
@@ -95,10 +99,6 @@
                     <field name="partner_id"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
                  </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 0ba4e4b6a3c..6897e15078d 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -497,7 +497,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -590,7 +590,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 79003c5aaa6..7ae5db98f20 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -505,7 +505,7 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency = company.currency_id) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
@@ -529,7 +529,7 @@
               <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
+              <para style="terp_default_7">[[ line['lref'] and strip_name(line['lref'],17) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ line['move'] ]]</para>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c464d1cfc46..452bf6d1c34 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -55,19 +55,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -84,25 +73,25 @@
                            help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal" string="Customer"
-                            name="customer"
-                            domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
-                            help="Customer Invoices And Refunds"/>
+                           name="customer"
+                           domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
+                           help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
-                            string="Supplier"
-                            domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Supplier Invoices And Refunds"/>
-                   <separator orientation="vertical"/>
-                   <filter icon="terp-dolar" string="Invoice"
-                            domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                            help="Customer And Supplier Invoices"/>
-                   <filter icon="terp-dolar_ok!"
-                            string="Refund"
-                            domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
-                            help="Customer And Supplier Refunds"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="user_id" />
-                   <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                           string="Supplier"
+                           domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
+                           help="Supplier Invoices And Refunds"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-dolar" string="Invoice"
+                           domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
+                           help="Customer And Supplier Invoices"/>
+                    <filter icon="terp-dolar_ok!"
+                           string="Refund"
+                           domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
+                           help="Customer And Supplier Refunds"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" />
+                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -136,7 +125,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 8fcb41d5ca6..0d7122369c6 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -519,7 +519,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index c61b8147a69..b878ab44e47 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -524,7 +524,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 7c5007a24fb..0d18a35b8a1 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -162,7 +162,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id,'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 587d068ca1b..c9c667ae70e 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -151,10 +151,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
@@ -217,10 +214,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index eceb1e5c760..a4538a90055 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                 <newline/>
+                <newline/>
             </search>
         </field>
     </record>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 583b769d315..3a3d247769d 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -37,19 +37,18 @@ class account_config_settings(osv.osv_memory):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'has_default_company': fields.boolean('Has default company', readonly=True),
         'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
-            string='Chart of Accounts for this Company',
+            string='This Company Has its Own Chart of Accounts',
             help="""Check this box if this company is a legal entity."""),
         'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
             string='Default Company Currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
-            string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
+            string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
-            string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."),
+            string='Bank Accounts on Reports', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure  these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         '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"),
-        'seq_journal': fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
         '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 (%)'),
@@ -78,12 +77,12 @@ class account_config_settings(osv.osv_memory):
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
         'module_account_accountant': fields.boolean('Accountant Features',
-            help="""If you do not check this box, you will be able to do Invoicing & Payments, but not accounting (Journal Items, Chart of  Accounts, ...)."""),
+            help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
         'module_account_asset': fields.boolean('Assets Management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
-                This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, 
-                but not accounting (Journal Items, Chart of Accounts, ...) """),
+                This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
+                but not accounting (Journal Items, Chart of Accounts, ...)"""),
         'module_account_budget': fields.boolean('Budget Management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
@@ -111,10 +110,12 @@ class account_config_settings(osv.osv_memory):
         'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
-        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
-        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
-        'decimal_precision': fields.integer('Decimal Precision',
-            help="""Set the decimal precision for rounding results in accounting."""),
+        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax',
+            help="This sale tax will be assigned by default on new products."),
+        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax',
+            help="This purchase tax will be assigned by default on new products."),
+        'decimal_precision': fields.integer('Decimal Precision on Journal Entries',
+            help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -128,7 +129,6 @@ class account_config_settings(osv.osv_memory):
     _defaults = {
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
-        'seq_journal': True,
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period': 'month',
@@ -237,7 +237,6 @@ class account_config_settings(osv.osv_memory):
                 'company_id': config.company_id.id,
                 'chart_template_id': config.chart_template_id.id,
                 'code_digits': config.code_digits or 6,
-                'seq_journal': config.seq_journal,
                 'sale_tax': config.sale_tax.id,
                 'purchase_tax': config.purchase_tax.id,
                 'sale_tax_rate': config.sale_tax_rate,
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 24c7887bdfe..a27513a9f0c 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,53 +17,66 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <field name="has_default_company" invisible="1" />
-                        <field name="has_chart_of_accounts" invisible="1"/>
-                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                    <sheet>
+                    <field name="has_default_company" invisible="1" />
+                    <field name="has_chart_of_accounts" invisible="1"/>
+                    <field name="complete_tax_set" invisible="1"/>
+                    <field name="has_fiscal_year" invisible="1"/>
+
+                    <group groups="base.group_multi_company">
+                        <field name="company_id" string="Select Company" widget="selection"
+                            on_change="onchange_company_id(company_id)"
                             attrs="{'invisible': [('has_default_company', '=', True)]}"/>
                         <field name="expects_chart_of_accounts"/>
                     </group>
 
-                    <group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                    <div class="oe_form_button_save_dirty">
+                    <group string="Select a Chart of Accounts to Install"
+                        attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                        <group>
+                            <field name="chart_template_id" widget="selection" domain="[('visible','=', True)]"
+                                on_change="onchange_chart_template_id(chart_template_id)"/>
+                            <field name="code_digits" groups="account.group_account_user"/>
+                            <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                            <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
+                        </group>
                         <button string="Install More Chart Templates" icon="gtk-go-forward"
                             name="%(open_account_charts_modules)d" type="action"/>
-                        <newline/>
-                        <field name="code_digits" groups="account.group_account_user"/>
-                        <field name="seq_journal"/>
-                        <newline/>
-                        <field name="complete_tax_set" invisible="1"/>
-                        <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                        <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                        <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                        <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
                     </group>
+                    </div>
 
-                    <field name="has_fiscal_year" invisible="1"/>
-                    <group string="No Fiscal Year Defined for this Company" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
-                        <field name="date_start" on_change="onchange_start_date(date_start)"/>
-                        <field name="date_stop"/>
-                        <field name="period" colspan="4"/>
+                    <div class="oe_form_button_save_dirty">
+                    <group string="No Fiscal Year Defined for This Company"
+                        attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                        <label for="date_start" string="Date Range"/>
+                        <div>
+                            <field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
+                            <field name="date_stop" class="oe_inline"/>
+                        </div>
+                        <field name="period"/>
                     </group>
+                    </div>
 
-                    <field name="complete_tax_set" invisible="1"/>
                     <group string="Accounting Configuration">
                         <group>
-                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
+                                attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
-                            <field name="module_account_asset"/>
+                            <field name="currency_id"/>
+                            <field name="decimal_precision"/>
                         </group>
                         <group>
-                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
-                            <field name="currency_id"/>
+                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
+                                attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                            <field name="decimal_precision"/>
                         </group>
                     </group>
 
@@ -73,47 +86,55 @@
                     <field name="purchase_refund_journal_id" invisible="1"/>
                     <group>
                         <group string="Customer Invoices">
-                            <label string="Invoice Sequence" for="sale_sequence_prefix"/>
-                            <div>
-                                <field name="sale_sequence_prefix" class="oe_form_inline"/>
-                                <field name="sale_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                            </div>
-
-                            <label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
-                            <div>
-                                <field name="sale_refund_sequence_prefix" class="oe_form_inline"/>
-                                <field name="sale_refund_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                            </div>
+                            <label for="sale_sequence_next"/>
+                            <group>
+                                <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                            </group>
+                            <label for="sale_refund_sequence_next"/>
+                            <group>
+                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                            </group>
                             <field name="module_account_invoice_layout"/>
                             <field name="module_account_voucher"/>
                             <field name="module_account_followup"/>
                             <field name="group_proforma_invoices"/>
                         </group>
+
                         <group string="Supplier Invoices">
-                            <label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
-                            <div>
-                                <field name="purchase_sequence_prefix" class="oe_form_inline"/>
-                                <field name="purchase_sequence_next" class="oe_form_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                            </div>
-                            <label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
-                            <div>
-                                <field name="purchase_refund_sequence_prefix" class="oe_form_inline"/>
-                                <field name="purchase_refund_sequence_next" class="oe_form_inline"
+                             <label for="purchase_sequence_next"/>
+                            <group>
+                                <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                            </group>
+                            <label for="purchase_refund_sequence_next"/>
+                            <group>
+                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
                                   attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                            </div>
+                            </group>
                             <field name="module_account_payment"/>
                         </group>
+
                         <group string="Electronic Payments">
-                            <field name="paypal_account"/>
+                            <field name="paypal_account" placeholder="sales@openerp.com"/>
                         </group>
+
                         <group string="Bank &amp; Cash">
-                            <label string="Configure Bank Accounts :"/>
+                            <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>
                             <field name="module_account_check_writing"/>
                         </group>
+
                         <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..2af649ba19f 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
@@ -53,10 +54,6 @@ class account_fiscalyear_close_state(osv.osv_memory):
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
 
-            # Log message for Fiscalyear
-            fy_pool = self.pool.get('account.fiscalyear')
-            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
-            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
             return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index fecf43f07ab..b2c61d9197a 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -53,11 +53,8 @@ class account_period_close(osv.osv_memory):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
 
-                    # Log message for Period
-                    for period_id, name in period_pool.name_get(cr, uid, [id]):
-                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {'type': 'ir.actions.act_window_close'}
 
 account_period_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 5962ae95dcd..3d665e680c3 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data>
 
+        <!-- rename root menu "Accounting" -->
+        <record id="account.menu_finance" model="ir.ui.menu">
+            <field name="name">Accounting</field>
+        </record>
+
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 20c170cb5c0..6e15fe1d5a5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -98,7 +98,7 @@ class account_analytic_account(osv.osv):
                             WHERE account_analytic_account.id IN %s \
                                 AND account_analytic_line.invoice_id IS NULL \
                                 AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type IN ('purchase','general') \
+                                AND account_analytic_journal.type = 'general' \
                             GROUP BY account_analytic_account.id;""", (parent_ids,))
                     for account_id, sum in cr.fetchall():
                         if account_id not in res:
@@ -257,6 +257,12 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
+    def _remaining_hours_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = max(account.hours_qtt_est - account.timesheet_ca_invoiced, account.ca_to_invoice)
+        return res
+
     def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
@@ -291,15 +297,34 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
+    def _fix_price_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        sale_obj = self.pool.get('sale.order')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id)], context=context)
+            for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
+                if not sale.invoiced:
+                    res[account.id] += sale.amount_untaxed
+                    for invoice in sale.invoice_ids:
+                        if invoice.state not in ('draft', 'cancel'):
+                            res[account.id] -= invoice.amount_untaxed
+        return res
+
+    def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+        lines_obj = self.pool.get('account.analytic.line')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
+            for line in lines_obj.browse(cr, uid, line_ids, context=context):
+                res[account.id] += line.invoice_id.amount_untaxed
+        return res
+
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
-            if account.amount_max != 0:
-                res[account.id] = account.amount_max - account.ca_invoiced
-            else:
-                res[account.id]=0.0
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
+            res[account.id] = max(account.amount_max - account.ca_invoiced, account.fix_price_to_invoice)
         return res
 
     def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
@@ -333,6 +358,47 @@ class account_analytic_account(osv.osv):
             result.add(line.account_id.id)
         return list(result)
 
+    def _get_total_estimation(self, account):
+        tot_est = 0.0
+        if account.fix_price_invoices:
+            tot_est += account.amount_max 
+        if account.invoice_on_timesheets:
+            tot_est += account.hours_qtt_est
+        return tot_est
+
+    def _get_total_invoiced(self, account):
+        total_invoiced = 0.0
+        if account.fix_price_invoices:
+            total_invoiced += account.ca_invoiced
+        if account.invoice_on_timesheets:
+            total_invoiced += account.timesheet_ca_invoiced
+        return total_invoiced
+
+    def _get_total_remaining(self, account):
+        total_remaining = 0.0
+        if account.fix_price_invoices:
+            total_remaining += account.remaining_ca
+        if account.invoice_on_timesheets:
+            total_remaining += account.remaining_hours_to_invoice
+        return total_remaining
+
+    def _get_total_toinvoice(self, account):
+        total_toinvoice = 0.0
+        if account.fix_price_invoices:
+            total_toinvoice += account.fix_price_to_invoice
+        if account.invoice_on_timesheets:
+            total_toinvoice += account.ca_to_invoice
+        return total_toinvoice
+
+    def _sum_of_fields(self, cr, uid, ids, name, arg, context=None):
+         res = dict([(i, {}) for i in ids])
+         for account in self.browse(cr, uid, ids, context=context):
+            res[account.id]['est_total'] = self._get_total_estimation(account)
+            res[account.id]['invoiced_total'] =  self._get_total_invoiced(account)
+            res[account.id]['remaining_total'] = self._get_total_remaining(account)
+            res[account.id]['toinvoice_total'] =  self._get_total_toinvoice(account)
+         return res
+
     _columns = {
         'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
                                                 store={
@@ -350,7 +416,7 @@ class account_analytic_account(osv.osv):
         'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
             digits_compute=dp.get_precision('Account')),
-        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Time',
+        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Worked Time',
             help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
         'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
             help="If invoice from the costs, this is the date of the latest invoiced."),
@@ -363,7 +429,13 @@ class account_analytic_account(osv.osv):
         'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time',
             help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."),
         'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
-            help="Computed using the formula: Maximum Time - Total Time"),
+            help="Computed using the formula: Maximum Time - Total Worked Time"),
+        'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
+            help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+        'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
+            help="Sum of quotations for this contract."),
+        'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
+            help="Sum of timesheet lines invoiced for this contract."),
         'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
             help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
             digits_compute=dp.get_precision('Account')),
@@ -379,10 +451,51 @@ class account_analytic_account(osv.osv):
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
+        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
+        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
+        'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
+        'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
+        'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"),
+        'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"),
+        'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Remaining", help="Expectation of remaining income for this contract. Computed as the sum of remaining subtotals which, in turn, are computed as the maximum between '(Estimation - Invoiced)' and 'To Invoice' amounts"),
+        'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total to Invoice", help=" Sum of everything that could be invoiced for this contract."),
     }
 
+    def open_sale_order_lines(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
+        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))])
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Sale Order Lines of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': context,
+            'domain' : [('order_id','in',sale_ids)],
+            'res_model': 'sale.order.line',
+            'nodestroy': True,
+        }
+
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        if not template_id:
+            return {}
+        res = {'value':{}}
+        template = self.browse(cr, uid, template_id, context=context)
+        res['value']['date_start'] = template.date_start
+        res['value']['date'] = template.date
+        res['value']['fix_price_invoices'] = template.fix_price_invoices
+        res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
+        res['value']['quantity_max'] = template.quantity_max
+        res['value']['hours_qtt_est'] = template.hours_qtt_est
+        res['value']['amount_max'] = template.amount_max
+        res['value']['to_invoice'] = template.to_invoice.id
+        res['value']['pricelist_id'] = template.pricelist_id.id
+        res['value']['description'] = template.description
+        return res
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 0c28155b76d..c3ac5f5b71c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -20,26 +20,22 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group col="8" colspan="4">
+                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
                         <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-                        <filter icon="terp-go-month"
-                             string=" +1 Month"
-                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Analytic Accounts with a past deadline in one month." />
-
                         <separator orientation="vertical"/>
-                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <field name="partner_id">
-                            <filter help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        </field>
-                        <field name="user_id">
-                            <filter help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        </field>
-
+                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -62,8 +58,8 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
-            <field name="domain">[('type','=','normal')]</field>
+            <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
             <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
         </record>
@@ -74,8 +70,8 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
-            <field name="domain">[('type','=','normal')]</field>
+            <field name="context">{'default_type':'contract'}</field>
+            <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
         </record>
         <menuitem id="base.menu_sales" name="Sales"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b6803558b62..ead87c176e3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -4,97 +4,99 @@
 
         <!--
         Analytic Account form
-
-        Remove information on Account data => because they move on analysis sheet
-        create a page with invoicing informations
         -->
-        <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.invoice.stat.form.inherit</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <group name="invoice_stats" position="inside">
-                    <field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <label string="" colspan="1"/>
-                    <button
-                        name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                        string="Create Invoice"
-                        type="action"
-                        attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
-                        icon="gtk-go-forward"/>
-                </group>
-            </field>
-        </record>
 
-        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
+        <act_window
+            id="action_sales_order"
+            name="Sales Orders"
+            res_model="sale.order"
+            src_model="account.analytic.account"
+        />
+
+        <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-            <field eval="18" name="priority"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="40" name="priority"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Invoice Analysis">
-                        <separator colspan="4" string="Work Done Stats"/>
-
-                        <field name="total_cost"/>
-                        <field name="remaining_ca"/>
-                        <field name="ca_invoiced"/>
-                        <field name="ca_theorical"/>
-                        <newline/>
-                        <field name="hours_quantity"/>
-                        <field name="hours_qtt_invoiced"/>
-                        <field name="remaining_hours"/>
-                        <newline/>
-                        <separator colspan="4" string="Analysis Stats"/>
-
-                        <field name="revenue_per_hour"/>
-                        <field name="real_margin"/>
-                        <field name="real_margin_rate"/>
-                        <field name="theorical_margin"/>
-                        <separator colspan="4" string="Key Dates"/>
-
-                        <field name="last_invoice_date"/>
-                        <field name="last_worked_invoiced_date"/>
-                        <field name="last_worked_date"/>
-                    </page>
-                    <page string="Stats by month">
-                        <field colspan="4" name="month_ids" nolabel="1">
-                            <tree string="Month">
-                                <field name="month"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Stats by user">
-                        <field colspan="4" name="user_ids" nolabel="1">
-                            <tree string="Users">
-                                <field name="user"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                </notebook>
-
-            </field>
-        </record>
-
-        <!-- Add information on Account analytic list for the project management -->
-        <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
-            <field name="name">account.analytic.account.tree</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="quantity" position="replace">
-                    <field name="hours_quantity"/>
-                    <field name="hours_qtt_non_invoiced"/>
-                    <field name="remaining_hours"/>
-                    <field name="quantity_max"/>
-                </field>
+                <xpath expr='//field[@name="type"]' position='after'>
+                    <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                </xpath>
+                <xpath expr='//div[@name="duration"]' position="after" version="7.0">
+                    <label for="quantity_max"/>
+                    <div>
+                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
+                    </div>
+                </xpath>
+                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
+                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
+                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                    </group>
+                </xpath>
+                <xpath expr='//group[@name="master"]' position='after'>
+                    <separator name="toinvoice" string="Invoicing"/>
+                    <table width="100%%">
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field name="fix_price_invoices" class="oe_inline"/>
+                            </td><td>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td>
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
+                            <td>
+                                <label for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field name="invoice_on_timesheets"/>
+                            </td><td>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td>
+                        </tr><tr name='total'>
+                            <th>
+                                <label string="Total"/>
+                            </th><td>
+                            </td><td>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_inline"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                 </xpath>
             </field>
         </record>
 
@@ -106,10 +108,20 @@
             <field name="arch" type="xml">
                 <field name="date" position="before">
                     <field name="last_invoice_date"/>
-                    <field name="ca_to_invoice"/>
+                    <field name="toinvoice_total"/>
                 </field>
             </field>
         </record>
 
+        <record id="template_of_contract_action" model="ir.actions.act_window">
+            <field name="name">Template of Contract</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','template')]</field>
+            <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+        </record>
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
     </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 6d76cf0ac8f..8f649e0e15e 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index c4e8c16f70a..beb4dcbd34e 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -47,20 +47,20 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
-                    <separator orientation="vertical"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_stop"/>
+                        <separator orientation="vertical"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-						<separator orientation="vertical"/>
-						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
                          <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 265f71d690f..045a0eb0cbb 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -31,7 +31,7 @@
        </field>
     </record>
 
-    <record id="account.journal_col11" model="account.journal.column">
+    <record id="journal_col11" model="account.journal.column">
         <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
         <field eval="11" name="sequence"/>
         <field name="view_id" ref="account.account_journal_view"/>
@@ -196,7 +196,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
-                <field name="name"/>
+                <field name="name" string="Analytic Plan"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index e2ad9e05b04..3e8eec81c55 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -109,7 +109,6 @@ class crossovered_analytic(report_sxw.rml_parse):
             res['ref_qty'] = info[0]['qty']
             res['ref_amt'] = info[0]['amt']
             self.base_amount = info[0]['amt']
-        
         result.append(res)
         return result
 
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 766fb9f0d0d..48e7c13b0a1 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -237,10 +237,10 @@
             <para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ a['ref_qty'] and formatLang(a['ref_qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9">[[ a['ref_amt'] and formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">100.00%</para>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 74dce06b85a..8a79d96d1c4 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
+                <xpath expr="//field[@name='property_account_expense']" position="after">
                     <label string="" colspan="2"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 01144c153e5..8efe929e471 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -64,7 +64,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
-                <field name="name"/>
+                <field name="name" string="Asset Category"/>
+                <separator orientation="vertical"/>
                 <field name="journal_id"/>
             </search>
         </field>
@@ -204,12 +205,14 @@
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <group col="10" colspan="12">
+                    <field name="name" string="Asset"/>
+                    <separator orientation="vertical"/>
+                    <field name="purchase_date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_id"/>
-                    <field name="purchase_date"/>
                     <field name="partner_id"/>
                 </group>
             </search>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index c2f931862f5..f06e857cf7a 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,16 +44,8 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="Year" icon="terp-go-year" name="year"
-                        domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Assets purchased in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                        domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in current month"/>
-                    <filter icon="terp-go-month" string="Month-1" separator="1"
-                        domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in last month"/>
+                    <field name="purchase_date"/>
+                    <field name="depreciation_date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                     <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
@@ -63,12 +55,10 @@
                     <separator orientation="vertical"/>
                     <field name="asset_id"/>
                     <field name="asset_category_id"/>
-                    <field name="depreciation_date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
-                    <field name="purchase_date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
@@ -94,7 +84,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">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;</field>
     </record>
     
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index d42e188679a..29b4c4fdb84 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -23,7 +23,6 @@
 import time
 from osv import osv, fields
 import decimal_precision as dp
-import netsvc
 from tools.translate import _
 
 class account_bank_statement(osv.osv):
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index d806760a85b..a3185db2c92 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -118,41 +118,42 @@
     </record>
 
     <record id="view_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">bank.statement.line.filter</field>
-      <field name="model">account.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
-            <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
-            <separator orientation="vertical"/>
-            <field name="journal_id"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-          </group>
-          <newline/>
-          <group string="Extended Filters..." expand="0">
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="1">
-            <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">bank.statement.line.filter</field>
+        <field name="model">account.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
+                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group string="Extended Filters..." expand="0">
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="1">
+                    <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
index 8e1e4b09e47..5dcaafe4845 100644
--- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
+++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
@@ -23,13 +23,13 @@
 import time
 from report import report_sxw
 import pooler
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 class bank_statement_balance_report(report_sxw.rml_parse):
 
     def set_context(self, objects, data, ids, report_type=None):
-        #logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
+        #_logger.warning('addons.'+__name__, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
         cr = self.cr
         uid = self.uid
         context = self.context
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 363373b3204..b10469059fd 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -18,8 +18,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
-                    <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -180,17 +179,18 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group>
-                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                       <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="code" />
-                       <field name="state"/>
-                       <field name="date_from"/>
-                       <field name="date_to"/>
-                   </group>
-               </search>
-           </field>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                        <separator orientation="vertical"/>
+                        <field name="state"/>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
@@ -231,19 +231,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Lines" version="7.0">
-                    <group col="4">
-                        <field name="crossovered_budget_id"/>
-                        <field name="analytic_account_id"/>
-                        <field name="general_budget_id"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <field name="paid_date"/>
-                        <field name="planned_amount"/>
-                        <field name="practical_amount"/>
-                        <field name="theoritical_amount"/>
-                        <field name="percentage"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="crossovered_budget_id"/>
+                            <field name="analytic_account_id"/>
+                            <field name="general_budget_id"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <field name="paid_date"/>
+                            <field name="planned_amount"/>
+                            <field name="practical_amount"/>
+                            <field name="theoritical_amount"/>
+                            <field name="percentage"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -272,7 +274,7 @@
             <field name="name">account.analytic.account.form.inherot.budget</field>
             <field name="type">form</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Budget Lines">
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 758466160c1..abc33dc596f 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-08 01:54+0000\n"
+"PO-Revision-Date: 2012-06-13 17: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-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -169,7 +169,7 @@ msgstr "会社"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr "承認のため"
+msgstr "承認"
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 6a214fa56dd..9bf37134920 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -20,7 +20,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
@@ -32,7 +32,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_cancel/i18n/kk.po b/addons/account_cancel/i18n/kk.po
new file mode 100644
index 00000000000..287f747f4db
--- /dev/null
+++ b/addons/account_cancel/i18n/kk.po
@@ -0,0 +1,23 @@
+# Kazakh translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-06-20 01:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Kazakh <kk@li.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-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "Отмена"
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index e3cc6f40a0c..36700c97b84 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -22,9 +22,7 @@
 
 from osv import osv, fields
 import decimal_precision as dp
-import netsvc
 from tools.translate import _
-logger=netsvc.Logger()
 
 class coda_bank_account(osv.osv):
     _name= 'coda.bank.account'
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 7be5c4b8024..bb2e833ce25 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -7,27 +7,29 @@
 
     <!-- CODA Bank Account Configuration -->
     <record id="view_coda_bank_account_search" model="ir.ui.view">
-      <field name="name">coda.bank.account.search</field>
-      <field name="model">coda.bank.account</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-          <search string="CODA Bank Account Configuration">
-              <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-              <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-              <separator orientation="vertical"/>
-              <field name="name"/>
-              <field name="bank_id"/>
-              <field name="description1"/>
-              <field name="journal"/>
-              <field name="currency" widget="selection"/>
-              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              <newline/>
-              <group expand="0" string="Group By...">
-                <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
-              </group>
-          </search>
-      </field>
+        <field name="name">coda.bank.account.search</field>
+        <field name="model">coda.bank.account</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="CODA Bank Account Configuration">
+                <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
+                    string="CODA Bank Account"/>
+                <separator orientation="vertical"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
+                <separator orientation="vertical"/>
+                <field name="bank_id"/>
+                <field name="journal"/>
+                <field name="currency" widget="selection"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                </group>
+            </search>
+        </field>
     </record>
     <record id="view_coda_bank_account_list" model="ir.ui.view">
       <field name="name">coda.bank.account.list</field>
@@ -241,24 +243,26 @@
     </record>
     
     <record model="ir.ui.view" id="view_account_coda_form">
-      <field name="name">account.coda.form</field>
-      <field name="model">account.coda</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string="CODA File" version="7.0">
-              <group col="4">
-                  <field name="coda_creation_date"/>
-                  <field name="name"/>
-                  <field name="coda_data" filename="name"/>
-                  <field name="date"/>
-                  <field name="user_id"/>
-                  <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              </group>
-              <separator string="Additional Information"/>
-              <field name="note"/>
-              <field name="statement_ids"/>
-          </form>
-      </field>
+        <field name="name">account.coda.form</field>
+        <field name="model">account.coda</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="CODA File" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="coda_creation_date"/>
+                        <field name="name"/>
+                        <field name="coda_data" filename="name"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <separator string="Additional Information"/>
+                    <field name="note"/>
+                    <field name="statement_ids"/>
+                </sheet>
+            </form>
+        </field>
     </record>
     
     <record id="view_account_coda_filter" model="ir.ui.view">
@@ -322,84 +326,89 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Bank Statement" version="7.0">
-              <group col="4">
-                  <field name="name"/>
-                  <field name="date"/>
-                  <field name="coda_bank_account_id"/>
-                  <field name="currency"/>
-                  <field name="period_id"/>
-                  <field name="type"/>
-                  <newline/>
-                  <field name="balance_start"/>
-                  <field name="balance_end_real"/>
-              </group>
-              <notebook>
-                <page string="Transactions">
-                  <field name="line_ids">
-                    <tree string="CODA Statement Lines">
-                      <field name="sequence" string="Seq"/>
+              <sheet>
+                  <group col="4">
+                      <field name="name"/>
                       <field name="date"/>
-                      <field name="val_date"/>
-                      <field name="ref"/>
-                      <field name="name" width="250"/>
+                      <field name="coda_bank_account_id"/>
+                      <field name="currency"/>
+                      <field name="period_id"/>
                       <field name="type"/>
-                      <field name="partner_id"/>
-                      <field name="account_id"/>
-                      <field name="amount"/>
-                      <field name="globalisation_amount" string="Glob. Amount"/>
-                      <field name="globalisation_id" string="Glob. Id"/>
-                    </tree>
-                    <form string="CODA Statement Lines" version="7.0">
-                      <group col="4">
+                      <newline/>
+                      <field name="balance_start"/>
+                      <field name="balance_end_real"/>
+                  </group>
+                  <notebook>
+                    <page string="Transactions">
+                      <field name="line_ids">
+                        <tree string="CODA Statement Lines">
                           <field name="sequence" string="Seq"/>
                           <field name="date"/>
                           <field name="val_date"/>
-                          <field name="name"/>
+                          <field name="ref"/>
+                          <field name="name" width="250"/>
                           <field name="type"/>
                           <field name="partner_id"/>
-                          <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                          <field name="account_id"/>
                           <field name="amount"/>
-                          <field name="ref"/>
-                          <field name="globalisation_amount"/>
-                          <field name="globalisation_level"/>
-                          <field name="globalisation_id"/>
-                      </group>
-                      <separator string="Notes"/>
-                      <field name="note"/>
-                    </form>
-                  </field>
-                </page>
-              </notebook>
-              <group colspan="4">
-                <field name="balance_end"/>
-              </group>
+                          <field name="globalisation_amount" string="Glob. Amount"/>
+                          <field name="globalisation_id" string="Glob. Id"/>
+                        </tree>
+                        <form string="CODA Statement Lines" version="7.0">
+                          <group col="4">
+                              <field name="sequence" string="Seq"/>
+                              <field name="date"/>
+                              <field name="val_date"/>
+                              <field name="name"/>
+                              <field name="type"/>
+                              <field name="partner_id"/>
+                              <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                              <field name="amount"/>
+                              <field name="ref"/>
+                              <field name="globalisation_amount"/>
+                              <field name="globalisation_level"/>
+                              <field name="globalisation_id"/>
+                          </group>
+                          <separator string="Notes"/>
+                          <field name="note"/>
+                        </form>
+                      </field>
+                    </page>
+                  </notebook>
+                  <group colspan="4">
+                    <field name="balance_end"/>
+                  </group>
+              </sheet>
           </form>
       </field>
     </record>
 
     <record id="view_coda_bank_statement_search" model="ir.ui.view">
-      <field name="name">coda.bank.statement.search</field>
-      <field name="model">coda.bank.statement</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search CODA Bank Statements">
-          <group col="8" colspan="4">
-            <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-            <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
-            <separator orientation="vertical"/>
-            <field name="name"/>
-            <field name="date"/>
-            <field name="period_id"/>
-            <field name="coda_bank_account_id"/>
-            <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-            <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.search</field>
+        <field name="model">coda.bank.statement</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search CODA Bank Statements">
+                <group col="8" colspan="4">
+                    <field name="name"
+                        string="CODA Bank Statement"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                    <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
+                    <separator orientation="vertical"/>
+                    <field name="period_id"/>
+                    <field name="coda_bank_account_id"/>
+                    <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                    <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record model="ir.actions.act_window" id="action_coda_bank_statements">
@@ -467,39 +476,42 @@
     </record>
 
     <record id="view_coda_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">coda.bank.statement.line.filter</field>
-      <field name="model">coda.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-            <field name="type"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Extended Filters...">
-            <field name="coda_bank_account_id"/>
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="0">
-            <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.line.filter</field>
+        <field name="model">coda.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group col='6' colspan='4'>
+                    <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                        string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="coda_bank_account_id"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="type"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="0">
+                    <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_coda_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index c49eb9f1dbd..daa8bbd1026 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -24,11 +24,11 @@ import time
 import base64
 from osv import fields,osv
 from tools.translate import _
-import netsvc
+import logging
 import re
 from traceback import format_exception
 from sys import exc_info
-logger=netsvc.Logger()
+_logger = logging.getLogger(__name__)
 
 class account_coda_import(osv.osv_memory):
     _name = 'account.coda.import'
@@ -816,7 +816,7 @@ class account_coda_import(osv.osv_memory):
                                         ttype = line['type'] == 'supplier' and 'payment' or 'receipt',
                                         date = line['val_date'],
                                         context = context)
-                                    #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'voucher_dict = %s' % voucher_dict) 
+                                    #_logger.warning('voucher_dict = %s' % voucher_dict) 
                                     voucher_line_vals = False
                                     if voucher_dict['value']['line_ids']:
                                         for line_dict in voucher_dict['value']['line_ids']:
@@ -889,22 +889,19 @@ class account_coda_import(osv.osv_memory):
                 nb_err += 1
                 err_string += _('\nError ! ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
             except Exception, e:
                 cr.rollback()
                 nb_err += 1
                 err_string += _('\nSystem Error : ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
             except :
                 cr.rollback()
                 nb_err += 1
                 err_string = _('\nUnknown Error : ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
 
         # end 'for statement in coda_statements'
                           
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 89423327d68..c2e89202553 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group>
-                        <field name="name"/>
+                    <group>
+                        <field name="name" string="Followup"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 5ba0e147bf8..9627d12aa88 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -34,41 +34,42 @@
                </graph>
            </field>
       </record>
-	 <record id="view_account_followup_stat_search" model="ir.ui.view">
-        <field name="name">account_followup.stat.search</field>
-        <field name="model">account_followup.stat</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Follow-ups Sent">
-              <group>
-              <filter icon="terp-go-year" string="This Fiscal year"
-			              name="fiscalyear"
-			              domain="[('period_id','in','current_year')]"
+        <record id="view_account_followup_stat_search" model="ir.ui.view">
+            <field name="name">account_followup.stat.search</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Follow-ups Sent">
+                    <group>
+                        <field name="date_move"/>
+                        <field name="date_move_last"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-year" string="This Fiscal year"
+                            name="fiscalyear"
+                            domain="[('period_id','in','current_year')]"
                             help="Follow up Entries with period in current year"/>
-              <separator orientation="vertical"/>
-              <filter icon="terp-camera_test" string="Not Litigation"
-              			   domain="[('blocked','=', False)]"
-                           help = "Including journal entries marked as a litigation"/>
-              <separator orientation="vertical"/>
-              <field name="partner_id"/>
-              <field name="balance" />
-              <field name="date_move" />
-              <field name="date_move_last" />
-              </group>
-              <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
-                    <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
-                </group>
-            </search>
-        </field>
-    </record>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="Not Litigation"
+                            domain="[('blocked','=', False)]"
+                            help = "Including journal entries marked as a litigation"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="balance"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
+                        <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_followup_stat" model="ir.actions.act_window">
             <field name="name">Follow-ups Sent</field>
             <field name="res_model">account_followup.stat</field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 8a592f01ac2..32b6383a8cc 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -36,21 +36,22 @@
                   parent="account.menu_finance_periodical_processing_billing"
                   sequence="10"/>
 
-           <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
+        <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
             <field name="model">account_followup.stat.by.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
-                   <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="max_followup_id"/>
-                   <field name="date_followup"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date_followup"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="max_followup_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
-           </record>
+        </record>
 
        <!-- Screen2 -->
            <record id="account_followup_stat_by_partner_tree" model="ir.ui.view">
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 8e18ec51d5b..e9789b8199e 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -74,7 +74,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Messages">
-                <field name="name"/>
+                <field name="name" string="Message"/>
+                <separator orientation="vertical"/>
                 <field name="msg"/>
             </search>
         </field>
diff --git a/addons/account_invoice_layout/i18n/ja.po b/addons/account_invoice_layout/i18n/ja.po
index 88df3263cce..03716e551d1 100644
--- a/addons/account_invoice_layout/i18n/ja.po
+++ b/addons/account_invoice_layout/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-05-09 09:04+0000\n"
+"PO-Revision-Date: 2012-06-25 05:21+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-05-10 05:20+0000\n"
-"X-Generator: Launchpad (build 15213)\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -120,7 +120,7 @@ msgstr "詳細"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "請求書行のリスト表示は、シーケンスの順序になっています。"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 79bce6248d3..f2539e6d444 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -193,7 +193,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 84049b18f0a..8bfcfd17654 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -197,7 +197,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 45f42a3ab1a..aa4cd18308f 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -47,12 +47,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
-                    <field name="name"/>
+                    <field name="name"
+                        string="Payment Mode"/>
+                    <separator orientation="vertical"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
                 </search>
             </field>
@@ -131,8 +133,8 @@
                                         <field name="date"/>
                                         <label for="amount_currency"/>
                                         <div>
-                                            <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
-                                            <field name="currency" nolabel="1" class="oe_form_inline"/>
+                                            <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_inline"/>
                                         </div>
                                         <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -151,8 +153,8 @@
                                     <group col="4" string="General Information">
                                         <label for="amount"/>
                                         <div>
-                                            <field name="amount" class="oe_form_inline"/>
-                                            <field name="company_currency" class="oe_form_inline"/>
+                                            <field name="amount" class="oe_inline"/>
+                                            <field name="company_currency" class="oe_inline"/>
                                         </div>
                                         <separator colspan="4" string="Entry Information"/>
                                         <field name="create_date" readonly="1"/>
@@ -208,13 +210,16 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <group>
+                        <field name="reference"
+                            string="Payment Order"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_done"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="reference"/>
                         <field name="mode" widget='selection'/>
-                        <field name="date_done"/>
                         <field name="state"/>
                     </group>
                     <newline/>
@@ -259,8 +264,8 @@
                                 <field name="date"/>
                                 <label for="amount_currency"/>
                                 <div>
-                                    <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
-                                    <field name="currency" class="oe_form_inline"/>
+                                    <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
+                                    <field name="currency" class="oe_inline"/>
                                 </div>
                                 <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..2cefaf15f0e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -250,6 +250,7 @@ class account_voucher(osv.osv):
 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
+    _inherit = ['mail.thread']
     _order = "date desc, id desc"
 #    _rec_name = 'number'
     _columns = {
@@ -323,7 +324,7 @@ class account_voucher(osv.osv):
         'amount': _get_amount,
         'type':_get_type,
         'state': 'draft',
-        'pay_now': 'pay_later',
+        'pay_now': 'pay_now',
         'name': '',
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
@@ -334,6 +335,11 @@ class account_voucher(osv.osv):
         'payment_rate_currency_id': _get_payment_rate_currency,
     }
 
+    def create(self, cr, uid, vals, context=None):
+        voucher =  super(account_voucher, self).create(cr, uid, vals, context=context)
+        self.create_send_note(cr, uid, [voucher], context=context)
+        return voucher
+
     def compute_tax(self, cr, uid, ids, context=None):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
@@ -556,7 +562,7 @@ class account_voucher(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         def _remove_noise_in_o2m():
-            """if the line is partially reconciled, then we must pay attention to display it only once and 
+            """if the line is partially reconciled, then we must pay attention to display it only once and
                 in the good o2m.
                 This function returns True if the line is considered as noise and should not be displayed
             """
@@ -1249,12 +1255,16 @@ class account_voucher(osv.osv):
                 'state': 'posted',
                 'number': name,
             })
+            self.post_send_note(cr, uid, [voucher.id], context=context)
             if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
             # We automatically reconcile the account move lines.
+            reconcile = False
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                    reconcile = move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+            if reconcile:
+                self.reconcile_send_note(cr, uid, [voucher.id], context=context)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -1270,6 +1280,32 @@ class account_voucher(osv.osv):
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
 
+    # -----------------------------------------
+    # OpenChatter notifications and need_action
+    # -----------------------------------------
+    _document_type = {
+        'sale': 'Sales Receipt',
+        'purchase': 'Purchase Receipt',
+        'payment': 'Supplier Payment',
+        'receipt': 'Customer Payment',
+        False: 'Payment',
+    }
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>created</b>." % self._document_type[obj.type or False]
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
+    def post_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
+    def reconcile_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
 account_voucher()
 
 class account_voucher_line(osv.osv):
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index da669ad04ee..c6128c4e619 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -2,15 +2,18 @@
 <openerp>
     <data>
         <record id="view_invoice_customer" model="ir.ui.view">
-           <field name="name">account.invoice.customer.pay</field>
-           <field name="model">account.invoice</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="account.invoice_form"/>
-           <field name="arch" type="xml">
-           <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward"/>
-           </button>
-           </field>
+            <field name="name">account.invoice.customer.pay</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                </xpath>
+            </field>
         </record>
         <record id="view_invoice_supplier" model="ir.ui.view">
             <field name="name">account.invoice.supplier.pay</field>
@@ -18,9 +21,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <button name="invoice_open" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward"/>
-                </button>
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 586d06449c8..3658ebba14a 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -11,7 +11,7 @@
                     <field name="number"/>
                     <field name="reference"/>
                     <field name="partner_id"/>
-                    <field name="journal_id"/>
+                    <field name="journal_id" groups="account.group_account_user"/>
                     <field name="period_id" invisible="context.get('visible', True)"/>
                     <field name="type" invisible="context.get('visible', True)"/>
                     <field name="amount" sum="Total Amount"/>
@@ -110,7 +110,10 @@
                             </field>
                         </page>
                     </notebook>
-                   </sheet>
+                  </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -123,17 +126,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py
index e44adee974e..146fcbc258a 100644
--- a/addons/account_voucher/report/account_voucher.py
+++ b/addons/account_voucher/report/account_voucher.py
@@ -72,4 +72,4 @@ report_sxw.report_sxw(
     parser=report_voucher,header="external"
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py
index 8bd8644c03c..6a5762be493 100644
--- a/addons/account_voucher/report/account_voucher_print.py
+++ b/addons/account_voucher/report/account_voucher_print.py
@@ -93,4 +93,4 @@ report_sxw.report_sxw(
     parser=report_voucher_print,header="external"
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 9f5e7d78d66..702b65f5fb1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,18 +49,8 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
+                    <field name="date_due"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -81,10 +71,8 @@
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
-                    <field name="pay_now"/>
                     <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
+                    <field name="pay_now"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
@@ -115,7 +103,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_sale_receipt_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 150830431ca..5bda06622b1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,17 +9,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
@@ -42,17 +41,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
@@ -145,7 +143,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
@@ -185,8 +183,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
@@ -201,8 +199,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
@@ -259,6 +257,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -272,7 +273,9 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
             <field name="target">current</field>
-            <field name="help">The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills.</field>
+            <field name="help">Click on "Create" to register a supplier payment. 
+                    &lt;p&gt;
+                    Track payments you do to your supplier and amounts you pay.</field>
         </record>
         <record id="action_vendor_payment_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -297,26 +300,41 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="currency_id" invisible="1"/>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="parter_id" /> 
+                        </div>
+                        <h1>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                        </h1>
+                    </div>
+                    <div>
+                        Pay
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
+                            class="oe_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                        by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection"
+                            class="oe_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
+
+                    </div>
+
+                    <group col="6">
+                        <field name="currency_id" invisible="1"/>
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
@@ -412,6 +430,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -425,7 +446,11 @@
             <field name="search_view_id" ref="view_voucher_filter_customer_pay"/>
             <field name="view_id" eval="False"/>
             <field name="target">current</field>
-            <field name="help">Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.</field>
+            <field name="help">
+                Click on create to register a payment.
+                &lt;p&gt;
+                Enter the customer and the payment method and then, either create manually a payment record or OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.
+            </field>
         </record>
         <record id="action_vendor_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index dba40940166..e5919d9089e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,21 +8,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -40,21 +39,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -82,55 +80,67 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft"/>
-                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <div class="oe_title">
+                        <label for="number" class="oe_edit_only"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                            <field name="name" colspan="2"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="account_id"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                  domain="[('type','=','liquidity')]"/>
+                            <field name="reference"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                            />
+                            <field name="paid" invisible="1"/>
+                        </group>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="3">
-                                <group string="Internal Notes" col="1">
-                                    <field name="narration"/>
+                                <group colspan="1">
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
-                                <group col="2">
-                                    <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="account_id"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="reference"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                    />
-                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                                <group>
+                                    <group class="oe_subtotal_footer" string="Total">
+                                        <field name="tax_id" 
+                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                            widget="selection"
+                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="amount" class="oe_subtotal_footer_separator" />
+                                        <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>                                    
                                 </group>
                             </group>
                         </page>
@@ -157,6 +167,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -171,7 +184,11 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
-            <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
+            <field name="help">
+                Click here to create a sale receipt.
+                &lt;p&gt;
+                When the sales receipt is confirmed, you can record the customer payment related to this sales receipt.
+            </field>
         </record>
         <record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -207,51 +224,77 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft"/>
-                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
+                    <div class="oe_title">
+                        <label for="number" class="oe_edit_only"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
                     <field name="pay_now" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+                            <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due"/>
+                            <field name="name" colspan="2"/>
+
+                        </group>
+                        <group>
+                            <field name="paid" invisible="1"/>
+                            <field name="currency_id"/>
+                            <field name="journal_id"
+                                domain="[('type','in',['purchase','purchase_refund'])]"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="reference"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+
+                    </group>
                     <group col="6">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
-                        <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="reference"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"  groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
-                                <group col="1" string="Internal Notes">
-                                    <field name="narration"/>
-                                </group>
-                                <group col="2">
-                                    <separator string="Payment Terms" colspan="2"/>
-                                    <field name="date_due"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                            <group>
+                                <group>
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
+                                <group class="oe_subtotal_footer">
+                                    <!--
+                                    <div>
+                                        <label for="tax_id" />
+                                        <button type="object" 
+                                            icon="terp-stock_format-scientific" 
+                                            name="compute_tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </div>
+                                    -->
+                                    <field name="tax_id" 
+                                        on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
+                                        widget="selection"
+                                        domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
+                                        />
+                                    <field name="tax_amount" />
+                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
+                                </group>                                    
+
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -277,6 +320,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -289,6 +335,11 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" eval="view_voucher_filter_vendor"/>
             <field name="target">current</field>
+            <field name="help">
+                Click here to create a purchase receipt.
+                &lt;p&gt;
+                When the purchase receipt is confirmed, you can record the supplier payment related to this purchase receipt.
+            </field>
         </record>
         <record id="action_purchase_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 95983ecdc10..fe9a42fe4c4 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -25,7 +25,7 @@
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category": 'Hidden/Dependency',
-    "depends" : ["base", "decimal_precision"],
+    "depends" : ["base", "decimal_precision", "mail"],
     "description": """
 Module for defining analytic accounting object.
 ===============================================
@@ -37,6 +37,8 @@ that have no counterpart in the general financial accounts.
     "init_xml" : [],
     "update_xml": ['security/analytic_security.xml',
                    "security/ir.model.access.csv",
+                   "analytic_sequence.xml",
+                   "analytic_view.xml"
     ],
     'demo_xml': [
     ],
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 7cb61ee22aa..af8b1615864 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -27,6 +27,7 @@ import decimal_precision as dp
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
+    _inherit = ['mail.thread']
     _description = 'Analytic Account'
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
@@ -155,7 +156,11 @@ class account_analytic_account(osv.osv):
         'name': fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Code/Reference', size=24, select=True),
-        'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
+                                 help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
+                                  "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
+                                  "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
+                                  "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
@@ -166,23 +171,28 @@ class account_analytic_account(osv.osv):
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'user_id': fields.many2one('res.users', 'Account Manager'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
+        'user_id': fields.many2one('res.users', 'Project Manager'),
+        'manager_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
-                                  help='* When an account is created its in \'Draft\' state.\
-                                  \n* If any associated partner is there, it can be in \'Open\' state.\
-                                  \n* If any pending balance is there it can be in \'Pending\'. \
-                                  \n* And finally when all the transactions are over, it can be in \'Close\' state. \
-                                  \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
-                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,),
         'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
     }
+    
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+        res={}
+        if partner_id:
+            partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            if partner.user_id:
+                res['manager_id'] = partner.user_id.id
+            if not name:
+                res['name'] = _('Contract: ') + partner.name
+        return {'value': res}
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
@@ -197,6 +207,7 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'type': 'normal',
         'company_id': _default_company,
+        'code' : lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account'),
         'state': 'open',
         'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
@@ -266,6 +277,17 @@ class account_analytic_account(osv.osv):
             account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
 
+    def create(self, cr, uid, vals, context=None):
+        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if contract:
+            self.create_send_note(cr, uid, [contract], context=context)
+        return contract
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+
 account_analytic_account()
 
 
@@ -290,17 +312,17 @@ class account_analytic_line(osv.osv):
     }
 
     _order = 'date desc'
-    
+
     def _check_no_view(self, cr, uid, ids, context=None):
         analytic_lines = self.browse(cr, uid, ids, context=context)
         for line in analytic_lines:
             if line.account_id.type == 'view':
                 return False
         return True
-    
+
     _constraints = [
         (_check_no_view, 'You can not create analytic line on view account.', ['account_id']),
-    ]    
+    ]
 
 account_analytic_line()
 
diff --git a/addons/analytic/analytic_sequence.xml b/addons/analytic/analytic_sequence.xml
new file mode 100644
index 00000000000..b4e8358bdf9
--- /dev/null
+++ b/addons/analytic/analytic_sequence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+	<record id="seq_type_analytic_account_main" model="ir.sequence.type">
+            <field name="name">Analytic account</field>
+            <field name="code">account.analytic.account</field>
+        </record>
+        <record id="seq_analytic_account_base" model="ir.sequence">
+            <field name="name">Analytic account sequence</field>
+            <field name="code">account.analytic.account</field>
+            <field name="prefix">AA</field>
+            <field name="padding">3</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
new file mode 100644
index 00000000000..85a1520e561
--- /dev/null
+++ b/addons/analytic/analytic_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">analytic.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form version="7.0">
+                    <sheet string="Analytic Account">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="type"/>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="manager_id"/>
+                                <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
+                                <group name="master">
+                                    <group string="Validity" name="contract">
+                                        <label for="date_start" string="Duration"/>
+                                        <div name="duration">
+                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                        </div>
+                                    </group>
+                                    <group name="project">
+                                        <separator string="Project Management" name="project_sep" invisible="1"/>
+                                    </group>
+                                </group>
+                                <separator string="Terms and Conditions" name="description"/>
+                                <field name="description"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+     </data>
+</openerp>
diff --git a/addons/analytic_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
new file mode 100644
index 00000000000..05c84916922
--- /dev/null
+++ b/addons/analytic_contract_expense_project/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import analytic_contract_expense_project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
similarity index 55%
rename from addons/analytic_journal_billing_rate/__openerp__.py
rename to addons/analytic_contract_expense_project/__openerp__.py
index b8e8ab7baf5..514f0bfbbf5 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -19,28 +19,29 @@
 #
 ##############################################################################
 
+
 {
-    'name': 'Billing Rates on Contracts',
-    'version': '1.0',
+    'name': 'Projects Management: hr_expense link',
+    'version': '1.1',
     'category': 'Sales Management',
     'description': """
-This module allows you to define what is the default invoicing rate for a specific journal on a given account.
-==============================================================================================================
+This module is for modifying project view to show some data related to the hr_expense module.
+======================================================================================================
 
-This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available.
-
-Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.
-
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'images': ['images/analytic_journal_billing_rate.jpeg'],
-    'depends': ['analytic_user_function', 'account', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': ['analytic_journal_billing_rate_view.xml', 'security/ir.model.access.csv'],
+""",
+    "author": "OpenERP S.A.",
+    "website": "http://www.openerp.com/",
+    "depends": ["analytic_contract_hr_expense","project"],
+    "init_xml": [],
+    "update_xml": [
+                    "analytic_contract_expense_project_view.xml",
+                    ],
     'demo_xml': [],
+    "css" : [
+             ],
     'installable': True,
-    'auto_install': False,
-    'certificate': '0030271787965',
+    'auto_install': True,
+    'certificate': '',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
new file mode 100644
index 00000000000..efbb8b75a9e
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+
+    def open_hr_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
+
+    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
+
+project_project()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
new file mode 100644
index 00000000000..d4350c7325f
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="project_form_expense_form" model="ir.ui.view">
+            <field name="name">project.project.form.expense.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="total"]' position='before'>
+                    <tr>
+                        <td>
+                            <label for="charge_expenses"/>
+                        </td><td>
+                            <field name="charge_expenses"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_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)]}"/>
+                        </td><td>
+                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/analytic_journal_billing_rate/__init__.py b/addons/analytic_contract_hr_expense/__init__.py
similarity index 96%
rename from addons/analytic_journal_billing_rate/__init__.py
rename to addons/analytic_contract_hr_expense/__init__.py
index d2b6ac90561..ca4044b0584 100644
--- a/addons/analytic_journal_billing_rate/__init__.py
+++ b/addons/analytic_contract_hr_expense/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import analytic_journal_billing_rate
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import analytic_contract_hr_expense
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
new file mode 100644
index 00000000000..981f7226d6a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Contracts Management: hr_expense link',
+    'version': '1.1',
+    'category': 'Sales Management',
+    'description': """
+This module is for modifying account analytic view to show some data related to the hr_expense module.
+======================================================================================================
+
+""",
+    "author": "OpenERP S.A.",
+    "website": "http://www.openerp.com/",
+    "depends": ["hr_expense","account_analytic_analysis"],
+    "init_xml": [],
+    "update_xml": [
+                    "analytic_contract_hr_expense_view.xml",
+                    ],
+    'demo_xml': [],
+    "css" : [
+             ],
+    'installable': True,
+    'auto_install': True,
+    'certificate': '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
new file mode 100644
index 00000000000..8f24f12808b
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from osv.orm import intersect, except_orm
+import tools.sql
+from tools.translate import _
+from decimal_precision import decimal_precision as dp
+
+
+class account_analytic_account(osv.osv):
+    _name = "account.analytic.account"
+    _inherit = "account.analytic.account"
+
+    def _get_total_estimation(self, account):
+        tot_est = super(account_analytic_account, self)._get_total_estimation(account)
+        if account.charge_expenses:
+            tot_est += account.est_expenses
+        return tot_est
+
+    def _get_total_invoiced(self, account):
+        total_invoiced = super(account_analytic_account, self)._get_total_invoiced(account)
+        if account.charge_expenses:
+            total_invoiced += account.expense_invoiced
+        return total_invoiced
+
+    def _get_total_remaining(self, account):
+        total_remaining = super(account_analytic_account, self)._get_total_remaining(account)
+        if account.charge_expenses:
+            total_remaining += account.remaining_expense
+        return total_remaining
+
+    def _get_total_toinvoice(self, account):
+        total_toinvoice = super(account_analytic_account, self)._get_total_toinvoice(account)
+        if account.charge_expenses:
+            total_toinvoice += account.expense_to_invoice
+        return total_toinvoice
+
+    def _remaining_expnse_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.est_expenses != 0:
+                res[account.id] = max(account.est_expenses - account.expense_invoiced, account.expense_to_invoice)
+            else:
+                res[account.id]=0.0
+        return res
+
+    def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        res_final = {}
+        child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        for i in child_ids:
+            res[i] =  0.0
+        if not child_ids:
+            return res
+
+        if child_ids:
+            cr.execute("""SELECT account_analytic_account.id, \
+                                COALESCE(SUM (product_template.list_price * \
+                                    account_analytic_line.unit_amount * \
+                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
+                                    AS ca_to_invoice \
+                            FROM product_template \
+                            JOIN product_product \
+                                ON product_template.id = product_product.product_tmpl_id \
+                            JOIN account_analytic_line \
+                                ON account_analytic_line.product_id = product_product.id \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            JOIN account_analytic_account \
+                                ON account_analytic_account.id = account_analytic_line.account_id \
+                            JOIN hr_timesheet_invoice_factor \
+                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
+                            WHERE account_analytic_account.id IN %s \
+                                AND account_analytic_line.invoice_id IS NULL \
+                                AND account_analytic_line.to_invoice IS NOT NULL \
+                                AND account_analytic_journal.type = 'purchase' \
+                            GROUP BY account_analytic_account.id;""",(child_ids,))
+            for account_id, sum in cr.fetchall():
+                res[account_id] = sum
+        res_final = res
+        return res_final
+
+    def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+        lines_obj = self.pool.get('account.analytic.line')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'purchase')], context=context)
+            for line in lines_obj.browse(cr, uid, line_ids, context=context):
+                res[account.id] += line.invoice_id.amount_untaxed
+        return res
+
+
+    _columns = {
+        'charge_expenses' : fields.boolean('Charge Expenses'),
+        'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
+        'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
+        'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"), 
+        'est_expenses': fields.float('Estimation of Expenses to Invoice'),
+    }
+
+    def on_change_template(self, cr, uid, id, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, id, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['charge_expenses'] = template.charge_expenses
+            res['value']['est_expenses'] = template.est_expenses
+        return res
+
+    def open_hr_expense(self, cr, uid, ids, context=None):
+        line_ids = self.pool.get('hr.expense.line').search(cr,uid,[('analytic_account', 'in', ids)])
+        domain = [('line_ids', 'in', line_ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Expenses of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'hr.expense.expense',
+            'nodestroy': True,
+        }
+
+    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'purchase'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Expenses to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+account_analytic_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
new file mode 100644
index 00000000000..0148c05d0b4
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="account_analytic_account_form_expense_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.expense.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field eval="60" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="total"]' position='before'>
+                    <tr>
+                        <td>
+                            <label for="charge_expenses"/>
+                        </td><td>
+                            <field name="charge_expenses"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_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)]}"/>
+                        </td><td>
+                            <group>
+                                <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                                <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            </group>
+                        </td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+        
+        <!--<record id="project_form_expense_form" model="ir.ui.view">
+            <field name="name">project.project.form.expense.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//div[@name="end_of_tabl_hook"]' position='before'>
+                        <tr>
+                            <th class="oe_border_right">Charge Expenses</th>
+                            <td><field name="charge_expenses" nolabel="1"/></td>
+                            <td><field class="oe_th_110px" name="est_expenses" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td width="10px"></td>
+                            <td><button icon="gtk-select-all" class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td><button icon="terp-dolar" class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        </tr>
+                </xpath>
+            </field>
+        </record>-->
+    </data>
+</openerp>
diff --git a/addons/analytic_contract_project/__init__.py b/addons/analytic_contract_project/__init__.py
new file mode 100644
index 00000000000..dd60ac32096
--- /dev/null
+++ b/addons/analytic_contract_project/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import analytic_contract_project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
new file mode 100644
index 00000000000..ccf712dc987
--- /dev/null
+++ b/addons/analytic_contract_project/__openerp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Contract On Project",
+    "version": "1.1",
+    "author" : "OpenERP SA",
+    "website" : "http://www.openerp.com",
+    "depends" : ["project", "account_analytic_analysis"],
+    "description": """
+        Add "Contract Data" in project view.
+    """,
+    "init_xml" : [],
+    "update_xml": ["analytic_contract_project_view.xml"],
+    'demo_xml': [],
+    'installable': True,
+    'auto_install': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
new file mode 100644
index 00000000000..6221617637e
--- /dev/null
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class project_project(osv.osv):
+    _inherit = 'project.project'
+
+    _defaults = {
+        'use_timesheets': True,
+    }
+
+    def open_sale_order_lines(self,cr,uid,ids,context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
+
+    def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
+        analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
+        context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Timesheet Lines to Invoice'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': context,
+            'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+    def open_timesheets(self, cr, uid, ids, context=None):
+        """ open Timesheets view """
+        project = self.browse(cr, uid, ids[0], context)
+        try:
+            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
+        except ValueError:
+            journal_id = False
+        view_context = {
+            'search_default_account_id': [project.analytic_account_id.id],
+            'default_account_id': project.analytic_account_id.id,
+            'default_journal_id': journal_id,
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Bill Tasks Works'),
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': view_context,
+            'nodestroy': True,
+        }
+project_project()
+
+class task(osv.osv):
+    _inherit = "project.task"
+    
+    def create(self, cr, uid, vals, context=None):
+        task_id = super(task, self).create(cr, uid, vals, context=context)
+        task_browse = self.browse(cr, uid, task_id, context=context)
+        self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
+        return task_id
+task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
new file mode 100644
index 00000000000..0e61fe08d01
--- /dev/null
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="project_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">project.project.form.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//page[@name="team"]' position='after'>
+                    <page string="Contract Data">
+                        <group>
+                            <group string="Validity">
+                                <label for="date_start" string="Duration"/>
+                                <div name="duration">
+                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                </div>
+                                <label for="quantity_max"/>
+                                <div>
+                                    <field name="quantity_max" class="oe_inline"/>
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
+                                    <field name="remaining_hours" class="oe_inline"/> 
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group string="Invoice Options">
+                                <field name="manager_id" />
+                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                            </group>
+                        </group>
+                    <separator name="toinvoice" string="Invoicing"/>
+                    <table width="100%%">
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field name="fix_price_invoices" class="oe_inline"/>
+                            </td><td>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
+                            <td>
+                                <label for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field name="invoice_on_timesheets"/>
+                            </td><td>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
+                                <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td>
+                        </tr><tr name="total">
+                            <th>
+                                <label string="Total"/>
+                            </th><td>
+                            </td><td>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_inline"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                    <separator string="Terms and Conditions" name="description"/>
+                    <field name="description"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_timesheets"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="contract_inherited_form" model="ir.ui.view">
+            <field name="name">Inherit contract form : adding UoM</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="priority">50</field>
+            <field name="arch" type="xml">
+                <xpath expr='//field[@name="remaining_hours"]' position='after'>
+                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
deleted file mode 100644
index 0896e7d443c..00000000000
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-
-class analytic_journal_rate_grid(osv.osv):
-
-    _name="analytic_journal_rate_grid"
-    _description= "Relation table between journals and billing rates"
-    _columns={
-        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True,),
-        'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        'rate_id': fields.many2one("hr_timesheet_invoice.factor", "Invoicing Rate",),
-        }
-
-analytic_journal_rate_grid()
-
-class account_analytic_account(osv.osv):
-
-    _inherit = "account.analytic.account"
-    _columns = {
-        'journal_rate_ids': fields.one2many('analytic_journal_rate_grid', 'account_id', 'Invoicing Rate per Journal'),
-    }
-
-account_analytic_account()
-
-class hr_analytic_timesheet(osv.osv):
-
-    _inherit = "hr.analytic.timesheet"
-
-
-    def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0, journal_id=0):
-        res = {}
-        if not (account_id):
-            #avoid a useless call to super
-            return res 
-
-        if not (journal_id):
-            return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id, user_id, unit_amount)
-
-        #get the browse record related to journal_id and account_id
-        temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id) ])
-
-        if not temp:
-            #if there isn't any record for this journal_id and account_id
-            return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id,user_id, unit_amount)
-        else:
-            #get the old values from super and add the value from the new relation analytic_journal_rate_grid
-            r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp)[0]
-            res.setdefault('value',{})
-            res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id, user_id, unit_amount)['value']
-            if r.rate_id.id:
-                res['value']['to_invoice'] = r.rate_id.id
-    
-        return res
-
-
-    def on_change_journal_id(self, cr, uid, ids, journal_id, account_id):
-        res = {}
-        if not (journal_id and account_id):
-            return res 
-
-        #get the browse record related to journal_id and account_id
-        temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id) ])
-        if temp:
-            #add the value from the new relation analytic_user_funct_grid
-            r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp)[0]
-            res.setdefault('value',{})
-            if r.rate_id.id:
-                res['value']['to_invoice'] = r.rate_id.id
-                return res
-        to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [account_id], ['to_invoice'])[0]['to_invoice']
-        if to_invoice:
-            res.setdefault('value',{})
-            res['value']['to_invoice'] = to_invoice[0]
-
-        return res
-
-hr_analytic_timesheet()
-
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-
-    def _get_analytic_lines(self, cr, uid, id, context=None):
-        iml = super(account_invoice, self)._get_analytic_lines(cr, uid, id, context=context)
-        for il in iml:
-            if il['account_analytic_id'] and il.get('analytic_lines', False):
-
-                #get the browse record related to journal_id and account_id
-                journal_id = il['analytic_lines'][0][2]['journal_id']
-                account_id = il['analytic_lines'][0][2]['account_id']
-                if journal_id and account_id:
-                    temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id)], context=context)
-
-                    if temp:
-                        r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp, context=context)[0]
-                        il['analytic_lines'][0][2]['to_invoice'] = r.rate_id.id
-        return iml
-
-account_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
deleted file mode 100644
index 13a159a9321..00000000000
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-        <!-- analytic_journal_rate_grid views -->
-        <record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
-            <field name="name">analytic_journal_rate_grid.tree</field>
-            <field name="model">analytic_journal_rate_grid</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
-                    <field name="journal_id" required="1"/>
-                    <field name="rate_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="analytic_journal_rate_grid_form">
-            <field name="name">analytic_journal_rate_grid.form</field>
-            <field name="model">analytic_journal_rate_grid</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Billing Rate per Journal for this Analytic Account">
-                    <field name="journal_id" required="1"/>
-                    <field name="rate_id" />
-                </form>
-            </field>
-        </record>
-
-        <!-- account.analytic.account inherited view -->
-        <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='to_invoice']" position="after">
-                    <field name="journal_rate_ids" nolabel="1" colspan="4"/>
-                </xpath>                
-            </field>
-        </record>
-
-        <!-- hr_timesheet_sheet.sheet inherited view -->
-        <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
-            <field name="name">hr.timesheet.sheet.form</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!-- hr.analytic.timesheet inherited views -->
-        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
-            <field name="name">hr.analytic.timesheet.form</field>
-            <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@string='Information']//field[@name='account_id']" position="replace">
-                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)" select="1"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
-            <field name="name">hr.analytic.timesheet.form</field>
-            <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@string='Information']//field[@name='journal_id']" position="replace">
-                    <field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
deleted file mode 100644
index c83f406c70b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 00:35+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
diff --git a/addons/analytic_journal_billing_rate/i18n/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
deleted file mode 100644
index 76941f061e5..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-05 20:55+0000\n"
-"Last-Translator: kifcaliph <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "يومية تحليلية"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "قيمة الفواتير لكل يومية للحساب التحليلي هذا"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "حساب تحليلي"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "جدول العلاقة بين اليوميات ومعدلات الفواتير"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "قيمة الفاتورة لكل يومية"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "فاتورة"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "قيمة الفاتورة"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "خط سجل الدوام"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "القيم التحليلية للفواتير اليومية, حدد قيمة الفاتورة الافتراضية ليومية محددة"
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
deleted file mode 100644
index 8ba12019391..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-01 20:24+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Аналитичен дневник"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Фактура"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Грешка! Не можете да създавате рекурсивни аналитични сметки."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ред в графика"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
deleted file mode 100644
index da239c6ec7d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:19+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitička knjiženja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Cijana naplate po knjiženju za ovo Analitičko konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitičko konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela relacija između knjiženja i cijene naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Cijena po knjiženju"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
deleted file mode 100644
index 5b7cc0e6290..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diari analític"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de facturació per diari per aquesta compte analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Taula de relació entre diaris i taxes de facturació"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturació per diari"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de facturació"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! No podeu crear comptes analítics recursius."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línia del full de serveis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Rati facturació diari analític"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Error! La moneda ha de ser la mateixa que la moneda de la companyia "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taxa de facturació d'un diari analític. Defineix la taxa de facturació per "
-#~ "defecte per a un diari en concret."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Aquest mòdul us permet definir el percentatge de facturació per a un "
-#~ "cert diari en un compte donat. S'utilitza principalment quan un usuari "
-#~ "codifica el seu full de serveis: els valors són recuperats i els camps són "
-#~ "auto emplenats tot i que la possibilitat de canviar-los està encara "
-#~ "disponible.\n"
-#~ "\n"
-#~ "Òbviament si no s'ha guardat dades per al compte actual, es proporciona el "
-#~ "valor per defecte per a les dades del compte com sempre, pel que aquest "
-#~ "mòdul és perfectament compatible amb configuracions anteriors.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
deleted file mode 100644
index a8a8e0a7357..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po
deleted file mode 100644
index 76a0270f929..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/da.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-11-09 21:41+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
deleted file mode 100644
index 61874c71a9a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-13 19:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Die Rechnungsnummer muss je Firma eindeutig sein"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytisches Journal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "ungültige BBA Kommunikations Stuktur"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Abrechnungsquote nach Journal"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytisches Konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relation zwischen Journal und Abrechnungsquote"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Abrechnungsquote nach Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Abrechnungsquote"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zeiterfassung Positionen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytisches Journal Verrechnungssatz"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Abrechnungsquote für analytische Buchungen. Definieren Sie einen "
-#~ "Standardwert je spezifiziertem Journal."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Fehler! Die Währung muss der Währung der gewählten Firma entsprechen"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Diese Anwendung ermöglicht Ihnen die Definition einer Standard "
-#~ "Abrechnungsquote für ein analytisches Konto bei Buchung   im Kontext eines "
-#~ "bestimmten Journals. Angewendet wird die Abrechnungsquote meistens, wenn ein "
-#~ "Benutzer seine Zeiterfassung auf  bestimmte Konten vornimmt. Dabei werden "
-#~ "dann die Konten und Beträge automatisch vorausgefüllt, mit der Möglichkeit "
-#~ "diese\n"
-#~ "individuell anzupassen.\n"
-#~ "\n"
-#~ "     Wenn keine Konfiguration bei der Eingabe eines Kontos gefunden wird, "
-#~ "würde weiterhin der Standardwert des Kontos verwendet, so dass dieses Modul "
-#~ "gleichzeitig kompatibel mit älteren Konfigurationseinstellungen ist.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
deleted file mode 100644
index e4447dc733b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-29 10:33+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@li.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Ημερολόγιο Αναλυτικής"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-"Ποσοστό Τιμολόγησης ανα Ημερολόγιο για αυτόν τον Αναλυτικό Λογαριασμό"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Πίνακας σχέσεων μεταξύ ημερολογίων και ποσοστών χρέωσης"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Ποσό Τιμολόγησης ανα Ημερολόγιο"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Ποσό Τιμολόγησης"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Ποσό Τιμολόγησης Ημερολόγιου Αναλυτικής"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
diff --git a/addons/analytic_journal_billing_rate/i18n/en_GB.po b/addons/analytic_journal_billing_rate/i18n/en_GB.po
deleted file mode 100644
index be92d92aa3a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/en_GB.po
+++ /dev/null
@@ -1,130 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-23 13:36+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Invoice Number must be unique per Company!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytic Journal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Invalid BBA Structured Communication !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Billing Rate per Journal for this Analytic Account"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytic Account"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relation table between journals and billing rates"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Invoicing Rate per Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Invoicing Rate"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! You can not create recursive analytic accounts."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Timesheet Line"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Error! The currency has to be the same as that of the selected company"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define the default invoicing rate for a "
-#~ "specific journal on a given account. This is mostly used when a user encodes "
-#~ "their timesheet: the values are retrieved and the fields are auto-filled... "
-#~ "but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given by the account data so that this module is perfectly "
-#~ "compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytic Journal Billing Rate"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "The Object name must start with x_ and not contain any special characters!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
deleted file mode 100644
index 87fbe32c17d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación de un diario analítico. Define la tasa de facturación "
-#~ "por defecto para un diario en concreto."
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
deleted file mode 100644
index cb0058df1a3..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-14 18:33+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Libro Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por libro diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre libros diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por libro diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación del libro diario analítico"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-#~ "especial!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_CR.po b/addons/analytic_journal_billing_rate/i18n/es_CR.po
deleted file mode 100644
index 5f24420f6e8..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_CR.po
+++ /dev/null
@@ -1,136 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-15 15:53+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\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-02-16 05:06+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-"Language: \n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "¡El número de factura debe ser único por compañía!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "¡Estructura de comunicación BBA no válida!"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"No se puede modificar una entrada en un parte de horas Confirmado / ¡Ya "
-"está!."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación de un diario analítico. Define la tasa de facturación "
-#~ "por defecto para un diario en concreto."
diff --git a/addons/analytic_journal_billing_rate/i18n/es_EC.po b/addons/analytic_journal_billing_rate/i18n/es_EC.po
deleted file mode 100644
index adebfb2920a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_EC.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-13 03:51+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación diario analítico. Define la tasa de facturación por "
-#~ "defecto para un diario en concreto."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/es_MX.po b/addons/analytic_journal_billing_rate/i18n/es_MX.po
deleted file mode 100644
index be708d5fbe7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_MX.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default invoicing rate for "
-"a specific journal on a given account. This is mostly used when a user "
-"encodes his timesheet: the values are retrieved and the fields are auto-"
-"filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the account data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir el porcentaje de facturación para un "
-"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-"usuario codifica su hoja de servicios: los valores son recuperados y los "
-"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-"está todavía disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos de la cuenta como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"Analytic Journal Billing Rate, Define the default invoicing rate for a "
-"specific journal"
-msgstr ""
-"Tasa de facturación de un diario analítico. Define la tasa de facturación "
-"por defecto para un diario en concreto."
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_PY.po b/addons/analytic_journal_billing_rate/i18n/es_PY.po
deleted file mode 100644
index 3cb80026dca..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_PY.po
+++ /dev/null
@@ -1,121 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-07 23:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación diario analítico. Define la tasa de facturación por "
-#~ "defecto para un diario en concreto."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/es_VE.po b/addons/analytic_journal_billing_rate/i18n/es_VE.po
deleted file mode 100644
index be708d5fbe7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_VE.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default invoicing rate for "
-"a specific journal on a given account. This is mostly used when a user "
-"encodes his timesheet: the values are retrieved and the fields are auto-"
-"filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the account data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir el porcentaje de facturación para un "
-"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-"usuario codifica su hoja de servicios: los valores son recuperados y los "
-"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-"está todavía disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos de la cuenta como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"Analytic Journal Billing Rate, Define the default invoicing rate for a "
-"specific journal"
-msgstr ""
-"Tasa de facturación de un diario analítico. Define la tasa de facturación "
-"por defecto para un diario en concreto."
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
deleted file mode 100644
index 73bc7debeac..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-11-09 16:30+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analüütiline päevik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Arve esitamise määr päeviku kohta sellel analüütilisel kontol"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Seoste tabel päevikute ja arve esitamise määrade vahel"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Arveldamise määr päeviku kohta"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Arveldamise määr"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
diff --git a/addons/analytic_journal_billing_rate/i18n/fa.po b/addons/analytic_journal_billing_rate/i18n/fa.po
deleted file mode 100644
index d3f1924359b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fa.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-18 17:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian <fa@li.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/fi.po b/addons/analytic_journal_billing_rate/i18n/fi.po
deleted file mode 100644
index fb9cce2592e..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fi.po
+++ /dev/null
@@ -1,91 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-08-08 07:40+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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analyyttinen päiväkirja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Veloitushinta päiväkirjoittain tälle analyyttiselle tilille"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Suhdetaulu päiväkirjojen ja veloituhintojen välillä"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Veloitushinta päiväkirjoittain"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Lasku"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Laskutushinta"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analyyttisen päiväkirjan veloitushinta, määrittele oletushinta tietylle "
-#~ "päiväkirjalle"
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
deleted file mode 100644
index 60d66e52b74..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Journal Analytique"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taux de Facturation par Journal pour ce Compte Analytique"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte Analytique"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tableau de Relations entre les journaux et les taux de Facturations"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taux de Facturation par Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taux de Facturation"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ligne de prestation"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-#~ "spéciaux !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Taux de Facturation des Journaux Analytiques"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taux de facturation par journal analytique. Définir le taux de facturation "
-#~ "par défaut pour un journal donné"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Erreur ! La monnaie doit être la même que la monnaie de la société "
-#~ "sélectionnée"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Ce module vous permet de définir quel est le taux de facturation par "
-#~ "défaut pour un journal spécifique et pour un compte donné. Ceci est surtout "
-#~ "utilisé quand un utilisateur saisit sa feuille de temps : les valeurs sont "
-#~ "récupérées et les champs sont automatiquement remplis... mais la possibilité "
-#~ "de changer ces valeurs est toujours disponible.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
deleted file mode 100644
index 9a2ac1d8a96..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ /dev/null
@@ -1,132 +0,0 @@
-# translation of analytic-journal-billing-rate-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: analytic-journal-billing-rate-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-02-07 10:37+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Galego <g11n@mancomun.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de facturación por diario para esta conta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Táboa de relación entre diarios e taxas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Erro! Non pode crear contas analíticas recorrentes."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Liña de parte de horas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML non válido para a definición da vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Taxa facturación diario analítico"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taxa Analítico de Diario de Facturación, Define o taxa de facturación por "
-#~ "defecto para un diario específico"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "¡Erro! A divisa ten que se-la mesma ca da compañía seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo permítelle establecer cal é a taxa de facturación por "
-#~ "defecto para un diario específico nunha determinada conta. Isto é usado "
-#~ "sobre todo cando un usuario cubre o seu parte de horas: os valores son "
-#~ "recuperados e os campos son cubertos automáticamente... pero a posibilidade "
-#~ "de modificar estes valores aínda está dispoñible.\n"
-#~ "\n"
-#~ "     Por suposto, se ningún dato foi rexistrado para a conta actual, o valor "
-#~ "por defecto é dado como de costume polos datos da conta para que este módulo "
-#~ "sexa perfectamente compatible coas configuracións máis antigas.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/gu.po b/addons/analytic_journal_billing_rate/i18n/gu.po
deleted file mode 100644
index c8034ae4d0c..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/gu.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-03-06 18:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gujarati <gu@li.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-03-07 05:13+0000\n"
-"X-Generator: Launchpad (build 14907)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "વિશ્લેષણાત્મક ખાતું"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "ત્રુટિ! તમે અંદરોઅંદર વિશ્લેષણાત્મક ખાતાઓ ન બનાવી શકો."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
deleted file mode 100644
index 0962c52b6f7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-08 15:46+0000\n"
-"Last-Translator: Goran Kliska <gkliska@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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Dnevnik analitike"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stupanj naplate po temeljnici za ovaj analitički račun"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relacijska tablica između temeljnica i stupnjeva naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Greška! Valuta ne odgovara valuti organizacije."
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
deleted file mode 100644
index a2c566dbf22..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ /dev/null
@@ -1,119 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-30 18:59+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Gyűjtőnapló"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "A gyűjtőkód naplónkénti számlázási rátája"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Gyűjtőkód"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Naplók és számlázási ráták közötti kapcsolati tábla"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Naplónkénti számlázási ráta"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Számlázási ráta"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Munkaidő-kimutatás sora"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Ez a modul lehetővé teszi annak meghatározását, hogy mi a gyűjtőkód "
-#~ "naplójának alapértelmezett számlázási rátája. Leginkább akkor használják, "
-#~ "amikor a felhasználó berögzíti a munkaidő-kimutatását: az értékek feljönnek "
-#~ "és a mezők automatikusan kitöltődnek... De ezeket az értékeket meg lehet "
-#~ "változtatni.\n"
-#~ "\n"
-#~ "    Nyilvánvalóan, ha az aktuális gyűjtőkódra nem vittek be adatot, az "
-#~ "alapértelmezett érték a könyvelési adatokból kerül meghatározásra.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Gyűjtőnapló számlázási ráta. Az adott naplóra meghatározza az "
-#~ "alapértelmezett számlázási rátát."
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
deleted file mode 100644
index 3c4bc6239f9..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:27+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jurnal Analisis"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Akun Analisis"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
deleted file mode 100644
index adb466b3f0b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ /dev/null
@@ -1,97 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-17 20:25+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Giornale conti analitici"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasso di fatturazione per Giornale per questo Conto Analitico"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conto analitico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabella di relazione tra Giornali e tassi di fatturazione"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasso di fatturazione diviso per Giornale"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasso di fatturazione"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linea del Timesheet"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzare l'architettura!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Giornale Conti Analitici Tasso di fatturazione"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Errore! La valuta deve essere la stessa di quella impostata nell'azienda "
-#~ "selezionata"
diff --git a/addons/analytic_journal_billing_rate/i18n/ja.po b/addons/analytic_journal_billing_rate/i18n/ja.po
deleted file mode 100644
index a61b0106483..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ja.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-26 08:50+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-04-27 04:38+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとに固有である必要があります。"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "分析仕訳帳"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "この分析アカウントの仕訳ごとの請求割合"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "分析アカウント"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "仕訳帳と請求割合の関連表"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "仕訳ごとの請求割合"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "請求書"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "請求割合"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "エラー。反復した分析アカウントを作成することはできません。"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "勤務表の行"
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
deleted file mode 100644
index d6bffd7b370..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:10+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "분석 저널"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "이 분석 계정을 위한 저널 당 청구 비율"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "분석 계정"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "저널과 청구 비율 간의 관계"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "저널 당 인보이스 비율"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "청구 비율"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "분석 저널 청구 비율"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
deleted file mode 100644
index 05afa024123..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/lv.po b/addons/analytic_journal_billing_rate/i18n/lv.po
deleted file mode 100644
index 01b645557dd..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/lv.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-28 13:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/mn.po b/addons/analytic_journal_billing_rate/i18n/mn.po
deleted file mode 100644
index 3d59865b775..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/mn.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-21 14:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитик Данс"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Нэхэмжлэл"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Цаг бүртгэлийн мөр"
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
deleted file mode 100644
index dee199ddb49..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ /dev/null
@@ -1,132 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 15:06+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-02-14 05:45+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Factuurnummer moet uniek zijn per bedrijf!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytisch dagboek"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Ongeldige BBA gestructureerde communicatie!"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Doorbelastingsfactor per dagboek voor deze kostenplaats"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Kostenplaats"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Koppelingstabel tussen dagboeken en doorbelastingsfactoren"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Facturerings factor per dagboek"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Het is niet mogelijk een bevestigde/Gereed zijnde boeking van een urenstaat "
-"te wijzigen!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Facturerings factor"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Urenstaatregel"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytisch dagboek factureringstarief"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Kostenplaats dagboek facturatie factor, definieert de standaard facturatie "
-#~ "tarief voor een specifiek dagboek"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Fout! De munteenheid moet hetzelfde zijn als de munteenheid van het "
-#~ "geselecteerde bedrijf"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Deze module laat u standaard factuurtarief voor een specifiek dagboek op "
-#~ "een gegeven rekening. Dit wordt meestal gebruikt bij het invullen van "
-#~ "urenstaten: de waardes worden opgehaald en automatisch ingevuld... met de "
-#~ "mogelijkheid hiervan af te wijken.\n"
-#~ "\n"
-#~ "    Natuurlijk wordt bij het ontbreken ervan bij de huidige rekening, de "
-#~ "standaard waarde als gebruikelijk bepaald uit de rekening gegevens zodat de "
-#~ "module perfect compatibel blijft met oudere configuraties.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
deleted file mode 100644
index cd33100480d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-04-24 15:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
deleted file mode 100644
index 83be8512443..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/oc.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:30+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jornal analitic"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte Analitic"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid per l'arquitectura de la vista"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-#~ "especials !"
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
deleted file mode 100644
index a5475a40063..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-11-17 09:13+0000\n"
-"Last-Translator: Mariusz Bednarz <mbednarz@bedmar.pl>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Dziennik analityczny"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stawki rozliczeniowe na Dziennik dla konta analitycznego"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analityczne"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela relacji między dziennikiem a stawkami rozliczeniowymi"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Faktura w dzienniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Stawki rozliczeniowe dziennika analitycznego"
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
deleted file mode 100644
index 5d6ee807e34..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-16 05:42+0000\n"
-"Last-Translator: OpenERP Administrators <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diário Analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de Facturação por Diário para esta Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela de Relação entre diários e taxas de facturação"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturação por diário"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de Facturação"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivamente"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-#~ "especial !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Diário Analítico da Taxa de Faturação"
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
deleted file mode 100644
index ca814e34f35..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-19 20:12+0000\n"
-"Last-Translator: Emerson <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diário Analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de Cobrança por Diário para esta Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela de relação entre diários e taxas de cobrança"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de Faturamento por Diário"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de Faturamento"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Você não pode criar contas analíticas recursivas"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linha de Apontamento de Horas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
deleted file mode 100644
index 18b684c8b7c..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ /dev/null
@@ -1,131 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jurnal analitic"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Rată facturare per jurnal pentru acest cont analitic"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cont analitic"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabel de relaţii între jurnale şi ratele de facturare"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Rată facturare per jurnal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factură"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Rată facturare"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Eroare! Nu puteti crea conturi analitice recursive."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linie foaie de pontaj"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Jurnal analitic rată de facturare"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Eroare! Moneda trebuie sa fie aceeasi ca si moneda companiei selectate"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Rata de facturare in Jurnalul analitic, Definiti rata predefinita de "
-#~ "facturare pentru un anumit jurnal"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Acest modul va permite sa definiti rata implicita de facturare pentru un "
-#~ "anumit jurnal intr-un cont dat. Acesta este folosit mai ales atunci cand un "
-#~ "utilizator isi codeaza propria foaie de pontaj: valorile sunt recuperate, "
-#~ "iar campurile sunt completate automat... dar inca aveti posibilitatea de a "
-#~ "modifica aceste valori.\n"
-#~ "\n"
-#~ "Este evident faptul ca, daca nu au fost inregistrate date pentru contul "
-#~ "curent, valoarea default este data de obicei de datele contului, astfel ca "
-#~ "acest modul este perfect compatibil cu configurarile mai vechi.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
deleted file mode 100644
index 01e13b33fcd..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:33+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Книга аналитики"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Счет аналитического учета"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Счет"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Скорость выставления счета"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Строка табеля"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
deleted file mode 100644
index da15537789b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-16 18:05+0000\n"
-"Last-Translator: OpenERP Administrators <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitični dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tarifa zaračunavanja po dnevnikih za ta analitični konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela odnosov med dnevniki in tarifami zaračunavanja"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Fakturna stopnja za dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Fakturna stopnja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Postavka časovnice"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tarifa zaračunavanja analitičnega dnevnika"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
diff --git a/addons/analytic_journal_billing_rate/i18n/sq.po b/addons/analytic_journal_billing_rate/i18n/sq.po
deleted file mode 100644
index f907979e379..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sq.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-02 14:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
deleted file mode 100644
index 7d6baf67750..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ /dev/null
@@ -1,97 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-10-27 08:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analiticki Dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stepen naplate po Dnevniku za ovaj Analiticki Konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relaciona tabela izmedju dnevnika i stepena naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Stepen fakturiranja po Dnevniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Fakturisanje cene"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Timesheet Linija"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analiticki Dnevnik obracunate cene"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost "
-#~ "za specificni dnevnik"
diff --git a/addons/analytic_journal_billing_rate/i18n/sr@latin.po b/addons/analytic_journal_billing_rate/i18n/sr@latin.po
deleted file mode 100644
index 91eda48bf01..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sr@latin.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-27 15:53+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 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Broj fakture mora biti jedinstven po kompaniji"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitički dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Nepravilno BBA struktuirana komunikacija !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stepen naplate po Dnevniku za ovaj Analitički Konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela odnosa između dnevnika i stepenova naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Stepen fakturiranja po Dnevniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Ne možete izmeniti unos u kontrolnoj kartici obeleženim kao "
-"Potvrđenim/Završenim"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Stepen fakturisanja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Niz kontrolne kartice"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost "
-#~ "za specificni dnevnik"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analiticki Dnevnik obracunate cene"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
deleted file mode 100644
index 28c03b9dbfa..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-23 04:55+0000\n"
-"Last-Translator: OpenERP Administrators <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analysjournal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analys konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fel! Du kan inte skapa rekursiva analyskonton."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Tidrapportrad"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytic Journal Billing Rate"
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
deleted file mode 100644
index a0eaa131125..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
deleted file mode 100644
index 95977462f5a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ /dev/null
@@ -1,121 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-25 00:10+0000\n"
-"Last-Translator: Ahmet Altınışık <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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Yevmiye Analizi"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Geçersiz BBA Yapılı İletişim !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Bu Analiz Hesabına ait her yevmiyenin Ödem Oranı"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Ödeme oranı ve yevmiyeler arası ilişki tablosu"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Her yevmiye için faturalama oranı"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Faturalama Oranı"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zaman Çizelgesi Satırı"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Bu modül verilen bir hesapta belirli bir yevmiye için varsayılan "
-#~ "faturalama oranını tanımlar. Bu ençok bir kullanıcı zaman çizelgesi "
-#~ "kodlarken kullanılır: Değerler alınır ve alanlar otomatik doldurulur... ama "
-#~ "bu değerleri değiştirebilme olanağı henüz yoktur.\n"
-#~ "\n"
-#~ "    Açıkçası geçerli hesap için bilgi kayıt edilmemişse, varsayılan değer "
-#~ "olağan şekilde hesap verisi tarafından verilir ki; bu da mbu modülün eski "
-#~ "yapılandırmayla uyumlu olduğunu gösterir.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analitik Yevmiye Ödeme Oranı, belirli bir yevmiye için varsayılan faturalama "
-#~ "oranı tanımlayın."
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
deleted file mode 100644
index cc467dce71d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 13:49+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/analytic_journal_billing_rate/i18n/vi.po b/addons/analytic_journal_billing_rate/i18n/vi.po
deleted file mode 100644
index 8c4d2e41175..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/vi.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-02 14:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
deleted file mode 100644
index a06d9d0c4e5..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-09 15:22+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "发票号必须在公司范围内唯一"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "辅助核算账薄"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "BBA传输结构有误！"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "这辅助核算项每个账簿的开单税率"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "辅助核算项"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "账簿和开票税率的关系表"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "每个账簿的开票税率"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "发票"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "已经确认和完成的计工单行不能修改！"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "开票税率"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算项"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "计工单明细"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效XML视图结构!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "辅助核算集合的开票税率"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr "辅助核算账簿的开票税率，为特定辅助核算账簿定义默认开票税率。"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    这模块允许您定义辅助核算项目的指定账簿的默认开票税率，这主要用在用户记工单：这值自动检索和填上。。但可以修改。\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "错误！此币别必须是选定公司的默认币别。"
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
deleted file mode 100644
index a7aee6f1a57..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
-"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-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
deleted file mode 100644
index b4a604b2362..00000000000
--- a/addons/analytic_journal_billing_rate/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_analytic_journal_rate_user,analytic journal rate user,model_analytic_journal_rate_grid,account.group_account_manager,1,0,0,0
-access_analytic_journal_rate_manager,analytic journal rate manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
-access_analytic_journal_rate_account_manager,analytic journal rateaccount manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index d14ed977776..524f0310401 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -32,7 +32,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page" position="after">
                     <page string="Users/Products Rel.">
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 162c38b3da1..77bb6f2e82a 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -10,6 +10,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymized Field" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="model_id" on_change="onchange_model_id(model_id)" />
                     <field name="model_name" on_change="onchange_model_name(model_name)" />
@@ -20,6 +21,7 @@
                     <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
                     <field name="state" />
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
@@ -102,6 +104,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymization History" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="date"/>
                     <field name="state"/>
@@ -119,6 +122,7 @@
                         </tree>
                     </field>
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/anonymous/__init__.py b/addons/anonymous/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py
new file mode 100644
index 00000000000..6babe973aba
--- /dev/null
+++ b/addons/anonymous/__openerp__.py
@@ -0,0 +1,19 @@
+{
+ 'name': 'Anonymous',
+ 'description': 'Allow anonymous access to OpenERP',
+ 'author': 'OpenERP SA',
+ 'version': '1.0',
+ 'category': 'Tools',
+ 'website': 'http://www.openerp.com',
+ 'installable': True,
+ 'depends': ['web'],
+ 'data': [
+    'anonymous.xml',
+ ],
+ 'js': [
+    'static/src/js/anonymous.js',
+ ],
+ 'qweb': [
+     'static/src/xml/anonymous.xml',
+ ],
+}
diff --git a/addons/anonymous/anonymous.xml b/addons/anonymous/anonymous.xml
new file mode 100644
index 00000000000..36be96db5ad
--- /dev/null
+++ b/addons/anonymous/anonymous.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model="res.users" id="user">
+        <field name="name">Anonymous</field>
+        <field name="login">anonymous</field>
+        <field name="password">anonymous</field>
+        <field name="groups_id" eval="[(5,)]"/>
+        <field name="avatar">iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg==</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js
new file mode 100644
index 00000000000..0e33998cd90
--- /dev/null
+++ b/addons/anonymous/static/src/js/anonymous.js
@@ -0,0 +1,48 @@
+openerp.anonymous = function(instance) {
+
+    instance.web.client_actions.add("login", "instance.web.Login");
+
+    instance.web.WebClient.include({
+        show_login: function() {
+            var self = this, _super = this._super;
+            this.login.load_db_list().then(function() {
+                var dblist = self.login._db_list;
+                if (dblist && dblist.length === 1) {
+                    self.login.remember_credentials = false;
+                    // XXX get login/pass from server (via a rpc call) ?
+                    self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() {
+                        _super.apply(self, []);
+                    });
+                } else {
+                    _super.apply(self, []);
+                }
+            });
+        },
+        restart: function() {
+            return this.start();
+        }
+    });
+
+
+    instance.web.UserMenu.include({
+        init: function(parent) {
+            this._super(parent);
+            if (this.session.username == 'anonymous') {
+                this.template = 'UserMenu.anonymous';
+                this.do_update = function() {};     // avoid change of avatar
+            }
+        },
+        start: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            this.$element.find('.oe_topbar_anonymous_login').click(function() {
+                var p = self.getParent();
+                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);
+            });
+        }
+    });
+
+};
diff --git a/addons/anonymous/static/src/xml/anonymous.xml b/addons/anonymous/static/src/xml/anonymous.xml
new file mode 100644
index 00000000000..4c6d2fcbf54
--- /dev/null
+++ b/addons/anonymous/static/src/xml/anonymous.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+<t t-name="UserMenu.anonymous">
+    <a href="#" class="oe_user_menu oe_topbar_item oe_topbar_anonymous_login">
+        <img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
+        Login
+    </a>
+</t>
+
+</templates>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 295ff2793d5..55c55398f4e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,13 +12,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Rule" version="7.0">
-                    <header>
-                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
-                            type="object" states="draft" />
-                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
-                            type="object" states="subscribed" />
-                        <field name="state" widget="statusbar"/>
-                    </header>
+                   <header>
+                       <button string="_Subscribe" name="subscribe" icon="gtk-ok"
+                           type="object" states="draft" />
+                       <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
+                           type="object" states="subscribed" />
+                       <field name="state" widget="statusbar"/>
+                   </header>
+                 <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="object_id"/>
@@ -32,6 +33,7 @@
                         <field name="user_id" colspan="4" nolabel="1" />
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
+                   </sheet>  
                 </form>
             </field>
         </record>
@@ -61,17 +63,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Rule"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -96,6 +99,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
                         <field name="user_id" readonly="1"/>
@@ -141,6 +145,7 @@
                             <field name="new_value_text" />
                         </tree>
                     </field>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -166,18 +171,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="user_id"  widget="selection"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Log"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                        <field name="user_id"  widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index af30566a643..0ee7f98a020 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -44,8 +44,8 @@ from .. import utils
 
 
 
-_logger = logging.getLogger('web.auth_openid')
-oidutil.log = logging.getLogger('openid').debug
+_logger = logging.getLogger(__name__)
+oidutil.log = _logger.debug
 
 
 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index c51735f8ded..11d53a0899c 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -13,80 +13,82 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                        <field name="filter_id" />
-                        <field name="sequence"/>
-                        <field name="active"/>
-                    </group>
-                    <notebook>
-                        <page string="Conditions">
-                            <group>
-                                <group name="model" string="Conditions on Model Fields">
-                                    <field name="regex_name"/>
-                                    <field name="trg_user_id"/>
-                                </group>
-                                <group name="partner" string="Conditions on Model Partner">
-                                    <field name="trg_partner_id"/>
-                                    <field name="trg_partner_categ_id"/>
-                                </group>
-                                <group string="Conditions on States">
-                                    <field name="trg_state_from"/>
-                                    <field name="trg_state_to"/>
-                                </group>
-                                <group string="Conditions on Timing">
-                                    <field name="trg_date_type"/>
-                                    <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
-                                        <field name="trg_date_range" string="Delay After Trigger Date"/>
-                                        <field name="trg_date_range_type"/>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="model_id" on_change="onchange_model_id(model_id)"/>
+                            <field name="filter_id" />
+                            <field name="sequence"/>
+                            <field name="active"/>
+                        </group>
+                        <notebook>
+                            <page string="Conditions">
+                                <group>
+                                    <group name="model" string="Conditions on Model Fields">
+                                        <field name="regex_name"/>
+                                        <field name="trg_user_id"/>
+                                    </group>
+                                    <group name="partner" string="Conditions on Model Partner">
+                                        <field name="trg_partner_id"/>
+                                        <field name="trg_partner_categ_id"/>
+                                    </group>
+                                    <group string="Conditions on States">
+                                        <field name="trg_state_from"/>
+                                        <field name="trg_state_to"/>
+                                    </group>
+                                    <group string="Conditions on Timing">
+                                        <field name="trg_date_type"/>
+                                        <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
+                                            <field name="trg_date_range" string="Delay After Trigger Date"/>
+                                            <field name="trg_date_range_type"/>
+                                        </group>
                                     </group>
                                 </group>
-                            </group>
-                            <separator string="Note"/>
-                            <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
-                        </page>
-                        <page string="Actions">
-                            <group string="Fields to Change" col="4">
-                                <field name="act_user_id"/>
-                                <field name="act_state"/>
-                            </group>
-                            <group col="2" string="Server Action to be Triggered">
-                                <field name="server_action_id"/>
-                            </group>
-                        </page>
-                        <page string="Email Actions">
-                            <group col="4">
-                                <separator colspan="4" string="Email Reminders"/>
-                                <field name="act_remind_partner"/>
-                                <field name="act_remind_attach"/>
-                                <field name="act_remind_user"/>
-                                <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                    <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                <separator string="Note"/>
+                                <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                            </page>
+                            <page string="Actions">
+                                <group string="Fields to Change" col="4">
+                                    <field name="act_user_id"/>
+                                    <field name="act_state"/>
                                 </group>
-                                <separator colspan="4" string="Email Information"/>
-                                <field name="act_email_from" />
-                                <field name="act_email_to" />
-                                <field name="act_mail_to_user"/>
-                                <field colspan="4" name="act_mail_to_email"/>
-                                <field name="act_mail_to_watchers"/>
-                                <field colspan="4" name="act_email_cc"/>
-                                <separator colspan="4" string="Email Body"/>
-                                <field colspan="4" name="act_mail_body" height="250"
-                                    nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
-                                <separator colspan="4" string="Special Keywords to be Used in the Body"/>
-                                <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
-                                <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
-                                <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
-                                <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
-                                <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                                <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                            </group>
-                        </page>
-                    </notebook>
+                                <group col="2" string="Server Action to be Triggered">
+                                    <field name="server_action_id"/>
+                                </group>
+                            </page>
+                            <page string="Email Actions">
+                                <group col="4">
+                                    <separator colspan="4" string="Email Reminders"/>
+                                    <field name="act_remind_partner"/>
+                                    <field name="act_remind_attach"/>
+                                    <field name="act_remind_user"/>
+                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
+                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                    </group>
+                                    <separator colspan="4" string="Email Information"/>
+                                    <field name="act_email_from" />
+                                    <field name="act_email_to" />
+                                    <field name="act_mail_to_user"/>
+                                    <field colspan="4" name="act_mail_to_email"/>
+                                    <field name="act_mail_to_watchers"/>
+                                    <field colspan="4" name="act_email_cc"/>
+                                    <separator colspan="4" string="Email Body"/>
+                                    <field colspan="4" name="act_mail_body" height="250"
+                                        nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
+                                    <separator colspan="4" string="Special Keywords to be Used in the Body"/>
+                                    <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
+                                    <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
+                                    <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
+                                    <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
+                                    <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
+                                    <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
            </record>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fa073938a37..da58c54cd73 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -28,37 +28,40 @@
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="email" string="Invitation To"/>
-                            <field name="cutype" string="Invitation Type" />
-                            <field name="rsvp" />
-                            <field name="role" string="Role" />
-                            <field name="sent_by_uid" string="Invitation From" />
+
+                        <div class="oe_title">
+                            <label for="email" string="Invitation To" class="oe_edit_only" /> 
+                            <h1>
+                                <field name="email" class="oe_inline" />
+                                (<field name="language" class="oe_inline" />)
+                            </h1>
+                            
+                            <h2>
+                                From <field name="event_date" class="oe_inline" />
+                                to <field name="event_end_date" class="oe_inline"/>
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="sent_by_uid" string="Invitation From" />
+                                <field name="user_id" string="Invited User"/>
+                                <field name="partner_id" string="Contact" />
+                            </group>
+                            <group>
+                                <field name="cutype" string="Invitation Type" />
+                                <field name="role" string="Role" />
+                                <field name="rsvp" />
+                                <field name="ref" readonly="1"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Delegrated From">
+                                <field name="parent_ids" readonly="1" nolabel="1" />
+                            </group>
+                            <group string="Delegrated To" >
+                                <field name="child_ids" readonly="1" nolabel="1" />
+                            </group>
                         </group>
-                        <notebook>
-                            <page string="Invitation">
-                                <group>
-                                    <group string="Invitation Detail">
-                                        <field name="user_id" string="Invited User"/>
-                                        <field name="partner_id" string="Contact" />
-                                    </group>
-                                    <group string="Event Detail">
-                                        <field name="event_date" />
-                                        <field name="event_end_date" />
-                                        <field name="language"/>
-                                        <field name="ref" readonly="1"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Delegation Info">
-                                <separator string="Delegated From" colspan="4" />
-                                <field name="parent_ids"
-                                    readonly="1" />
-                                <separator string="Delegated To" colspan="4" />
-                                <field name="child_ids"
-                                    readonly="1" />
-                            </page>
-                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -91,6 +94,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <field name="email" string="Email"/>
+                   <separator orientation="vertical"/>
+                   <field name="event_date"/>
+                   <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        help="Invitations To Review" />
@@ -104,11 +111,9 @@
                        domain="[('state','=', 'delegated')]"
                        help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email"/>
                    <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type"/>
-                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -432,6 +437,8 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
+                           <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                           <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -440,9 +447,6 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" string="Summary"/>
-                           <field name="location" string="Location"/>
-                           <separator orientation="vertical"/>
                            <field name="user_id"/>
                            <separator orientation="vertical"/>
                            <field name="show_as"/>
@@ -462,7 +466,6 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-
                         </group>
                 </search>
             </field>
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 9b91f7d3108..8a9d1ac1dc7 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -42,8 +42,10 @@ from osv import fields,osv
 import pooler
 from tools.translate import _
 from service import security
+import logging
 
 magic_md5 = '$1$'
+_logger = logging.getLogger(__name__)
 
 def gen_salt( length=8, symbols=ascii_letters + digits ):
     seed()
@@ -179,8 +181,7 @@ class users(osv.osv):
             cr = pooler.get_db(db).cursor()
             return self._login(cr, db, login, password)
         except Exception:
-            import logging
-            logging.getLogger('netsvc').exception('Could not authenticate')
+            _logger.exception('Could not authenticate')
             return Exception('Access Denied')
         finally:
             if cr is not None:
diff --git a/addons/base_crypt/i18n/mn.po b/addons/base_crypt/i18n/mn.po
new file mode 100644
index 00000000000..c7f5e03b7f6
--- /dev/null
+++ b/addons/base_crypt/i18n/mn.po
@@ -0,0 +1,46 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-19 09:29+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-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "Хэрэглэгч"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Энэ хэрэглэгчийн сонгосон компани зөвшөөрөгдсөн компаниуд дунд алга байна."
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "Алдаа"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
index 2aab8596862..42198337450 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
@@ -27,21 +27,20 @@ LOG_INFO='info'
 LOG_WARNING='warn'
 LOG_ERROR='error'
 LOG_CRITICAL='critical'
+_logger = logging.getLogger(__name__)
 
 def log_detail(self):
     import os
-    logger = logging.getLogger()
     logfile_name = os.path.join(tempfile.gettempdir(), "openerp_report_designer.log")
     hdlr = logging.FileHandler(logfile_name)
     formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
     hdlr.setFormatter(formatter)
-    logger.addHandler(hdlr)
-    logger.setLevel(logging.INFO)
+    _logger.addHandler(hdlr)
+    _logger.setLevel(logging.INFO)
 
 class Logger(object):
     def log_write(self,name,level,msg):
-        log = logging.getLogger(name)
-        getattr(log,level)(msg)
+        getattr(_logger,level)(msg)
 
     def shutdown(self):
         logging.shutdown()
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..9c1d7d9fa8e 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -97,27 +97,4 @@ class specify_partner_terminology(osv.osv_memory):
                 self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
 
-# Preferences wizard for Sales & CRM.
-# It is defined here because it is inherited independently in modules sale, crm,
-# plugin_outlook and plugin_thunderbird.
-class sale_config_settings(osv.osv_memory):
-    _name = 'sale.config.settings'
-    _inherit = 'res.config.settings'
-    _columns = {
-        'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
-            help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, a task, a project, an analytical
-                account, or any other object and attach the selected mail as a .eml file in
-                the attachment of a selected record. You can create documents for CRM Lead,
-                HR Applicant and Project Issue from the selected emails.
-                This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook Plugin',
-            help="""The Outlook plugin allows you to select an object that you would like to add
-                to your email and its attachments from MS Outlook. You can select a partner, a task,
-                a project, an analytical account, or any other object and archive a selected
-                email into an OpenERP mail message with attachments.
-                This installs the module plugin_outlook."""),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 5046b122bf5..eb59d918681 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,6 +1,17 @@
 <openerp>
   <data>
 
+    <!-- Show menus that are hidden in module base -->
+    <record id="base.menu_res_company_global" model="ir.ui.menu">
+        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+    </record>
+    <record id="base.menu_users" model="ir.ui.menu">
+        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+    </record>
+    <record id="base.menu_publisher_warranty" model="ir.ui.menu">
+        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+    </record>
+
       <!--   Specify Your Terminology Config Wiz-->
      <record id="base_setup_terminology_form" model="ir.ui.view">
           <field name="name">Specify Your Terminology</field>
@@ -32,45 +43,5 @@
           <field name="target">new</field>
       </record>
 
-    <record id="base.view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale settings</field>
-        <field name="model">sale.config.settings</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Configure Sales" version="7.0">
-                <header>
-                    <button string="Apply" type="object" name="execute"/>
-                    <button string="Cancel" special="cancel"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group name="config_sale" colspan="4"/>
-
-                        <!-- this part is necessary to allow the plugins to extend the view -->
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <separator string="Emails"/>
-                        </group>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                        <group name="config_crm" colspan="2"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <!-- Sale config wizard -->
-    <record id="base.action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.config.settings</field>
-        <field name="view_id" ref="base.view_sale_config_settings"/>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 5cc2296cbcf..8bf029ddbdb 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-05-23 09:07+0000\n"
+"PO-Revision-Date: 2012-06-25 05:03+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-05-24 11:08+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -122,7 +122,7 @@ msgstr "Salesforceのインポート"
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooksのlppidsの為に"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -131,6 +131,8 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"初めてopenERPを利用する場合は、簡素化されたインターフェイスを選択されることをお勧めします。設定後いつでもユーザープリファレンスから設定変更ができま"
+"す。"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -187,16 +189,18 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"これは新規ユーザーのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザーはユーザー設定フォームで自由に設定変更ができま"
+"す。"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "どのように顧客を呼びますか"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks lppids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 92914f8f7a3..f6fdcefe8fe 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,13 +28,44 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('Multi Company',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Portal',
-            help="""Define a portal for your customers or suppliers.  The portal is a group of
-                external users that has specific access rights and rules.
-                This installs the module portal."""),
-        'module_share': fields.boolean('Share',
-            help="""Share OpenERP documents (records) with external users.
-                This installs the module share."""),
+        'module_portal': fields.boolean('Activate Customer Portal',
+            help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
+        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+            help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
+    }
+
+    def open_company(self, cr, uid, ids, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Your Company',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'res.company',
+            'res_id': user.company_id.id,
+         }
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+class sale_config_settings(osv.osv_memory):
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+            help="""The plugin allows you archive email and its attachments to the selected
+                OpenERP objects. You can select a partner, or a lead and
+                attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                Partner from the selected emails.
+                This installs the module plugin_thunderbird."""),
+        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+            help="""The Outlook plugin allows you to select an object that you would like to add
+                to your email and its attachments from MS Outlook. You can select a partner,
+                or a lead object and archive a selected
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0b85e13a08f..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,24 +8,32 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group>
+                    <sheet>
                         <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                        </group>
-
-                        <group string="Others">
-                            <label string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
+                            <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>
                         <group string="External Accesses">
                             <field name="module_share"/>
                             <field name="module_portal"/>
                         </group>
-                    </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>
                 </form>
             </field>
         </record>
@@ -39,5 +47,38 @@
         <menuitem id="menu_general_configuration" parent="base.menu_config"
             sequence="100" action="action_general_configuration"/>
 
+        <!-- Sale config wizard -->
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Sales" version="7.0">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
+                    </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>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_config" model="ir.actions.act_window">
+            <field name="name">Configure Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.settings</field>
+            <field name="view_id" ref="view_sale_config_settings"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/base_tools/i18n/es_AR.po b/addons/base_tools/i18n/es_AR.po
new file mode 100644
index 00000000000..d41d0eea63c
--- /dev/null
+++ b/addons/base_tools/i18n/es_AR.po
@@ -0,0 +1,32 @@
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 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-06-18 18:37+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Base común para módulos herramientas"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 7b8363ffd6b..e76442b62fe 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -23,11 +23,12 @@ import logging
 import string
 import datetime
 import re
+_logger = logging.getLogger(__name__)
 
 try:
     import vatnumber
 except ImportError:
-    logging.getLogger('base_vat').warning("VAT validation partially unavailable because the `vatnumber` Python library cannot be found. "
+    _logger.warning("VAT validation partially unavailable because the `vatnumber` Python library cannot be found. "
                                           "Install it to support more countries, for example with `easy_install vatnumber`.")
     vatnumber = None
 
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index d05abe38b4b..1d7f06eb571 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -10,9 +10,9 @@
                 <field name="property_account_payable" position="after" version="7.0">
                     <label for="vat"/>
                     <div>
-                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_form_inline"/>
-                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_form_inline"/>
-                        <field name="vat_subjected" class="oe_form_inline"/>
+                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_inline"/>
+                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/>
+                        <field name="vat_subjected" class="oe_inline"/>
                     </div>
                 </field>
             </field>
diff --git a/addons/base_vat/i18n/es_CL.po b/addons/base_vat/i18n/es_CL.po
new file mode 100644
index 00000000000..a6f16bfdac0
--- /dev/null
+++ b/addons/base_vat/i18n/es_CL.po
@@ -0,0 +1,82 @@
+# Spanish (Chile) 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-06-18 17:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <es_CL@li.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-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:141
+#, python-format
+msgid ""
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr ""
+"El RUT no es válido. Se debe ingresar de la siguiente forma: %s\n"
+"Incluyendo dígito verificador y anteponiendo cl ."
+
+#. module: base_vat
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "El nombre de la empresa debe ser único!"
+
+#. module: base_vat
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
+
+#. module: base_vat
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr "Validador VIES VAT"
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No se pueden crear compañías recursivas."
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
+"declaración legal del IVA."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
+"Si está activada, los números de RUT de los Partners serán validados "
+"completamente en contra del servicio VIES de la UE en lugar de ser validado "
+"a través de un formato sencillo de validación (comprobación)"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "Sujeto a IVA"
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index e54c08d2291..e9b698d562b 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -39,6 +39,7 @@ The user can also publish notes.
         'board_view.xml',
         'board_data_admin.xml',
         'board_data_home.xml',
+        'board_mydashboard_view.xml'
     ],
     'demo_xml': [
         'board_demo.xml'
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml
new file mode 100644
index 00000000000..7a517c36ed7
--- /dev/null
+++ b/addons/board/board_mydashboard_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!--My Dashboard-->
+        <record model="ir.ui.view" id="board_my_dash_view">
+            <field name="name">My Dashboard</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="My Dashboard" layout="manual"  version="7.0">
+                    <board style="2-1">
+                        <column>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+
+        <!--My Dashboard Action-->
+        <record model="ir.actions.act_window" id="open_board_my_dash_action">
+            <field name="name">My Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_my_dash_view"/>
+            <field name="help">
+                This is your personal dashboard.
+                To customize it, go to any view in OpenERP, fill in the desired search filter,
+                and click on 'Add to Dashboard' in the search options.
+                The view will appear as an element in your dashboard.
+                &lt;p&gt;
+                You can drag and drop the elements to get your preferred dashboard layout.
+                Click on the cross (in the upper right corner) to remove an element.
+            </field>
+        </record> 
+
+        <!--My Dashboard Menu-->
+        <menuitem 
+            id="menu_board_my_dash"
+            parent="base.menu_reporting_dashboard"
+            action="open_board_my_dash_action"
+            sequence="5"/>
+    </data>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 231d1956cca..f556b461835 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name"/>
+                <field name="name" string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index cab8d56891e..647b1a378da 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-16 12:58+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
+"PO-Revision-Date: 2012-06-18 18:46+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <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-02-09 06:41+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Año  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Crear menú"
 
 #. module: board
 #: view:board.menu.create:0
@@ -34,33 +34,33 @@ msgstr "Información del menú"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Últimas conexiones"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in last month"
-msgstr ""
+msgstr "Registro creado en el último mes"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Tablero de Administración"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current year"
-msgstr ""
+msgstr "Registro creado en el último"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Tabla"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -71,7 +71,7 @@ msgstr "Nombre del menú"
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Actividad global semanal"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -81,29 +81,29 @@ msgstr "Título"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# de entradas"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current month"
-msgstr ""
+msgstr "Registro creado en el último mes"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Actividad mensual por documento"
 
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Resumen de configuración"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -114,37 +114,37 @@ msgstr "Definición del tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Conexiones de usuario"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Análisis de registros"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objeto"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: board
 #: field:board.board,line_ids:0
@@ -154,7 +154,7 @@ msgstr "Vistas de acciones"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Reporte de registro"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
@@ -165,13 +165,13 @@ msgstr "¡Por favor inserte vista(s) de tablero!"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: board
 #: view:board.menu.create:0
@@ -181,17 +181,17 @@ msgstr "Crear menú para tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Línea tablero"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
@@ -201,22 +201,22 @@ msgstr "Menú padre"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -224,11 +224,13 @@ msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"tablero."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: board
 #: view:board.board:0
@@ -247,7 +249,7 @@ msgstr "¡Error de usuario!"
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -257,17 +259,17 @@ msgstr "Posición"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Página Principal"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Últimas actividades"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -292,7 +294,7 @@ msgstr "Ancho"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -302,12 +304,12 @@ msgstr "Secuencia"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: board
 #: view:board.board:0
@@ -328,13 +330,13 @@ msgstr "Crear menú del tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: board
 #: view:board.menu.create:0
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 71e9bdc2468..da5c5f017a6 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -23,6 +23,7 @@ from document_webdav import nodes
 from document.nodes import _str2time, nodefd_static
 import logging
 from orm_utils import get_last_modified
+_logger = logging.getLogger(__name__)
 
 try:
     from tools.dict_tools import  dict_merge2
@@ -223,7 +224,6 @@ class node_calendar(nodes.node_class):
         res = []
         if not filters:
             return res
-        _log = logging.getLogger('caldav.query')
         if filters.localName == 'calendar-query':
             res = []
             for filter_child in filters.childNodes:
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 53adcd97e16..02025ab5261 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,16 +158,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
+                    <field name="name" string="Calendar"/>
+                    <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 94d28e4ad37..fb98e00a86f 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -34,6 +34,7 @@ import logging
 from caldav_node import res_node_calendar
 from orm_utils import get_last_modified
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 try:
     import vobject
@@ -240,7 +241,6 @@ def map_data(cr, uid, obj, context=None):
 
 class CalDAV(object):
     __attribute__ = {}
-    _logger = logging.getLogger('document.caldav')
 
     def ical_set(self, name, value, type):
         """ set calendar Attribute
@@ -725,13 +725,13 @@ class Calendar(CalDAV, osv.osv):
                 objs.append(cal_children[child.name.lower()])
             elif child.name.upper() == 'CALSCALE':
                 if child.value.upper() != 'GREGORIAN':
-                    self._logger.warning('How do I handle %s calendars?',child.value)
+                    _logger.warning('How do I handle %s calendars?',child.value)
             elif child.name.upper() in ('PRODID', 'VERSION'):
                 pass
             elif child.name.upper().startswith('X-'):
-                self._logger.debug("skipping custom node %s", child.name)
+                _logger.debug("skipping custom node %s", child.name)
             else:
-                self._logger.debug("skipping node %s", child.name)
+                _logger.debug("skipping node %s", child.name)
         
         res = []
         for obj_name in list(set(objs)):
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 1abbf573ef0..3a5604b2f67 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -23,6 +23,7 @@ from osv import osv, fields
 from tools.translate import _
 import caldav_node
 import logging
+_logger = logging.getLogger(__name__)
 
 class calendar_collection(osv.osv):
     _inherit = 'document.directory' 
@@ -44,8 +45,7 @@ class calendar_collection(osv.osv):
             root_cal_dir = self.browse(cr,uid, root_id, context=context) 
             return root_cal_dir.name
         except Exception:
-            logger = logging.getLogger('document')
-            logger.warning('Cannot set root directory for Calendars:', exc_info=True)
+            _logger.warning('Cannot set root directory for Calendars:', exc_info=True)
             return False
         return False
 
diff --git a/addons/claim_from_delivery/i18n/es_AR.po b/addons/claim_from_delivery/i18n/es_AR.po
new file mode 100644
index 00000000000..0a420b27d93
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/es_AR.po
@@ -0,0 +1,23 @@
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 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-18 18:38+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reclamar"
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 768c0147020..1b8148fe43b 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,111 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
      <data>
-        <!-- crm user dashboard -->
-        <record model="ir.ui.view" id="crm_case_my_open_oppor">
-            <field name="name">Opportunities</field>
-            <field name="model">crm.lead</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                    <field name="name" string="Opportunity"/>
-                    <field name="partner_id" string="Customer"/>
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                    <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="date_deadline" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
-                </tree>
-            </field>
-        </record>
+        <!-- CRM dashboard -->
         <record model="ir.actions.act_window" id="act_my_oppor">
-            <field name="name">My Open Opportunities</field>
+            <field name="name">My Opportunities</field>
             <field name="res_model">crm.lead</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
-            <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="crm_case_my_open_oppor"/>
-            <field name="act_window_id" ref="act_my_oppor"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_form_view">
-            <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="act_my_oppor"/>
+            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
         </record>
 
-        <record id="view_report_crm_oppor_graph" model="ir.ui.view">
-            <field name="name">crm.lead.report.graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="act_my_oppor_stage">
-             <field name="name">Planned Revenue By Stage</field>
-             <field name="res_model">crm.lead.report</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">graph,tree,form</field>
-             <field name="view_id" ref="view_report_crm_oppor_graph"/>
-             <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
-             <field name="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form">
-            <field name="name">Sales Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Dashboard" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
-                        </column>
-                        <column>
-                            <action string="My Planned Revenues by Stage" name="%(act_my_oppor_stage)d"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_form"/>
-        </record>
-
-        <!-- crm mananger dashboard -->
-        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">Opportunities By Categories - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="act_oppor_categ">
-            <field name="name">Opportunities By Categories</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'search_default_Category':1}</field>
+        <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
+            <field name="name">New Leads</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid),('state','=','draft'),('type','=','lead')]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
         </record>
 
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
@@ -119,6 +29,7 @@
                 </graph>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="act_opportunity_stage">
             <field name="name">Opportunities By Stage</field>
             <field name="res_model">crm.lead.report</field>
@@ -129,28 +40,41 @@
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
+        <!--Planned Revenue By User line graph-->
         <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
             <field name="name">Opportunities By Stage Per User - Graph</field>
             <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="bar">
+                <graph string="Opportunities By Stage" type="line">
                     <field name="stage_id"/>
                     <field name="planned_revenue" operator="+"/>
                     <field name="user_id" group="True"/>
                 </graph>
             </field>
         </record>
+
+        <!--Planned Revenue By User line graph action-->
         <record model="ir.actions.act_window" id="act_oppor_stage_user">
             <field name="name">Planned Revenue By User and Stage</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel')]</field>
+            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',datetime.date.today().strftime("%Y-%m-%d"))]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
+        <record model="ir.actions.act_window" id="crm_case_confirmed_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.crm_case_tree_view_meet"/>
+            <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"/>
+        </record>
+
         <record model="ir.ui.view" id="board_crm_statistical_form">
             <field name="name">CRM - Statistical Dashboard Form</field>
             <field name="model">board.board</field>
@@ -159,29 +83,33 @@
                 <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
                         <column>
-                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
-                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
+                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
+                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
+                            <action string="My Next Meetings" name="%(crm_case_confirmed_meet)d"/>
                         </column>
                         <column>
                             <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
+                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                     </board>
                 </form>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM Manager</field>
+            <field name="name">CRM</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
-        <menuitem 
+
+        <menuitem
             id="menu_board_statistics_dash"
             parent="base.menu_reporting_dashboard"
             action="open_board_statistical_dash"
-            sequence="11"
+            sequence="10"
             groups="base.group_sale_manager"/>
 
     </data>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21c7f9e31ab..8fc6beabe8b 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -271,7 +271,59 @@
             <field name="city">Grand-Rosière</field>
             <field eval="1367" name="zip"/>
             <field name="country_id" ref="base.be"/>
+            <field name="color">8</field>
         </record>
+        <!-- Some messages linked to the previous opportunity -->
+        <record id="message_email0" model="mail.message">
+            <field name="subject">Kitchen design</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="type">email</field>
+            <field name="state">sent</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Internal note0]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0_comment0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[comment on note0]]></field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0_comment1" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[comment1 on note0]]></field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_email1" model="mail.message">
+            <field name="subject">Your inquiry</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="type">email</field>
+            <field name="state">received</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        
         <record id="crm_case_unifliege" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 02fc3369041..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -40,33 +40,12 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
-    <act_window
-            id="act_crm_opportunity_crm_phonecall_new"
-            name="Phone calls"
-            groups="base.group_sale_salesman"
-            res_model="crm.phonecall"
-            src_model="crm.lead"
-            view_mode="tree,calendar,form"
-            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-    <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <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_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'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.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 86a891aae45..d9c65daaada 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name"/>
+                    <field name="name" string="Stage Name"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -53,6 +54,25 @@
         <!--
             LEADS
             -->
+        <act_window
+                id="act_crm_opportunity_crm_phonecall_new"
+                name="Phone calls"
+                groups="base.group_sale_salesman"
+                res_model="crm.phonecall"
+                view_mode="tree,calendar,form"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
+        <act_window
+                id="act_crm_opportunity_crm_meeting_new"
+                name="Meetings"
+                res_model="crm.meeting"
+                view_mode="tree,form,calendar"
+                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -74,7 +94,17 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_meeting_new)d"
+                            string="Meetings" />
+
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_phonecall_new)d"
+                            string="Phone Calls" />
+                    </div>
+
+                    <label for="name" class="oe_edit_only" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
                         <group>
@@ -96,8 +126,8 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_form_inline" placeholder="City"/>
+                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                    <field name="city" class="oe_inline" placeholder="City"/>
                                 </div>
                                 <field name="state_id" placeholder="State"/>
                                 <field name="country_id" placeholder="Country"/>
@@ -142,7 +172,7 @@
                     </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
+                <div class="oe_bottom">
                     <field name="message_ids" widget="ThreadView"/>
                 </div>
             </form>
@@ -215,17 +245,18 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
-                            <a class="oe_kanban_menuaction oe_i">B</a>
-                            <ul class="oe_kanban_menu">
-                                <li><a type="edit" >Edit...</a></li>
-                                <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
-                                <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
-                                <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
-                                <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                            </ul>
+                        <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>
+                                <ul class="oe_dropdown_menu">
+                                    <li><a type="edit" >Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                    <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+                                    <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                </ul>
+                            </div>
                             <div class="oe_kanban_content">
                                 <div>
                                     <b><field name="name"/></b>
@@ -282,6 +313,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                <field name="subjects"/>     
+                <separator orientation="vertical"/>
+                <field name="create_date"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
@@ -294,39 +331,21 @@
                     string="Pending"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Leads" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Leads creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Leads"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
-                </field>
-                <field name="subjects"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}">
-                    <filter icon="terp-personal+"
+                <filter string="Leads Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="section_id" widget="selection"
+                    context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
-                <field name="country_id" context="{'invisible_country': False}">
-                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                </field>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -345,6 +364,15 @@
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
+                <separator orientation="vertical"/>
+                <group string="Display">
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
            </search>
         </field>
     </record>
@@ -363,6 +391,10 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -375,15 +407,11 @@
                             states="done,cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <div class="oe_right oe_form_button_box">
+                    <div class="oe_right oe_button_box">
                         <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d"
                             type="action"/>
@@ -391,15 +419,15 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                    <div class="oe_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
 
-                        <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                        <label for="planned_revenue" class="oe_edit_only"/>
                         <h2>
-                            <field name="planned_revenue" class="oe_form_inline"/>
-                            <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
-                            <field name="probability" class="oe_form_inline"/> %% success rate
+                            <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
                         </h2>
                     </div>
                     <group>
@@ -416,7 +444,7 @@
                             <label for="title_action"/>
                             <div>
                                 <field name="date_action" nolabel="1"/> -
-                                <field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
+                                <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
                             </div>
                             <field name="date_deadline"/>
                             <field name="priority"/>
@@ -452,8 +480,8 @@
                                     <field name="street" placeholder="Street..."/>
                                     <field name="street2"/>
                                     <div>
-                                        <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                        <field name="city" class="oe_form_inline" placeholder="City"/>
+                                        <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                        <field name="city" class="oe_inline" placeholder="City"/>
                                     </div>
                                     <field name="state_id" placeholder="State"/>
                                     <field name="country_id" placeholder="Country"/>
@@ -537,6 +565,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
                     name="new"
@@ -549,25 +580,20 @@
                     string="Pending"  help="Pending Opportunities"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Opportunities"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
-                </field>
-                <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter icon="terp-personal+"
+               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
-                        help="My Sales Team(s)" />
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="country"/>
+                <field name="partner_id"/>
+                <field name="section_id"
+                    context="{'invisible_section': False, 'default_section_id': self}"/>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@@ -584,6 +610,13 @@
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
+                <group string="Display">
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index bc1ab42b3df..1e21d535c55 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -26,6 +26,7 @@ import logging
 from osv import fields, osv
 import tools
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 class crm_lead(base_stage, osv.osv):
         """ CRM Leads """
@@ -40,8 +41,8 @@ class crm_meeting(base_state, osv.Model):
     _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, help='Sales team to which Case belongs to.'),
+        '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),
@@ -180,7 +181,7 @@ class res_users(osv.osv):
                                             'user_id': user_id}, context=context)
             except:
                 # Tolerate a missing shortcut. See product/product.py for similar code.
-                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+                _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
         return user_id
 
 res_users()
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
index 7427afe1e58..a1179fab075 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -53,7 +53,7 @@
 			<field eval="6.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="&quot;open&quot;" name="state"/>
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet3"/>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7c0b2f6cfa4..5f94e3d738f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
     <act_window
         id="crm_case_categ_meet_create_partner"
         name="Schedule a Meeting"
         res_model="crm.meeting"
-        src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
         domain="[('partner_id', '=', active_id)]"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e98ce2ce8f6..85e9864115a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,52 +38,62 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                <group col="6" colspan="4">
-                    <field name="name" string="Title"
-                           required="1" />
-                    <field name="categ_id" widget="selection"
-                        string="Meeting Type"
-                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="date_deadline" string="End Date" required="1"
-                        on_change="onchange_dates(date,False,date_deadline)" />
-                    <field name="location" />
-                    <field name="alarm_id" string="Reminder"
-                        widget="selection" />
-                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" string="Recurrence"/>
+                    <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>
+                            At <field name="location" class="oe_inline" />
+                        </h2>
+                    </div>
+                    <h2>
+                        <label for="duration" string="Duration" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)"
+                            class="oe_inline"/> from
+                        <field name="date"
+                            string="Start Date" 
+                            required="1"
+                            class="oe_edit_only oe_inline"/> to
+                        <field name="date_deadline" 
+                            string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)"                            
+                            class="oe_inline"/> 
+                    </h2>
+                <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="Meeting">
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Assignment"/>
-                            <field name="user_id" />
-                            <field name="organizer"/>
-                            <field name="section_id" widget="selection"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Partner"
-                                on_change="onchange_partner_id(partner_id)" />
-                            <field name="email_from"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
-                            <field name="show_as" string="Show Time as"/>
-                            <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" />
-                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -157,12 +167,11 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                    <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" />
-                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -209,9 +218,9 @@
                     </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
@@ -276,12 +285,14 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter icon="terp-personal"
+                               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" />
-                           </field>
+                           <separator orientation="vertical"/>   
+                           <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
                 </search>
@@ -296,7 +307,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="language" position="after">
+                    <field name="ref" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..e2204d66efc 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -6,7 +6,6 @@
         id="crm_case_categ_phone_create_partner"
         name="Schedule a Call"
         res_model="crm.phonecall"
-        src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_sale_salesman"
@@ -106,7 +105,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'default_state\':\'open\'}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b5c75aa6ccf..966387608ed 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,50 +65,48 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending" icon="gtk-go-forward"/>
+                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending" icon="gtk-jump-to"/>
+                        states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel" icon="gtk-convert"/>
+                        states="cancel"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending" icon="gtk-cancel"/>
+                        states="draft,open,pending"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    icon="gtk-index" type="action"
+                    type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
-                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
+                  <div class="oe_title">
+                      <div class="oe_edit_only">
+                          <label for="name" string="Title"/> 
+                      </div>
+                      <h1><field name="name" required="1"/></h1>
+                      <div class="oe_edit_only">
+                        <label for="partner_phone" string="Phone" />
+                      </div>
+                      <h2><field name="partner_phone"/></h2>
+                  </div>
                  <group col="4">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"/>
-                    <field name="duration" widget="float_time"/>
-
-                    <field name="date"/>
-                    <field name="user_id"/>
+                    <field name="date" />
+                    <field name="user_id" />
+                    <field name="duration" widget="float_time" />
                     <field name="section_id" colspan="1" widget="selection" />
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="partner_mobile" />
+                    <field name="priority"/>
+                    <field name="opportunity_id"/>
                 </group>
 
-                <group>
-                    <group string="Contacts">
-                        <field name="partner_id"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="partner_mobile"/>
-                    </group>
-                    <group string="Categorization">
-                        <field name="categ_id" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="priority"/>
-                        <field name="opportunity_id"/>
-                    </group>
-                </group>
-                <separator string="Description"/>
-                <field name="description"/>
+                <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
@@ -179,82 +177,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
+               <field name="name" string="Phonecalls"/>
+               <separator orientation="vertical"/>
+               <field name="date"/>
                <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
-        </field>
-    </record>
-    <!-- Scheduled a phonecall search view-->
-    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
-        <field name="name">CRM - Scheduled Calls Search</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Scheduled Phonecalls">
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
+               <filter string="Unassigned Phonecalls"
+                       icon="terp-personal-"
                        domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
+                       help="Unassigned Phonecalls"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls that are assigned to me or to my team(s)" />
+               <separator orientation="vertical"/>
+               <field name="partner_id"/>
+               <field name="user_id"/>
                <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
+                   widget="selection" string="Sales Team"/>
                <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index e89e0c1a8d8..2c62ae2ead3 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,17 +69,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Type for this month" />
-                           <separator orientation="vertical"/>
-                           <field name="section_id"
-                               widget="selection" />
-                           <field name="category2_id"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
+                        <field name="section_id" widget="selection" />
+                        <field name="category2_id"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
@@ -163,13 +158,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Stage for this month" />
-                           <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -238,19 +229,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section, Category and Stage for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-
-                   </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -332,18 +318,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by User for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-                   </group>
+                    </group>
                </search>
             </field>
     </record>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b9da39c4721..257d1cd93f7 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -158,13 +158,13 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
+                        <field name="state" string="Related State" />
                         <field name="probability"/>
-                        <field name="on_change"/>
-                        <field name="case_default"/>
-                        <field name="sequence"/>
-                        <field name="state"/>
-                        <field name="fold"/>
                         <field name="type"/>
+                        <field name="on_change"/>
+                        <field name="sequence"/>
+                        <field name="case_default"/>
+                        <field name="fold"/>
                     </group>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d153eed4714..142d44432f0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -72,17 +72,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
                             name="lead"
                             string="Lead"
@@ -110,18 +99,15 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index c91999319ce..3f28fb8730e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -52,17 +52,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Phone calls made in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Phone calls made in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
@@ -75,17 +64,16 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Phone calls that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b40ed78bb16..563da4bd137 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,7 +26,7 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
+        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'module_crm_caldav': fields.boolean("Caldav Synchronization",
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index a09f333076f..38c8c2db2e4 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -6,30 +6,37 @@
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_fetchmail" position="after">
-                    <field name="fetchmail_lead"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <label for="fetchmail_lead"/>
+                    <div>
+                        <field name="fetchmail_lead"/>
+                    	<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
+                    </div>
                 </group>
 
                 <group name="config_crm" position="after">
-                    <separator string="Import and Synchronize Data from an Other Application" colspan="4"/>
-                    <field name="module_import_sugarcrm"/>
-                    <field name="module_crm_caldav"/>
-                    <field name="module_import_google"/>
+                    <group string="Import and Synchronize Data from an Other Application">
+                        <field name="module_import_sugarcrm"/>
+                        <field name="module_crm_caldav"/>
+                        <field name="module_import_google"/>
+                    </group>
 
-                    <separator string="Documents and Wiki" colspan="4"/>
-                    <field name="module_wiki_sale_faq" />
+                    <group string="Documents and Wiki">
+                        <field name="module_wiki_sale_faq"/>
+                    </group>
 
-                    <separator string="Customer Form" colspan="4"/>
-                    <field name="module_google_map"/>
+                    <group string="Customer Form">
+                        <field name="module_google_map"/>
+                    </group>
                 </group>
             </field>
         </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base.action_sale_config"/>
+            sequence="1" action="base_setup.action_sale_config"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 78a956f65ac..4b2cf008958 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,6 +39,9 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="country_id"/>
+                    </xpath>
                 </field>
         </record>
 
@@ -82,6 +85,27 @@
             </field>
         </record>
 
+
+        <record model="ir.ui.view" id="res_partner_view_buttons">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action"
+                        string="Schedule a Meeting"
+                        name="%(crm.crm_case_categ_meet_create_partner)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}" />
+                    <button type="action" string="Create an Opportunity"
+                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index b91b31d7721..ad1a763fa46 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,29 +10,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
-                <header>
-                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                </header>
-                <group>
+                    <header>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
                     <group>
-                        <field name="action"/>
-                        <field name="name"/>
-                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        <group>
+                            <field name="action"/>
+                            <field name="name"/>
+                            <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" readonly="True"/>
+                            <field name="categ_id" string="Type"
+                                widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"
+                            groups="base.group_no_one"/>
+                            <field name="phone"/>
+                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type"
-                            widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        groups="base.group_no_one"/>
-                        <field name="phone"/>
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
-                </group>
-                <field name="note"/>
+                    <field name="note" placeholder="Call Description" />
                 </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 a65aa4ae5e0..c7641d8f64d 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -42,5 +42,4 @@
             view_mode="form" target="new" view_type="form"
             groups="base.group_sale_salesman"/>
      </data>
-
 </openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 75bfd9ce211..d4bfd8f21bb 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -51,9 +51,13 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        <menuitem id="menu_project_config_project" name="Stages" parent="menu_definitions" sequence="1"/>
-        <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="menu_project_config_project" sequence="20"/>
+        <menuitem
+            icon="terp-project" id="base.menu_main_pm"
+            name="Project" sequence="10"/>
+        
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
+        <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6477234ce05..db479343281 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -166,7 +166,7 @@
                         </notebook>
                     </group>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_sheet_width">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
@@ -196,6 +196,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
+                    <field name="name" string="Claims"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
                         help="New Claims" />
@@ -209,14 +211,13 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
+                    <filter string="Unassigned Claims"
+                            icon="terp-personal-"
+                            domain="[('user_id','=', False)]"
+                            help="Unassigned Claims" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                            <filter icon="terp-personal-"
-                                domain="[('user_id','=', False)]"
-                                help="Unassigned Claims" />
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_claim/i18n/mn.po b/addons/crm_claim/i18n/mn.po
new file mode 100644
index 00000000000..9bbdbc0acab
--- /dev/null
+++ b/addons/crm_claim/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 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 12:47+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-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Хэрэгийн #"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Хариуцагч"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Дараагий үйлдлийн огноо"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Хаахыг азнах"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Шийдэл"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#Гомдол"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
+
+#. module: crm_claim
+#: code:addons/crm_claim/crm_claim.py:132
+#, python-format
+msgid "The claim '%s' has been opened."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date Closed"
+msgstr "Хаагдсан огноо"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Date of claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "All pending Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+#: model:ir.model,name:crm_claim.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month of claim"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Year of claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_claim
+#: view:res.partner:0
+msgid "Partners Claim"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+#: field:res.partner,claims_ids:0
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "New Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Unassigned Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in last month"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My company"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress Claims"
+msgstr ""
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 62beda00c8a..e92102f889d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -54,20 +54,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                       <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Claims created in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Claims created in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in last month"/>
-
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -77,27 +63,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -116,6 +97,7 @@
                         <field name="priority" />
                         <field name="type_action" />
                         <newline/>
+                        <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
                     </group>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 0dca243890b..05f7962e18b 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails", readonly=True,
+        'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails",
             fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
             help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
     }
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 72632c1afef..ba9e75ba7c0 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -6,12 +6,16 @@
             <field name="name">crm_claim settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
-            <field name="priority" eval="12"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="config_fetchmail" position="after">
-                    <field name="fetchmail_claim"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <label for="fetchmail_claim"/>
+                    <div>
+                        <field name="fetchmail_claim"/>
+                        <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index eb7bcade10b..dfe58162d83 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,6 +163,8 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
+                            <field name="name" string="Fund Description"/>
+                            <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
                                 help="New Funds" />
@@ -174,20 +176,19 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <field name="state"/>
-                            <field name="name"
-                                string="Fund Description" />
-                            <field name="user_id"
-                                widget="selection">
-                                <filter icon="terp-personal-"
+                            <filter string="Unassigned"
+                                    icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
-                            </field>
-                            <field name="section_id" widget="selection" string="Sales Team">
-                                <filter icon="terp-personal+"
+                            <filter string="Assigned to Me or to My Sales Team(s)" 
+                                    icon="terp-personal+"
                                     domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="My Sales Team(s)" />
-                            </field>
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                            <separator orientation="vertical" />
+                            <field name="state"/>
+                            <field name="user_id" 
+                                widget="selection"/>
+                            <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
@@ -197,14 +198,12 @@
                             <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Category" help="Fund Category"
                                 icon="terp-stock_symbol-selection" domain="[]"
                                 context="{'group_by':'categ_id'}" />
                             <filter string="Payment Mode" help="Payment Mode"
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index afdcf56d50e..5a3ed924567 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -78,19 +78,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Funds raised in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Funds raised in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -100,23 +87,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -128,6 +114,7 @@
                             domain="[('state','=','cancel')]"/>
                         <separator orientation="vertical"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="create_date"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 1239dff85ff..2a004b32d3e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -45,7 +45,7 @@
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Helpdesk Support" layout="auto">
-                    <group col="4" class="oe_form_header">
+                    <group col="4" class="oe_header">
                         <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
                         <field name="user_id"/>
@@ -149,6 +149,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <field name="name" string="Query"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
@@ -163,25 +167,14 @@
                         domain="[('state','=','pending')]"
                         help="All pending Helpdesk Request"
                     />
+                    <filter string="Assigned to Me or My Sales Team(s)"
+                            icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','&gt;=',current_date), ('date','&lt;=',current_date)]"
-                        help="Todays's Helpdesk Requests"
-                        />
-                    <filter icon="terp-go-week"
-                        string="7 Days"
-                        help="Helpdesk requests during last 7 days"
-                        domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                    <separator orientation="vertical"/>
-                    <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My Sales Team(s)" />
-                    </field>
+                    <field name="section_id" widget="selection" string="Sales Team"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_helpdesk/i18n/mn.po b/addons/crm_helpdesk/i18n/mn.po
new file mode 100644
index 00000000000..aebf579953b
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/mn.po
@@ -0,0 +1,738 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-18 18:25+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-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "Хаахыг Азнах"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "Хэрэгийн #"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "Энэ жил хийгдсэн тусламжийн хүсэлтүүд"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "Хамгийн Өндөр"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "Тусламжийн Төвийн Хүсэлтийн Огноо"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "Миний компани"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "Туламжийн Төвийн Шинжилгээ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "Хаах огноо"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Код"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "Дараагийн үйлдэл"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index fdf8d5ad0f9..6060c6c1f90 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -54,47 +54,35 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests occurred in current year"/>
-                        <separator orientation="vertical" />
-
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in last month"/>
-                        <separator orientation="vertical" />
                         <filter string="New" icon="terp-check"
                         domain="[('state','=','draft')]" />
                         <filter string="Open" icon="terp-camera_test"
                         domain="[('state','=','open')]" />
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <filter string="My Sales Team(s)"
+                            icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                            icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>   
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
                         <newline/>
+                        <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
                     <newline/>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 18b31c009ad..a34a9139c3c 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -10,11 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
diff --git a/addons/crm_todo/i18n/mn.po b/addons/crm_todo/i18n/mn.po
new file mode 100644
index 00000000000..189b6ec293b
--- /dev/null
+++ b/addons/crm_todo/i18n/mn.po
@@ -0,0 +1,96 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 12:40+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-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Хугацааны муж"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "Даалгаварыг цуцлахад"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Миний даалгаврууд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Сэжим / Боломж"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "Төлөвийг хийгдсэн болгож өөрчлөхөд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Өмнөх"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 099754aef06..5e54f74f7f1 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -143,9 +143,9 @@
                     <field colspan="4" name="name"/>
                     <div>
                         <label string="condition" for="type"/>
-                        <field name="type" class="oe_form_inline"/>
-                        <field name="operator" class="oe_form_inline"/>
-                        <field name="max_value" class="oe_form_inline"/>
+                        <field name="type" class="oe_inline"/>
+                        <field name="operator" class="oe_inline"/>
+                        <field name="max_value" class="oe_inline"/>
                     </div>
                     <group col="4">
                         <field name="list_price"/>
@@ -192,7 +192,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
+                <field name="company_id" position="before">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </field>
@@ -230,12 +230,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id" position="after">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
@@ -245,12 +243,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
@@ -264,7 +260,7 @@
                     <group>
                         <label for="carrier_id"/>
                         <div>
-                            <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_form_inline"/>
+                            <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"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index 1ed299dc900..0541782cd93 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/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-21 18:47+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-06-19 05:58+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-22 04:44+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -405,7 +405,7 @@ msgstr "原価"
 #. module: delivery
 #: field:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Picking Policy"
-msgstr "出庫方策"
+msgstr "集荷方針"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -574,7 +574,7 @@ msgstr "価格情報"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver all products at once"
-msgstr "全ての製品を一緒に配送"
+msgstr "全ての製品を一緒に配達"
 
 #. module: delivery
 #: field:delivery.carrier,use_detailed_pricelist:0
@@ -631,7 +631,7 @@ msgstr "配送コスト"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver each product when available"
-msgstr "ある製品ごとに配送する。"
+msgstr "利用可能になった時に各製品を配達"
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index d4dc924b6a0..235cff3a872 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -5,14 +5,11 @@
             <field name="name">res.partner.carrier.property.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="inherit_id" ref="stock.view_partner_property_form" />
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
-                        <separator string="Deliveries Properties" colspan="4"/>
-                        <field name="property_delivery_carrier"/>
-                    </group>
-                </page>
+                <field name="property_stock_supplier" position="after">
+                    <field name="property_delivery_carrier"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 635a74052e9..38e4a16ad85 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -12,10 +12,13 @@
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
+                             <action string="Files by Month"
+                                name="%(document.action_view_files_by_month_graph)d"
+                                view_mode="graph,tree"/>
                         </column>
                         <column>
-                            <action string="File Size by Month"
-                                name="%(document.action_view_size_month)d"
+                            <action string="Files by user"
+                                name="%(document.action_view_files_by_user_graph)d"
                                 view_mode="graph,tree"/>
                         </column>
                      </board>
@@ -25,71 +28,18 @@
 
 
         <record model="ir.actions.act_window" id="open_board_document_manager">
-            <field name="name">Document Dashboard</field>
+            <field name="name">Knowledge</field>
              <field name="res_model">board.board</field>
              <field name="view_type">form</field>
              <field name="view_mode">form</field>
-
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
+        
+         <menuitem id="menu_reports_document"
+                   parent="base.menu_reporting_dashboard"
+                   sequence="55"
+                   action="open_board_document_manager"
+                   icon="terp-graph"/>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
-         <menuitem
-            name="Knowledge"
-            id="menu_reports_document"
-            parent="base.menu_reporting_dashboard"
-            sequence="45"
-            groups="base.group_system"/>
-
-
-         <menuitem
-            parent="menu_reports_document"
-            action="open_board_document_manager"
-            sequence="1"
-            id="menu_reports_document_manager"
-            icon="terp-graph"/>
-
-        <record model="ir.ui.view" id="board_document_manager_form1">
-            <field name="name">board.document.manager.form1</field>
-             <field name="model">board.board</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-                <form string="Document board" layout="manual" version="7.0">
-                     <board style="2-1">
-                        <column>
-                            <action string="Wall of Shame"
-                                name="%(document.action_view_wall)d"
-                                view_mode="tree"/>
-
-                        </column>
-                        <column>
-                            <action string="Files by Users"
-                                name="%(document.action_view_user_graph)d"
-                                view_mode="graph,tree"/>
-
-                            <action string="Files by Month"
-                                name="%(document.action_view_files_by_month_graph)d"
-                                view_mode="graph,tree"/>
-                        </column>
-                     </board>
-                 </form>
-            </field>
-        </record>
-
-
-        <record model="ir.actions.act_window" id="open_board_document_manager1">
-            <field name="name">Statistics by User</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_document_manager_form1"/>
-        </record>
-
-        <menuitem
-            parent="menu_reports_document"
-            action="open_board_document_manager1"
-            sequence="1"
-            id="menu_reports_document_manager1"
-            icon="terp-graph"/>
      </data>
  </openerp>
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 64b480ee736..f24c033a7ec 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -22,7 +22,7 @@ import logging
 import os
 import tempfile
 from subprocess import Popen, PIPE
-
+_logger = logging.getLogger(__name__)
 class NhException(Exception):
     pass
 
@@ -116,7 +116,7 @@ def mime_match(mime, mdict):
     return (None, None)
 
 class contentIndex(object):
-    __logger = logging.getLogger('addons.document.content_index')
+    
     def __init__(self):
         self.mimes = {}
         self.exts = {}
@@ -132,7 +132,7 @@ class contentIndex(object):
             f = True
 
         if f:
-            self.__logger.debug('Register content indexer: %r', obj)
+            _logger.debug('Register content indexer: %r', obj)
         if not f:
             raise Exception("Your indexer should at least suport a mimetype or extension")
 
@@ -169,22 +169,22 @@ class contentIndex(object):
                 (result, _) = pop.communicate()
 
                 mime2 = result.split(';')[0]
-                self.__logger.debug('File gave us: %s', mime2)
+                _logger.debug('File gave us: %s', mime2)
                 # Note that the temporary file still exists now.
                 mime,fobj = mime_match(mime2, self.mimes)
                 if not mime:
                     mime = mime2
             except Exception:
-                self.__logger.exception('Cannot determine mime type')
+                _logger.exception('Cannot determine mime type')
 
         try:
             if fobj:
                 res = (mime, fobj.indexContent(content,filename,fname or realfname) )
             else:
-                self.__logger.debug("Have no object, return (%s, None)", mime)
+                _logger.debug("Have no object, return (%s, None)", mime)
                 res = (mime, None )
         except Exception:
-            self.__logger.exception("Could not index file %s (%s)",
+            _logger.exception("Could not index file %s (%s)",
                                     filename, fname or realfname)
             res = None
 
@@ -193,8 +193,7 @@ class contentIndex(object):
             try:
                 os.unlink(fname)
             except Exception:
-                self.__logger.exception("Could not unlink %s", fname)
-
+                _logger.exception("Could not unlink %s", fname)
         return res
 
 cntIndex = contentIndex()
diff --git a/addons/document/document.py b/addons/document/document.py
index 92ece063a47..fa65f8d9966 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -30,12 +30,15 @@ from tools.translate import _
 import nodes
 import logging
 
+_logger = logging.getLogger(__name__)
+
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['root_path'], 'filestore'))
 
 class document_file(osv.osv):
     _inherit = 'ir.attachment'
     _rec_name = 'datas_fname'
-
+   
+   
     def _attach_parent_id(self, cr, uid, ids=None, context=None):
         """Migrate ir.attachments to the document module.
 
@@ -54,7 +57,7 @@ class document_file(osv.osv):
 
         parent_id = self.pool.get('document.directory')._get_root_directory(cr,uid)
         if not parent_id:
-            logging.getLogger('document').warning("at _attach_parent_id(), still not able to set the parent!")
+            _logger.warning("at _attach_parent_id(), still not able to set the parent!")
             return False
 
         if ids is not None:
@@ -140,8 +143,8 @@ class document_file(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, ctx:uid,
+        'parent_id': __get_def_directory,
         'file_size': lambda self, cr, uid, ctx:0,
-        'parent_id': __get_def_directory
     }
     _sql_constraints = [
         # filename_uniq is not possible in pure SQL
@@ -336,7 +339,7 @@ class document_file(osv.osv):
                 if r:
                     unres.append(r)
             else:
-                logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
+                self.loggerdoc.warning("Unlinking attachment #%s %s that has no storage",
                                                 f.id, f.name)
         res = super(document_file, self).unlink(cr, uid, ids, context)
         stor.do_unlink(cr, uid, unres)
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index ac7a174b05f..a7bc98de6f3 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -104,6 +104,5 @@
     <!-- After we have setup the root directory, migrate the attachments
         to point to that. -->
     <function model="ir.attachment" name="_attach_parent_id"/>
-
 </data>
 </openerp>
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d09d2cc86d5..03b2dcc47bf 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -22,10 +22,10 @@
 
 from osv import osv, fields
 from osv.orm import except_orm
-
+import logging
 import nodes
 from tools.translate import _
-
+_logger = logging.getLogger(__name__)
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
@@ -78,9 +78,8 @@ class document_directory(osv.osv):
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
         except Exception, e:
-            import netsvc
-            logger = netsvc.Logger()
-            logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
+            
+            _logger.warning('Cannot set directory root:'+ str(e))
             return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index fe757e7876d..339b320e9a7 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -29,18 +29,15 @@ import logging
 import shutil
 from StringIO import StringIO
 import psycopg2
-
 from tools.misc import ustr
 from tools.translate import _
-
 from osv.orm import except_orm
-
 import random
 import string
 import pooler
 import nodes
 from content_index import cntIndex
-
+_logger = logging.getLogger(__name__)
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config.get('root_path'), 'filestore'))
 
 
@@ -130,7 +127,7 @@ class nodefd_file(nodes.node_descriptor):
                 mime, icont = cntIndex.doIndex(None, filename=filename,
                         content_type=None, realfname=fname)
             except Exception:
-                logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                _logger.debug('Cannot index file:', exc_info=True)
                 pass
 
             try:
@@ -150,7 +147,7 @@ class nodefd_file(nodes.node_descriptor):
                 cr.commit()
                 cr.close()
             except Exception:
-                logging.getLogger('document.storage').warning('Cannot save file indexed content:', exc_info=True)
+                _logger.warning('Cannot save file indexed content:', exc_info=True)
 
         elif self.mode in ('a', 'a+' ):
             try:
@@ -164,7 +161,7 @@ class nodefd_file(nodes.node_descriptor):
                 cr.commit()
                 cr.close()
             except Exception:
-                logging.getLogger('document.storage').warning('Cannot save file appended content:', exc_info=True)
+                _logger.warning('Cannot save file appended content:', exc_info=True)
 
 
 
@@ -191,7 +188,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -217,7 +214,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
                     mime, icont = cntIndex.doIndex(data, filename=filename,
                             content_type=None, realfname=None)
                 except Exception:
-                    logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                    _logger.debug('Cannot index file:', exc_info=True)
                     pass
 
                 try:
@@ -241,7 +238,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
                     (out, len(data), par.file_id))
             cr.commit()
         except Exception:
-            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            _logger.exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
             cr.close()
@@ -271,7 +268,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -297,7 +294,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
                     mime, icont = cntIndex.doIndex(data, filename=filename,
                             content_type=None, realfname=None)
                 except Exception:
-                    logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                    self.logger.debug('Cannot index file:', exc_info=True)
                     pass
 
                 try:
@@ -320,7 +317,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
                     (base64.encodestring(data), len(data), par.file_id))
             cr.commit()
         except Exception:
-            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            _logger.exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
             cr.close()
@@ -339,7 +336,6 @@ class document_storage(osv.osv):
     """
     _name = 'document.storage'
     _description = 'Storage Media'
-    _doclog = logging.getLogger('document')
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
@@ -402,7 +398,7 @@ class document_storage(osv.osv):
         npath = filter(lambda x: x is not None, npath)
 
         # if self._debug:
-        #     self._doclog.debug('Npath: %s', npath)
+        #     self._logger.debug('Npath: %s', npath)
         for n in npath:
             if n == '..':
                 raise ValueError("Invalid '..' element in path")
@@ -413,7 +409,7 @@ class document_storage(osv.osv):
         dpath += npath[:-1]
         path = os.path.join(*dpath)
         if not os.path.isdir(path):
-            self._doclog.debug("Create dirs: %s", path)
+            _logger.debug("Create dirs: %s", path)
             os.makedirs(path)
         return path, npath
 
@@ -451,7 +447,7 @@ class document_storage(osv.osv):
                 # try to fix their directory.
                 if mode in ('r','r+'):
                     if ira.file_size:
-                        self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                        _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                     raise IOError(errno.ENOENT, 'No file can be located')
                 else:
                     store_fname = self.__get_random_fname(boo.path)
@@ -493,7 +489,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                    _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
             return file(fpath, 'rb').read()
@@ -517,7 +513,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    self._doclog.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                    _logger.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
                 # sfname = ira.name
             fpath = os.path.join(boo.path,ira.store_fname or ira.name)
             if os.path.exists(fpath):
@@ -550,7 +546,7 @@ class document_storage(osv.osv):
         if boo.readonly:
             raise IOError(errno.EPERM, "Readonly medium")
 
-        self._doclog.debug( "Store data for ir.attachment #%d" % ira.id)
+        _logger.debug( "Store data for ir.attachment #%d" % ira.id)
         store_fname = None
         fname = None
         if boo.type == 'filestore':
@@ -563,13 +559,13 @@ class document_storage(osv.osv):
                     fp.write(data)
                 finally:    
                     fp.close()
-                self._doclog.debug( "Saved data to %s" % fname)
+                _logger.debug( "Saved data to %s" % fname)
                 filesize = len(data) # os.stat(fname).st_size
                 
                 # TODO Here, an old file would be left hanging.
 
             except Exception, e:
-                self._doclog.warning( "Couldn't save data to %s", path, exc_info=True)
+                _logger.warning( "Couldn't save data to %s", path, exc_info=True)
                 raise except_orm(_('Error!'), str(e))
         elif boo.type == 'db':
             filesize = len(data)
@@ -592,12 +588,12 @@ class document_storage(osv.osv):
                     fp.write(data)
                 finally:    
                     fp.close()
-                self._doclog.debug("Saved data to %s", fname)
+                _logger.debug("Saved data to %s", fname)
                 filesize = len(data) # os.stat(fname).st_size
                 store_fname = os.path.join(*npath)
                 # TODO Here, an old file would be left hanging.
             except Exception,e :
-                self._doclog.warning("Couldn't save data:", exc_info=True)
+                _logger.warning("Couldn't save data:", exc_info=True)
                 raise except_orm(_('Error!'), str(e))
 
         elif boo.type == 'virtual':
@@ -616,7 +612,7 @@ class document_storage(osv.osv):
                 mime, icont = cntIndex.doIndex(data, ira.datas_fname,
                 ira.file_type or None, fname)
             except Exception:
-                self._doclog.debug('Cannot index file:', exc_info=True)
+                _logger.debug('Cannot index file:', exc_info=True)
                 pass
 
             try:
@@ -633,7 +629,7 @@ class document_storage(osv.osv):
             file_node.content_type = mime
             return True
         except Exception, e :
-            self._doclog.warning("Couldn't save data:", exc_info=True)
+            self._logger.warning("Couldn't save data:", exc_info=True)
             # should we really rollback once we have written the actual data?
             # at the db case (only), that rollback would be safe
             raise except_orm(_('Error at doc write!'), str(e))
@@ -671,9 +667,9 @@ class document_storage(osv.osv):
                 try:
                     os.unlink(fname)
                 except Exception:
-                    self._doclog.warning("Could not remove file %s, please remove manually.", fname, exc_info=True)
+                    _logger.warning("Could not remove file %s, please remove manually.", fname, exc_info=True)
             else:
-                self._doclog.warning("Unknown unlink key %s" % ktype)
+                _logger.warning("Unknown unlink key %s" % ktype)
 
         return True
 
@@ -703,9 +699,9 @@ class document_storage(osv.osv):
             fname = ira.store_fname
 
             if not fname:
-                self._doclog.warning("Trying to rename a non-stored file")
+                _logger.warning("Trying to rename a non-stored file")
             if fname != os.path.join(*npath):
-                self._doclog.warning("inconsistency in realstore: %s != %s" , fname, repr(npath))
+                _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(npath))
 
             oldpath = os.path.join(path, npath[-1])
             newpath = os.path.join(path, new_name)
@@ -743,7 +739,7 @@ class document_storage(osv.osv):
                 break
             par = par.parent_id
         if file_node.storage_id != psto:
-            self._doclog.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name)
+            _logger.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name)
             raise NotImplementedError('Cannot move files between storage media')
 
         if sbro.type in ('filestore', 'db', 'db64'):
@@ -756,9 +752,9 @@ class document_storage(osv.osv):
             fname = ira.store_fname
 
             if not fname:
-                self._doclog.warning("Trying to rename a non-stored file")
+                _logger.warning("Trying to rename a non-stored file")
             if fname != os.path.join(*opath):
-                self._doclog.warning("inconsistency in realstore: %s != %s" , fname, repr(opath))
+                _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(opath))
 
             oldpath = os.path.join(path, opath[-1])
             
@@ -766,12 +762,12 @@ class document_storage(osv.osv):
             npath = filter(lambda x: x is not None, npath)
             newdir = os.path.join(*npath)
             if not os.path.isdir(newdir):
-                self._doclog.debug("Must create dir %s", newdir)
+                _logger.debug("Must create dir %s", newdir)
                 os.makedirs(newdir)
             npath.append(opath[-1])
             newpath = os.path.join(*npath)
             
-            self._doclog.debug("Going to move %s from %s to %s", opath[-1], oldpath, newpath)
+            _logger.debug("Going to move %s from %s to %s", opath[-1], oldpath, newpath)
             shutil.move(oldpath, newpath)
             
             store_path = npath[1:] + [opath[-1],]
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e8ce8be4f2d..da4b6c2284d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -39,8 +39,8 @@
             <field name="model">document.storage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Document storage">
-                    <field name="name" />
+                <search string="Search Document Storage">
+                    <field name="name" string="Document Storage"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -69,7 +69,7 @@
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Directories" col="4">
+            <form string="Directories" col="4" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="parent_id"/>
@@ -171,13 +171,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
+                    <field name="name" string="Document Directory"/>
+                    <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" />
-                    <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
+                    <field name="user_id" />
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -238,47 +239,49 @@
         <field name="priority" eval="1"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Documents">
-                <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>
+            <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>
-                </page>
-                <page string="Indexed Content - experimental" groups="base.group_no_one">
-                    <field name="index_content"/>
-                </page>
-                <page string="Notes">
-                    <field name="description"/>
-                </page>
-                </notebook>
+                    <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>
     </record>
@@ -289,15 +292,18 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-                <field name="create_uid" position="replace">
-                    <field name="user_id">
-                            <filter icon="terp-personal"
-                                domain="[('user_id','=',uid)]"
-                                help="Filter on my documents" />
-                        </field>
+                <xpath expr="//filter[@name='my_documents_filter']" position="replace">
+                    <filter name="my_documents_filter" 
+                            string="My Document(s)"
+                            icon="terp-personal"
+                            domain="[('user_id','=',uid)]"
+                            help="Filter on my documents"/>
+                </xpath>
+                <xpath expr="//field[@name='create_uid']" position="replace">
+                    <field name="user_id"/>
                     <field name="parent_id" />
                     <field name="index_content"/>
-                </field>
+                </xpath>
             </field>
     </record>
 
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index ee89f3d4c6c..273be7effa4 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -41,8 +41,7 @@ from StringIO import StringIO
 #       file: objct = ir.attachement
 #   root: if we are at the first directory of a ressource
 #
-
-logger = logging.getLogger('doc2.nodes')
+_logger = logging.getLogger(__name__)
 
 def _str2time(cre):
     """ Convert a string with time representation (from db) into time (float)
@@ -328,7 +327,7 @@ class node_class(object):
         if self.DAV_M_NS.has_key(ns):
             prefix = self.DAV_M_NS[ns]
         else:
-            logger.debug('No namespace: %s ("%s")',ns, prop)
+            _logger.debug('No namespace: %s ("%s")',ns, prop)
             return None
 
         mname = prefix + "_" + prop.replace('-','_')
@@ -341,7 +340,7 @@ class node_class(object):
             r = m(cr)
             return r
         except AttributeError:
-            logger.debug('Property %s not supported' % prop, exc_info=True)
+            _logger.debug('Property %s not supported' % prop, exc_info=True)
         return None
 
     def get_dav_resourcetype(self, cr):
@@ -384,13 +383,13 @@ class node_class(object):
     def create_child(self, cr, path, data=None):
         """ Create a regular file under this node
         """
-        logger.warning("Attempted to create a file under %r, not possible.", self)
+        _logger.warning("Attempted to create a file under %r, not possible.", self)
         raise IOError(errno.EPERM, "Not allowed to create files here")
     
     def create_child_collection(self, cr, objname):
         """ Create a child collection (directory) under self
         """
-        logger.warning("Attempted to create a collection under %r, not possible.", self)
+        _logger.warning("Attempted to create a collection under %r, not possible.", self)
         raise IOError(errno.EPERM, "Not allowed to create folders here")
 
     def rm(self, cr):
@@ -725,7 +724,7 @@ class node_dir(node_database):
             assert self.parent
 
         if self.parent != ndir_node:
-            logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node)
+            _logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node)
             raise NotImplementedError('Cannot move dir to another dir')
 
         ret = {}
@@ -998,7 +997,7 @@ class node_res_obj(node_class):
     def get_dav_eprop_DEPR(self, cr, ns, prop):
         # Deprecated!
         if ns != 'http://groupdav.org/' or prop != 'resourcetype':
-            logger.warning("Who asked for %s:%s?" % (ns, prop))
+            _logger.warning("Who asked for %s:%s?" % (ns, prop))
             return None
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         uid = self.context.uid
@@ -1328,7 +1327,7 @@ class node_file(node_class):
         ret = {}
         if ndir_node and self.parent != ndir_node:
             if not (isinstance(self.parent, node_dir) and isinstance(ndir_node, node_dir)):
-                logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node)
+                _logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node)
                 raise NotImplementedError('Cannot move files between dynamic folders')
 
             if not ndir_obj:
@@ -1452,6 +1451,7 @@ class node_content(node_class):
         return ''
 
 class nodefd_content(StringIO, node_descriptor):
+    
     """ A descriptor to content nodes
     """
     def __init__(self, parent, cr, mode, ctx):
@@ -1473,7 +1473,7 @@ class nodefd_content(StringIO, node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.content').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -1499,13 +1499,14 @@ class nodefd_content(StringIO, node_descriptor):
                 raise NotImplementedError
             cr.commit()
         except Exception:
-            logging.getLogger('document.content').exception('Cannot update db content #%d for close:', par.cnt_id)
+            _logger.exception('Cannot update db content #%d for close:', par.cnt_id)
             raise
         finally:
             cr.close()
         StringIO.close(self)
 
 class nodefd_static(StringIO, node_descriptor):
+    
     """ A descriptor to nodes with static data.
     """
     def __init__(self, parent, cr, mode, ctx=None):
@@ -1526,7 +1527,7 @@ class nodefd_static(StringIO, node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.nodes').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -1551,7 +1552,7 @@ class nodefd_static(StringIO, node_descriptor):
                 raise NotImplementedError
             cr.commit()
         except Exception:
-            logging.getLogger('document.nodes').exception('Cannot update db content #%d for close:', par.cnt_id)
+            _logger.exception('Cannot update db content #%d for close:', par.cnt_id)
             raise
         finally:
             cr.close()
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 34b61f01c01..7b09f131178 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -64,41 +64,8 @@ class report_document_user(osv.osv):
                  group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname
              )
         """)
-report_document_user()
 
 
-
-class report_files_partner(osv.osv):
-    _name = "report.files.partner"
-    _description = "Files details by Partners"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'file_size': fields.integer('File Size', readonly=True),
-        'nbr':fields.integer('# of Files', readonly=True),
-        'partner':fields.char('Partner',size=64,readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-     }
-    def init(self, cr):
-         tools.drop_view_if_exists(cr, 'report_files_partner')
-         cr.execute("""
-            CREATE VIEW report_files_partner as (
-                SELECT min(f.id) AS id,
-                       COUNT(*) AS nbr,
-                       to_char(date_trunc('month', f.create_date),'YYYY') AS name,
-                       to_char(date_trunc('month', f.create_date),'MM') AS month,
-                       SUM(f.file_size) AS file_size,
-                       p.name AS partner
-
-                FROM ir_attachment f
-                  LEFT JOIN res_partner p ON (f.partner_id=p.id)
-                WHERE f.datas_fname IS NOT NULL
-                GROUP BY p.name, date_trunc('month', f.create_date)
-             )
-         """)
-report_files_partner()
-
 class report_document_file(osv.osv):
     _name = "report.document.file"
     _description = "Files details by Directory"
@@ -122,37 +89,5 @@ class report_document_file(osv.osv):
              )
         """)
 
-report_document_file()
-
-class report_document_wall(osv.osv):
-    _name = "report.document.wall"
-    _description = "Users that did not inserted documents since one month"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'Owner',readonly=True),
-        'user':fields.char('User',size=64,readonly=True),
-        'month': fields.char('Month', size=24,readonly=True),
-        'last':fields.datetime('Last Posted Time', readonly=True),
-             }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_document_wall')
-        cr.execute("""
-            create or replace view report_document_wall as (
-               select max(f.id) as id,
-               to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
-               f.user_id as user_id, f.user_id as user,
-               to_char(f.create_date,'Month') as month
-               from ir_attachment f
-               where f.create_date in (
-                   select max(i.create_date)
-                   from ir_attachment i
-                   inner join res_users u on (i.user_id=u.id)
-                   group by i.user_id) group by f.user_id,f.create_date
-                   having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30
-             )
-        """)
-report_document_wall()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e6e1847cd56..e688707086a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,22 +41,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group>
+                    <group>
+                        <field name="name"
+                            filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
+                            string="Users File"/>
                         <separator orientation="vertical"/>
-                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-                            <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="month"/>
-                            <field name="user"/>
-                            <field name="directory"/>
-                        </group>
+                        <field name="month"/>
+                    </group>
                </search>
             </field>
         </record>
 
-     <!--   <menuitem name="Document Management" id="menu_action_view_my_document"/>
-        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
             <field name="name">All Users files</field>
@@ -67,74 +62,20 @@
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
-      <!--  <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
 
-<!--        -->
-        <record model="ir.ui.view" id="view_document_wall_form">
-            <field name="name">report.document.wall.form</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_document_wall_tree">
-            <field name="name">report.document.wall.tree</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_wall">
-            <field name="name">Wall of Shame</field>
-            <field name="res_model">report.document.wall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_document_by_resourcetype_graph">
-            <field name="name">report.document.resource.graph</field>
-            <field name="model">report.document.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files by Resource Type" type="pie">
-                    <field name="type" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-
-<!--***************************************************************************************-->
-
-    <record model="ir.ui.view" id="view_size_month">
+        <record model="ir.ui.view" id="view_size_month">
             <field name="name">report.document.user.graph</field>
             <field name="model">report.document.file</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="File Size by Month" type="bar">
+                <graph string="File Size by Month" type="line">
                     <field name="month"/>
                     <field name="file_size" operator="+"/>
                 </graph>
             </field>
-    </record>
+        </record>
 
-    <record model="ir.ui.view" id="view_size_month_tree">
+        <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.file</field>
             <field name="type">tree</field>
@@ -145,6 +86,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_view_size_month">
             <field name="name">File Size by Month</field>
             <field name="res_model">report.document.file</field>
@@ -153,20 +95,15 @@
             <field name="view_mode">tree</field>
         </record>
 
-<!--***************************************************************************************-->
 
-
-    <record model="ir.ui.view" id="view_files_by_month_graph">
+        <record model="ir.ui.view" id="view_files_by_month_graph">
             <field name="name">report.file.month.graph</field>
             <field name="model">report.document.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by Month" type="bar">
+                <graph string="Files by Month" type="pie">
                     <field name="month" />
                     <field name="nbr" operator="+"/>
-<!--                    <field name="name" operator="+"/>-->
-<!--                    <field name="file_size" operator="+"/>-->
-
                 </graph>
             </field>
         </record>
@@ -184,6 +121,26 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_files_by_user_graph">
+            <field name="name">report.file.user.graph</field>
+            <field name="model">report.document.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Files by User" type="pie">
+                    <field name="user" />
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_view_files_by_user_graph">
+            <field name="name">Files by User</field>
+            <field name="res_model">report.document.user</field>
+            <field name="view_id" ref="view_files_by_user_graph"></field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
             <field name="name">Files by Month</field>
             <field name="res_model">report.document.user</field>
@@ -192,79 +149,5 @@
             <field name="view_mode">tree</field>
         </record>
 
-
-<!--***************************************************************************************-->
-
-    <record model="ir.ui.view" id="view_user_graph">
-            <field name="name">report.document.user.graph</field>
-            <field name="model">report.document.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files by users" type="bar">
-                    <field name="user" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_user_graph">
-            <field name="name">Files By Users</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_user_graph"></field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_files_by_partner_graph">
-            <field name="name">view.files.partner.graph</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files By Partner" type="bar">
-                    <field name="partner"/>
-                    <field name="nbr"/>
-
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_tree">
-            <field name="name">view.files.partner.tree</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_form">
-            <field name="name">view.files.partner.form</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_files_by_partner">
-            <field name="name">Files Per Partner</field>
-            <field name="res_model">report.files.partner</field>
-            <field name="view_id" ref="view_files_by_partner_graph"></field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-        </data>
- </openerp>
+    </data>
+</openerp>
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 36f0aa86dff..a82b9acd838 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -15,11 +15,6 @@ access_res_partner_group_user,res.partner user,base.model_res_partner,base.group
 access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0
 access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1
 access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0
-access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0
 access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
-access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0
-access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0
-access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0
 access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
-access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0
 access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index e153d018bf0..49ac9a5c906 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -25,6 +25,7 @@ import StringIO
 import odt2txt
 import sys, zipfile, xml.dom.minidom
 import logging
+_logger = logging.getLogger(__name__)
 
 def _to_unicode(s):
     try:
@@ -101,9 +102,9 @@ class DocIndex(indexer):
             (data, _) = pop.communicate()
             return _to_unicode(data)
         except OSError:
-            logger = logging.getLogger('document.DocIndex')
-            logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
-            logger.debug("Trace of the failed file indexing attempt: ", exc_info=True)
+            
+            _logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
+            _logger.debug("Trace of the failed file indexing attempt: ", exc_info=True)
             return False
     
 cntIndex.register(DocIndex())
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 2e09a938a05..59aff85c633 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -23,9 +23,9 @@ import threading
 import ftpserver
 import authorizer
 import abstracted_fs
-import netsvc
+import logging
 from tools import config
-
+_logger = logging.getLogger(__name__)
 def start_server():
     HOST = config.get('ftp_server_host', '127.0.0.1')
     PORT = int(config.get('ftp_server_port', '8021'))
@@ -35,10 +35,7 @@ def start_server():
         PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
     class ftp_server(threading.Thread):
-        def log(self, level, message):
-            logger = netsvc.Logger()
-            logger.notifyChannel('FTP', level, message)
-
+        
         def run(self):
             autho = authorizer.authorizer()
             ftpserver.FTPHandler.authorizer = autho
@@ -48,17 +45,17 @@ def start_server():
             if PASSIVE_PORTS:
                 ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.log = lambda msg: _logger.info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.logerror = lambda msg: _logger.error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
 
     if HOST.lower() == 'none':
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+        _logger.info("\n Server FTP Not Started\n")
     else:
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
         ds = ftp_server()
         ds.daemon = True
         ds.start()
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 83cd1cde725..429016a2376 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -56,7 +56,7 @@ class abstracted_fs(object):
         self.cwd = '/'
         self.cwd_node = None
         self.rnfr = None
-        self._log = logging.getLogger('FTP.fs')
+        self._log = logging.getLogger(__name__)
 
     # Ok
     def db_list(self):
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index 7bc0883f9e8..31f462bcbbe 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -24,9 +24,9 @@ import logging
 import urlparse
 from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
 from service.http_server import HttpLogHandler
-
+_logger = logging.getLogger(__name__)
 class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
-    _logger = logging.getLogger('httpd.well-known')
+    
     _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD', 'PROPFIND'] }
     redirect_paths = {}
 
@@ -80,7 +80,7 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler
         self.send_header("Content-Length", 0)
         self.end_headers()
         # Do we need a Cache-content: header here?
-        self._logger.debug("redirecting %s to %s", self.path, redir_path)
+        _logger.debug("redirecting %s to %s", self.path, redir_path)
         return None
 
     def do_PROPFIND(self):
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 3c20cfed5b8..a4dda231bd8 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -43,7 +43,7 @@ from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
 
-log = logging.getLogger('http-client')
+_logger = logging.getLogger(__name__)
 
 class HTTP11(httplib.HTTP):
         _http_vsn = 11
@@ -62,7 +62,7 @@ class PersistentTransport(Transport):
         if not self._http.has_key(host):
                 host, extra_headers, x509 = self.get_host_info(host)
                 self._http[host] = HTTP11(host)
-                log.debug("New connection to %s", host)
+                _logger.debug("New connection to %s", host)
         return self._http[host]
 
     def get_host_info(self, host):
@@ -170,7 +170,7 @@ class SafePersistentTransport(PersistentTransport):
         if not self._http.has_key(host):
                 host, extra_headers, x509 = self.get_host_info(host)
                 self._http[host] = httplib.HTTPS(host, None, **(x509 or {}))
-                log.debug("New connection to %s", host)
+                _logger.debug("New connection to %s", host)
         return self._http[host]
 
 class AuthClient(object):
@@ -191,8 +191,8 @@ class BasicAuthClient(AuthClient):
             return super(BasicAuthClient,self).getAuth(atype, realm)
 
         if not self._realm_dict.has_key(realm):
-            log.debug("realm dict: %r", self._realm_dict)
-            log.debug("missing key: \"%s\"" % realm)
+            _logger.debug("realm dict: %r", self._realm_dict)
+            _logger.debug("missing key: \"%s\"" % realm)
             self.resolveFailedRealm(realm)
         return 'Basic '+ self._realm_dict[realm]
         
@@ -239,7 +239,7 @@ class addAuthTransport:
                 # This line will bork if self.setAuthClient has not
                 # been issued. That is a programming error, fix your code!
                 auths = self._auth_client.getAuth(atype, realm)
-                log.debug("sending authorization: %s", auths)
+                _logger.debug("sending authorization: %s", auths)
                 h.putheader('Authorization', auths)
             self.send_content(h, request_body)
 
@@ -255,8 +255,8 @@ class addAuthTransport:
                         log.warning("Why have data on a 401 auth. message?")
                     if realm.startswith('realm="') and realm.endswith('"'):
                         realm = realm[7:-1]
-                    log.debug("Resp: %r %r", resp.version,resp.isclosed(), resp.will_close)
-                    log.debug("Want to do auth %s for realm %s", atype, realm)
+                    _logger.debug("Resp: %r %r", resp.version,resp.isclosed(), resp.will_close)
+                    _logger.debug("Want to do auth %s for realm %s", atype, realm)
                     if atype != 'Basic':
                         raise ProtocolError(host+handler, 403, 
                                         "Unknown authentication method: %s" % atype, resp.msg)
@@ -315,7 +315,7 @@ class HTTPSConnection(httplib.HTTPSConnection):
                         lf = (len(ssl.PEM_FOOTER)+1)
                         if cert[0-lf] != '\n':
                                 cert = cert[:0-lf]+'\n'+cert[0-lf:]
-                        log.debug("len-footer: %s cert: %r", lf, cert[0-lf])
+                        _logger.debug("len-footer: %s cert: %r", lf, cert[0-lf])
                 
                 return cert
 
@@ -390,7 +390,7 @@ class DAVClient(object):
         import base64
         dbg = self.dbg
         hdrs.update(self.hdrs)
-        log.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
+        _logger.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
         conn = httplib.HTTPConnection(self.host, port=self.port, timeout=self.timeout)
         conn.set_debuglevel(dbg)
         if not path:
@@ -409,8 +409,8 @@ class DAVClient(object):
                         data1 = r1.read()
                         if not self.user:
                                 raise Exception('Must auth, have no user/pass!')
-                        log.debug("Ver: %s, closed: %s, will close: %s", r1.version,r1.isclosed(), r1.will_close)
-                        log.debug("Want to do auth %s for realm %s", atype, realm)
+                        _logger.debug("Ver: %s, closed: %s, will close: %s", r1.version,r1.isclosed(), r1.will_close)
+                        _logger.debug("Want to do auth %s for realm %s", atype, realm)
                         if atype == 'Basic' :
                                 auths = base64.encodestring(self.user + ':' + self.passwd)
                                 if auths[-1] == "\n":
@@ -422,22 +422,22 @@ class DAVClient(object):
                         else:
                                 raise Exception("Unknown auth type %s" %atype)
                 else:
-                        log.warning("Got 401, cannot auth")
+                        _logger.warning("Got 401, cannot auth")
                         raise Exception('No auth')
 
-        log.debug("Reponse: %s %s",r1.status, r1.reason)
+        _logger.debug("Reponse: %s %s",r1.status, r1.reason)
         data1 = r1.read()
         if method != 'GET':
-            log.debug("Body:\n%s\nEnd of body", data1)
+            _logger.debug("Body:\n%s\nEnd of body", data1)
             try:
                 ctype = r1.msg.getheader('content-type')
                 if ctype and ';' in ctype:
                     ctype, encoding = ctype.split(';',1)
                 if ctype == 'text/xml':
                     doc = xml.dom.minidom.parseString(data1)
-                    log.debug("XML Body:\n %s", doc.toprettyxml(indent="\t"))
+                    _logger.debug("XML Body:\n %s", doc.toprettyxml(indent="\t"))
             except Exception:
-                log.warning("could not print xml", exc_info=True)
+                _logger.warning("could not print xml", exc_info=True)
                 pass
         conn.close()
         return r1.status, r1.msg, data1
@@ -474,7 +474,7 @@ class DAVClient(object):
         s, m, d = self._http_request(path, method='OPTIONS', hdrs=hdrs)
         assert s == 200, "Status: %r" % s
         assert 'OPTIONS' in m.getheader('Allow')
-        log.debug('Options: %r', m.getheader('Allow'))
+        _logger.debug('Options: %r', m.getheader('Allow'))
         
         if expect:
             self._assert_headers(expect, m)
@@ -493,10 +493,10 @@ class DAVClient(object):
             for cnod in node.childNodes:
                 if cnod.nodeType != node.ELEMENT_NODE:
                     if strict:
-                        log.debug("Found %r inside <%s>", cnod, node.tagName)
+                        _logger.debug("Found %r inside <%s>", cnod, node.tagName)
                     continue
                 if namespaces and (cnod.namespaceURI not in namespaces):
-                    log.debug("Ignoring <%s> in <%s>", cnod.tagName, node.localName)
+                    _logger.debug("Ignoring <%s> in <%s>", cnod.tagName, node.localName)
                     continue
                 yield cnod
 
@@ -533,10 +533,10 @@ class DAVClient(object):
                             assert htver == 'HTTP/1.1'
                             rstatus = int(sta)
                         else:
-                            log.debug("What is <%s> inside a <propstat>?", pno.tagName)
+                            _logger.debug("What is <%s> inside a <propstat>?", pno.tagName)
                     
                 else:
-                    log.debug("Unknown node: %s", cno.tagName)
+                    _logger.debug("Unknown node: %s", cno.tagName)
                 
             res.setdefault(href,[]).append((status, res_nss))
 
@@ -637,7 +637,7 @@ class DAVClient(object):
                         if lsp[1] in davprops:
                             lsline[lsp[0]] = lsp[2]
                 else:
-                    log.debug("Strange status: %s", st)
+                    _logger.debug("Strange status: %s", st)
             
             res.append(lsline)
             
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index ae75d0b80fc..65ebb49ff5f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -54,7 +54,7 @@ from DAV.propfind import PROPFIND
 # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
 from xml.dom import minidom
 from redirect import RedirectHTTPHandler
-
+_logger = logging.getLogger(__name__)
 khtml_re = re.compile(r' KHTML/([0-9\.]+) ')
 
 def OpenDAVConfig(**kw):
@@ -73,7 +73,7 @@ def OpenDAVConfig(**kw):
 
 class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
     verbose = False
-    _logger = logging.getLogger('webdav')
+   
     protocol_version = 'HTTP/1.1'
     _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
                     'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
@@ -127,10 +127,10 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         return self.davpath
 
     def log_message(self, format, *args):
-        self._logger.debug(format % args)
+        _logger.debug(format % args)
 
     def log_error(self, format, *args):
-        self._logger.warning(format % args)
+        _logger.warning(format % args)
 
     def _prep_OPTIONS(self, opts):
         ret = opts
@@ -477,7 +477,7 @@ class dummy_dav_interface(object):
         uri2 = uri.split('/')
         if len(uri2) < 3:
             return True
-        logging.getLogger('webdav').debug("Requested uri: %s", uri)
+        _logger.debug("Requested uri: %s", uri)
         return None # no
 
     def is_collection(self, uri):
@@ -487,6 +487,7 @@ class dummy_dav_interface(object):
 class DAVStaticHandler(http_server.StaticHTTPHandler):
     """ A variant of the Static handler, which will serve dummy DAV requests
     """
+    
     verbose = False
     protocol_version = 'HTTP/1.1'
     _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
@@ -573,7 +574,7 @@ try:
         conf = OpenDAVConfig(**_dc)
         handler._config = conf
         reg_http_service(directory, DAVHandler, DAVAuthProvider)
-        logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory)
+        _logger.info("WebDAV service registered at path: %s/ "% directory)
         
         if not (config.get_misc('webdav', 'no_root_hack', False)):
             # Now, replace the static http handler with the dav-enabled one.
@@ -595,7 +596,7 @@ try:
             reg_http_service('/', DAVStaticHandler)
 
 except Exception, e:
-    logging.getLogger('webdav').error('Cannot launch webdav: %s' % e)
+    _logger.error('Cannot launch webdav: %s' % e)
 
 
 def init_well_known():
@@ -616,6 +617,8 @@ def init_well_known():
 init_well_known()
 
 class PrincipalsRedirect(RedirectHTTPHandler):
+    
+    
     redirect_paths = {}
     
     def _find_redirect(self):
@@ -639,7 +642,7 @@ def init_principals_redirect():
     if dbname:
         PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname
         reg_http_service('/principals', PrincipalsRedirect)
-        logging.getLogger("web-services").info(
+        _logger.info(
                 "Registered HTTP redirect handler for /principals to the %s db.",
                 dbname)
 
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index b0101c01574..44af9f2af3a 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -7,7 +7,7 @@
         <field name="model">document.webdav.dir.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -38,8 +38,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
@@ -77,7 +78,7 @@
         <field name="inherit_id" ref="document.view_document_directory_form" />
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <page string="Dynamic context" position="after" version="7.0">
+        <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
         <page string="WebDAV properties">
             <label string="These properties will be added to WebDAV requests" colspan="4" />
 
@@ -97,7 +98,7 @@
                 </form>
             </field>
         </page>
-        </page>
+        </xpath>
     </field>
     </record>
 
@@ -107,7 +108,7 @@
         <field name="model">document.webdav.file.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -139,8 +140,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document Property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py
index b4a80c0f1dd..46fabbc2fd0 100644
--- a/addons/edi/__init__.py
+++ b/addons/edi/__init__.py
@@ -23,12 +23,13 @@ import logging
 import models
 import edi_service
 from models.edi import EDIMixin, edi_document
+_logger = logging.getLogger(__name__)
 
 # web
 try:
     import controllers
 except ImportError:
-    logging.getLogger('init.load').warn(
+    _logger.warn(
         """Could not load openerp-web section of EDI, EDI will not behave correctly
 
 To fix, launch openerp-web in embedded mode""")
diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py
index 074720a03e9..f48cc60950a 100644
--- a/addons/edi/edi_service.py
+++ b/addons/edi/edi_service.py
@@ -23,7 +23,7 @@ import logging
 import netsvc
 import openerp
 
-_logger = logging.getLogger('edi.service')
+_logger = logging.getLogger(__name__)
 
 class edi(netsvc.ExportService):
 
diff --git a/addons/edi/i18n/mn.po b/addons/edi/i18n/mn.po
new file mode 100644
index 00000000000..5fe437aa756
--- /dev/null
+++ b/addons/edi/i18n/mn.po
@@ -0,0 +1,386 @@
+# 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-06-19 17:35+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-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr ""
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr ""
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Компаниуд"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Валют"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr ""
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 589922ff178..383d8c7aaba 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -35,6 +35,7 @@ import pooler
 from osv import osv,fields,orm
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
 EDI_VIEW_WEB_URL = '%s/edi/view?db=%s&token=%s'
@@ -72,7 +73,6 @@ def last_update_for(record):
         return record_log.get('write_date') or record_log.get('create_date') or False
     return False
 
-_logger = logging.getLogger('edi')
 
 class edi_document(osv.osv):
     _name = 'edi.document'
diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py
index 357fdec061b..86d8c81b790 100644
--- a/addons/edi/models/res_partner.py
+++ b/addons/edi/models/res_partner.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 from edi import EDIMixin
 from openerp import SUPERUSER_ID
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 RES_PARTNER_EDI_STRUCT = {
     'name': True,
@@ -63,7 +64,7 @@ class res_partner(osv.osv, EDIMixin):
         code, label = 'edi_generic', 'Generic Bank Type (auto-created for EDI)'
         bank_code_ids = res_partner_bank_type.search(cr, uid, [('code','=',code)], context=context)
         if not bank_code_ids:
-            logging.getLogger('edi.res_partner').info('Normal bank account type is missing, creating '
+            _logger.info('Normal bank account type is missing, creating '
                                                       'a generic bank account type for EDI.')
             self.res_partner_bank_type.create(cr, SUPERUSER_ID, {'name': label,
                                                                  'code': label})
@@ -84,7 +85,7 @@ class res_partner(osv.osv, EDIMixin):
                                              bank_name, ext_bank_id, context=import_ctx)
                 except osv.except_osv:
                     # failed to import it, try again with unrestricted default type
-                    logging.getLogger('edi.res_partner').warning('Failed to import bank account using'
+                    _logger.warning('Failed to import bank account using'
                                                                  'bank type: %s, ignoring', import_ctx['default_state'],
                                                                  exc_info=True)
         return contact_id
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index b9b385e9a07..88e09824b9b 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -19,7 +19,7 @@
             <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
                     <td class="oe_edi_view">
-                        <p class="oe_form_paragraph"><t t-raw="widget.content"/></p>
+                        <p class="oe_paragraph"><t t-raw="widget.content"/></p>
                         <button type="button" class="oe_edi_action_print">
                             View/Print <img src="/edi/static/src/img/pdf.png"/>
                         </button>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index fff9bdc0f1a..c4ed2eedb85 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -29,11 +29,12 @@ from osv import fields
 import tools
 from tools.translate import _
 from urllib import quote as quote
+_logger = logging.getLogger(__name__)
 
 try:
     from mako.template import Template as MakoTemplate
 except ImportError:
-    logging.getLogger('init').warning("email_template: mako templates not available, templating features will not work!")
+    _logger.warning("email_template: mako templates not available, templating features will not work!")
 
 class email_template(osv.osv):
     "Templates for sending email"
@@ -75,7 +76,7 @@ class email_template(osv.osv):
                 result = u''
             return result
         except Exception:
-            logging.exception("failed to render mako template value %r", template)
+            _logger.exception("failed to render mako template value %r", template)
             return u""
 
     def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 1403721af53..7b64254dfd8 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
@@ -98,6 +99,7 @@
                             </group>
                         </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -126,13 +128,10 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="email_to"/>
+                        <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
                         <separator orientation="vertical"/>
+                        <field name="model_id"/>
                         <field name="lang"/>
-                        <field name="subject"/>
-                        <field name="report_name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
new file mode 100644
index 00000000000..8082654a2df
--- /dev/null
+++ b/addons/email_template/i18n/es_CL.po
@@ -0,0 +1,689 @@
+# Spanish (Chile) 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-06-20 03:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <es_CL@li.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-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "Tipo de mensaje"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "Archivo de reporte"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "Acción barra lateral"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "Guardar como plantilla"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "Asunto"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "Destinatario copia de carbón"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "Recibidos"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "Adjuntar archivos existentes"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "Contenido de email"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "Responder a"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto eliminar"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "¡Atención!"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "Partner relacionado"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "Subcampo"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "Enviado"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+"Tipo de mansaje, nomralemente 'html' o 'plano', utilizado para seleccionar "
+"contenidos texto-plano o texto enriquecido"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "Asistente de composición de e-mail"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "ID del docuemtno relacionado"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_text:0
+#: help:email_template.preview,body_text:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "Cuerpo del mensaje (Texto enriquecido /HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "Cuerpo del mensaje (Texto)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Opciones Avanzadas"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_text:0
+#: field:email_template.preview,body_text:0
+msgid "Text Contents"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr ""
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr ""
+
+#~ msgid "Sidebar button"
+#~ msgstr "Botón barra lateral"
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 6bdea66e45e..a00b4b20f04 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <!--  Need to merge this action in associations -->
-
+        <!-- Events dashboard -->
         <record model ="ir.ui.view" id="view_report_event_reg_graph">
             <field name="name">Registration Event report</field>
             <field name="model">report.event.registration</field>
@@ -26,13 +25,23 @@
             <field name="view_id" ref="view_report_event_reg_graph"/>
         </record>
 
-       <record model="ir.actions.act_window" id="act_event_view">
-           <field name="name">Next Events</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">event.event</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-       </record>
+        <record model="ir.actions.act_window" id="act_event_view">
+            <field name="name">Next Events</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.event</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','not in',('cancel','done'))]</field>
+        </record>
+
+        <record model="ir.actions.act_window" id="act_event_view_registration">
+            <field name="name">New Registration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
 
         <record model="ir.ui.view" id="board_associations_manager_form">
             <field name="name">board.associations.manager.form</field>
@@ -42,13 +51,11 @@
                 <form string="Association Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action string="Next Events"
-                                name="%(act_event_view)d"
-                                domain="[('state','not in',('cancel','done'))]"/>
+                            <action string="Next Events" name="%(act_event_view)d"/>
+                            <action string="New Registrations" name="%(act_event_view_registration)d"/>
                         </column>
                         <column>
-                            <action string="Events Filling Status"
-                                name="%(act_event_reg)d"/>
+                            <action string="Events Filling By Status" name="%(act_event_reg)d"/>
                         </column>
                     </board>
                 </form>
@@ -56,20 +63,17 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_board_associations_manager">
-            <field name="name">Event Dashboard</field>
+            <field name="name">Events</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem id="menus_event_dashboard" name="Events"
-            parent="base.menu_reporting_dashboard" sequence="25"/>
-        <menuitem
-            name="Event Dashboard" parent="menus_event_dashboard"
-            action="open_board_associations_manager"
-            sequence="1"
-            id="menu_board_associations_manager"
-            icon="terp-graph"/>
 
+        <menuitem id="menu_board_associations_manager"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_associations_manager"
+                  sequence="40"
+                  icon="terp-graph"/>
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 01b41833a65..ed539e7bf39 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -63,13 +63,13 @@
                 <sheet>
 
                 <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_form_title">
+                <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_form_google_map'}"/>
+                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
                         </group>
                         <group>
                             <field name="date_begin"/>
@@ -85,12 +85,12 @@
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     <page string="Internal Data">
-                         <group class="oe_form_group_label_border" colspan="2" col="2">
+                         <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_form_group_label_border" colspan="2" col="2">
+                         <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>
@@ -130,7 +130,7 @@
                     </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
             </form>
@@ -265,21 +265,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
+                        <field name="name" string="Events"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Upcoming"
-                                name="upcoming"
-                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                                help="Upcoming events from today" />
-                        <field name="name"/>
-                        <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <filter icon="terp-go-today" string="Upcoming"
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Upcoming events from today" />
+                        <separator orientation="vertical"/>
+                        <field name="type" widget="selection"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
             <field name="arch" type="xml">
                 <tree string="Registration" >
                     <field name="create_date"/>
+                    <field name="partner_id"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
@@ -406,7 +407,7 @@
 
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </form>
@@ -448,19 +449,18 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
-                        <field name="user_id">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="origin"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 71d656740fe..7ae6c0fae2e 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,38 +53,21 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter string="Year" icon="terp-go-year" name="year"
-                          domain="[('event_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('event_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                          help="Events happening this year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                          domain="[('event_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happening in current month"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                          domain="[('event_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happened in last month"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new"
-                        string="New"
-                        domain="[('event_state','=','draft')]"
-                        help="Events which are in New state"/>
-                    <filter icon="terp-check"
-                        string="Confirm"
-                        domain="[('event_state','=','confirm')]"
-                        help="Events which are in confirm state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                          string="Confirmed Registrations"
-                          help="Registrations in confirmed or done state"
-                          context="{'no_of_draft_invisible':1}"/>
-                    <separator orientation="vertical"/>
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="New"
+                            domain="[('event_state','=','draft')]"
+                            help="Events which are in New state"/>
+                        <filter icon="terp-check"
+                            string="Confirm"
+                            domain="[('event_state','=','confirm')]"
+                            help="Events which are in confirm state"/>
                         <filter icon="terp-personal"
-                        string="My Events"
-                        help="My Events"
-                        domain="[('user_id','=',uid)]"/>
-                    </field>
+                            string="My Events"
+                            help="My Events"
+                            domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" string="Event"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -92,7 +75,6 @@
                         <field name="event_date"/>
                     </group>
                     <newline/>
-
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -114,6 +96,12 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
+                    <group expand="0" string="Display">
+                        <filter icon="terp-camera_test"
+                              string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state"
+                              context="{'no_of_draft_invisible':1}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0d6497c45f2..9e65a034544 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -78,7 +78,6 @@ class sale_order_line(osv.osv):
                 dic = {
                     'name': order_line.order_id.partner_invoice_id.name,
                     'partner_id': order_line.order_id.partner_id.id,
-                    'contact_id': order_line.order_id.partner_invoice_id.id,
                     'nb_register': int(order_line.product_uom_qty),
                     'email': order_line.order_id.partner_id.email,
                     'phone': order_line.order_id.partner_id.phone,
@@ -89,5 +88,5 @@ class sale_order_line(osv.osv):
                 }
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
-                registration_obj.log(cr, uid, registration_id, message)
+                registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 93ebd063051..cddcf642dc4 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -39,7 +39,7 @@ from osv import osv, fields
 import tools
 from tools.translate import _
 
-logger = logging.getLogger('fetchmail')
+_logger = logging.getLogger(__name__)
 
 class fetchmail_server(osv.osv):
     """Incoming POP/IMAP mail server account"""
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d19fb4c4ca1..9567f7746f3 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -31,12 +31,13 @@
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
-                    <group col="4">
+                    <sheet>
+                     <group col="4">
                         <field name="name"/>
                         <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date"/>
-                    </group>
-                    <notebook>
+                     </group>
+                     <notebook>
                         <page string="Server &amp; Login">
                             <group>
                                 <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
@@ -67,6 +68,7 @@
                             </group>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -77,12 +79,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
+                    <field name="name" string="Incoming Mail Server"/>
+                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
index f7dade6ae33..6655b95ac0e 100644
--- a/addons/fetchmail/res_config.py
+++ b/addons/fetchmail/res_config.py
@@ -32,7 +32,7 @@ class fetchmail_config_settings(osv.osv_memory):
                 _inherit = ['res.config.settings', 'fetchmail.config.settings']
 
                 _columns = {
-                    'fetchmail_stuff': fields.boolean(..., readonly=True,
+                    'fetchmail_stuff': fields.boolean(...,
                         fetchmail_model='my.stuff', fetchmail_name='Incoming Stuff'),
                 }
 
@@ -67,6 +67,18 @@ class fetchmail_config_settings(osv.osv_memory):
             res[f] = bool(server_ids)
         return res
 
+    def set_fetchmail(self, cr, uid, ids, context=None):
+        """ deactivate fetchmail servers for all fields like 'fetchmail_XXX' that are False """
+        config = self.browse(cr, uid, ids[0], context)
+        fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
+        # determine which models should not have active fetchmail servers, and
+        # deactivate all active servers for those models
+        models = [self._columns[f].fetchmail_model for f in fetchmail_fields if not config[f]]
+        if models:
+            fetchmail_server = self.pool.get('fetchmail.server')
+            server_ids = fetchmail_server.search(cr, uid, [('object_id.model', 'in', models), ('state', '=', 'done')])
+            fetchmail_server.set_draft(cr, uid, server_ids, context)
+
     def configure_fetchmail(self, cr, uid, field, context=None):
         """ open the form view of the fetchmail.server to configure """
         action = {
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
new file mode 100644
index 00000000000..7cbfb60a9c7
--- /dev/null
+++ b/addons/google_base_account/i18n/sl.po
@@ -0,0 +1,119 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-13 22:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr ""
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr ""
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 1df94f34221..8cc5671e08a 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -30,6 +30,7 @@
     'web': True,
     'js': ['static/src/js/gdocs.js'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
     'depends': ['google_base_account'],
diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
new file mode 100644
index 00000000000..9393d586fb8
--- /dev/null
+++ b/addons/google_docs/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_google_docs,google.docs.config,model_google_docs_config,,1,0,0,0
+access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index 9aa693e53c6..bd871eafe6b 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -59,7 +59,7 @@ openerp.event = function(instance, mod) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
                 // TODO repalce by widget_option selector self.options.selector
-                var el = self.view.$element.find(".oe_form_google_map")[0];
+                var el = self.view.$element.find(".oe_google_map")[0];
                 self.map.render_map(address,el);
             });
         },
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index d7fb8b0e91a..1135b55034a 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -48,7 +48,7 @@ You can manage:
         'process/hr_process.xml',
         'hr_installer.xml',
         'hr_data.xml',
-        'hr_board.xml',
+        'board_hr_view.xml',
         'res_config_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
new file mode 100644
index 00000000000..6c40edd8d1e
--- /dev/null
+++ b/addons/hr/board_hr_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="board_hr_form" model="ir.ui.view">
+        <field name="name">board.hr.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Human Resources Dashboard" layout="manual" version="7.0">
+                <board style="2-1">
+                    <column/>
+                    <column/>
+                </board>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_board_hr" model="ir.actions.act_window">
+        <field name="name">Human Resources</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="usage">menu</field>
+        <field name="view_id" ref="board_hr_form"/>
+    </record>
+    <menuitem id="menu_hr_dashboard" 
+              parent="base.menu_reporting_dashboard" 
+              action="open_board_hr" 
+              sequence="50"/>
+    <menuitem id="menu_hr_reporting" 
+              parent="base.menu_reporting" 
+              name="Human Resources" 
+              sequence="40" />
+</data>
+</openerp>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9d1ba1c9f05..e4c08f60559 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,6 +25,7 @@ import logging
 from osv import fields, osv
 from PIL import Image
 import StringIO
+_logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
 
@@ -93,24 +94,27 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of employees in total for that job.',
+        'expected_employees': fields.function(_no_of_employee, string='Total Employees',
+            help='Expected number of employees for this job position after new recruitment.',
             store = {
                 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10),
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees with that job.',
+        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees",
+            help='Number of employees currently occupying this job position.',
             store = {
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_recruitment': fields.float('Expected in Recruitment'),
+        'no_of_recruitment': fields.float('Expected in Recruitment', help='Number of new employees you expect to recruit.'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'), ('recruit', 'In Recruitement')], 'Status', readonly=True, required=True,
+            help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
     }
     _defaults = {
         'expected_employees': 1,
@@ -128,10 +132,6 @@ class hr_job(osv.osv):
             context = {}
         return {'value': {'expected_employees': no_of_recruitment + no_of_employee}}
 
-    def job_old(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'old', 'no_of_recruitment': 0})
-        return True
-
     def job_recruitement(self, cr, uid, ids, *args):
         for job in self.browse(cr, uid, ids):
             no_of_recruitment = job.no_of_recruitment == 0 and 1 or job.no_of_recruitment
@@ -209,6 +209,7 @@ class hr_employee(osv.osv):
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
+        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
     def unlink(self, cr, uid, ids, context=None):
@@ -304,7 +305,7 @@ class res_users(osv.osv):
                                             'user_id': user_id}, context=context)
             except:
                 # Tolerate a missing shortcut. See product/product.py for similar code.
-                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+                _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
 
         return user_id
 
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
deleted file mode 100644
index 22687d27c69..00000000000
--- a/addons/hr/hr_board.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-    <!-- This board view will be complete by other hr_* modules-->
-    <record id="board_hr_form" model="ir.ui.view">
-        <field name="name">board.hr.form</field>
-        <field name="model">board.board</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="My Board" layout="manual" version="7.0">
-                <board style="2-1">
-                    <column/>
-                    <column/>
-                </board>
-            </form>
-        </field>
-    </record>
-    <record id="open_board_hr" model="ir.actions.act_window">
-        <field name="name">Human Resources Dashboard</field>
-        <field name="res_model">board.board</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="usage">menu</field>
-        <field name="view_id" ref="board_hr_form"/>
-    </record>
-
-    <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
-    <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
-    <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
-
-    <!-- This board view will be complete by other hr_* modules-->
-    <record id="board_hr_manager_form" model="ir.ui.view">
-        <field name="name">board.hr.manager.form</field>
-        <field name="model">board.board</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="HR Manager Board" layout="manual" version="7.0">
-                <board style="2-1">
-                    <column/>
-                    <column/>
-                </board>
-            </form>
-        </field>
-    </record>
-    <record id="open_board_hr_manager" model="ir.actions.act_window">
-        <field name="name">HR Manager Dashboard</field>
-        <field name="res_model">board.board</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="usage">menu</field>
-        <field name="view_id" ref="board_hr_manager_form"/>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index c30c9fd33fb..f9f313646b9 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -67,14 +67,14 @@
           <field name="name">Francois</field>
           <field name="login">fpi</field>
           <field name="password">fpi</field>
-          <field name="photo_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
       </record>
 
       <record id="base.user_jth" model="res.users">
           <field name="name">Julien</field>
           <field name="login">jth</field>
           <field name="password">jth</field>
-          <field name="photo_big">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
       </record>
 
       <record id="base.user_ngh" model="res.users">
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..1935cbbd03d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -41,7 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <field name="name"/>
+                    <field name="name" string="Department"/>
+                    <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bed32142a39..5915511d385 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,9 +8,7 @@
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <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" groups="base.group_no_one"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
-        <menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
 
         <!--
         ==========
@@ -24,30 +22,29 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                    <div class="oe_right oe_form_button_box">
+                    <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_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="department_id" class="oe_form_readonly_hidden"/>
-                        <h2>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>,
-                            <field name="department_id" on_change="onchange_department_id(department_id)" />
-                        </h2>
+
+                        <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>
+                                <group string="General">
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                     <field name="active"/>
                                     <field name="parent_id" />
                                 </group>
                                 <group groups="base.group_hr_user" string="Social IDs">
-                                    <field name="ssnid"/>
-                                    <field name="sinid"/>
                                     <field name="identification_id"/>
                                     <field name="passport_id"/>
                                     <field name="otherid"/>
@@ -67,13 +64,13 @@
                                     <field name="work_location"/>
                                 </group>
                                 <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]"/>
+                                    <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"/>
+                            <field name="category_ids" widget="many2many_tags"/>
                         </page>
                         <page string="Notes" groups="base.group_hr_user">
                             <field name="notes"/>
@@ -108,20 +105,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="name" string="Employees"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids"/>
                     <field name="parent_id"/>
-                    <newline />
+                    <field name="category_ids"/>
+                    <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                    <separator orientation="vertical" />
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
@@ -134,6 +131,7 @@
         <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban>
+                <field name="last_login"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -143,6 +141,11 @@
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
+                                    <li id="last_login">
+                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                              <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+                                        </span>
+                                    </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                     <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
@@ -315,7 +318,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="hr.menu_hr_configuration" sequence="1"/>
+            parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories Structure</field>
@@ -352,24 +355,27 @@
                 <form string="Job" version="7.0">
                     <header>
                         <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                        <button name="job_open" string="In Position" states="old,recruit" type="object"/>
-                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="name" />
-                            <field name="department_id" />
-                            <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="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <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"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
-                                <separator string="Job Description"/>
+                                <label for="description"/>
                                 <field name="description"/>
-                                <separator string="Requirements"/>
+                                <label for="requirements"/>
                                 <field name="requirements"/>
                             </page>
                             <page string="Employees">
@@ -404,6 +410,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
+                    <field name="name" string="Job"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"  
                             domain="[('state','=','open')]" 
                             string="In Position"
@@ -411,19 +419,34 @@
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
                         help="In Recruitment"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="department_id" widget="selection"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
-             </field>
-         </record>
-
+            </field>
+        </record>
+        
+        <record id="view_hr_job_employee_form" model="ir.ui.view">
+            <field name="name">hr.job.employee.form</field>
+            <field name="model">hr.job</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Job" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="department_id" />
+                    </group>
+                    <label for="description"/>
+                    <field name="description"/>
+                </form>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
@@ -435,7 +458,7 @@
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem parent="hr.menu_hr_management" id="menu_hr_job" action="action_hr_job" sequence="6"/>
+        <menuitem parent="hr.menu_hr_configuration" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index ae51e209305..382d8ca7a6d 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -187,7 +187,8 @@ msgstr "أنثى"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -280,8 +281,8 @@ msgstr "التصنيفات"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "الموظفون المتوقعون"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -407,12 +408,6 @@ msgstr "معلومات التواصل"
 msgid "Working Address"
 msgstr "عنوان العمل"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "لوحة معلومات مدير الموارد البشرية"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -701,7 +696,12 @@ msgstr "المرؤوسين"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Holidays"
@@ -760,6 +760,9 @@ msgstr ""
 #~ "employees."
 #~ msgstr "ويتيح لك انشاء وادارة التقييم الدوري واستعراض اداء الموظفين."
 
+#~ msgid "Expected Employees"
+#~ msgstr "الموظفون المتوقعون"
+
 #~ msgid "No of Employee"
 #~ msgstr "رقم الموظف"
 
@@ -825,6 +828,9 @@ msgstr ""
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "الاجازات/ مغادرات الادارة"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "لوحة معلومات مدير الموارد البشرية"
+
 #~ msgid "Employee Passport Information"
 #~ msgstr "معلومات عن موظف الجوازات"
 
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 410142dcc22..ac02c9d428f 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Жена"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,8 +272,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Очаквани служители"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -389,12 +390,6 @@ msgstr "Информация за контакт"
 msgid "Working Address"
 msgstr "Служебен адрес"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Табло мениджър ЧР"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -775,6 +775,9 @@ msgstr ""
 #~ msgid "Expenses"
 #~ msgstr "Разходи"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Очаквани служители"
+
 #~ msgid "Payroll"
 #~ msgstr "Ведомост"
 
@@ -794,6 +797,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Прогрес на настройките"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Табло мениджър ЧР"
+
 #~ msgid "Current"
 #~ msgstr "Текущ"
 
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 0673f969dfa..40cd0d4d9af 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "মহিলা"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 7802baa76ef..09ca4e73941 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Ženski"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr "Kontakt informacije"
 msgid "Working Address"
 msgstr "Adresa zaposlenja"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 44901828469..847d0cf7fc8 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Dona"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Categories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleats previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -414,12 +415,6 @@ msgstr "Informació de contacte"
 msgid "Working Address"
 msgstr "Adreça de treball"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Taulell director RRHH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -710,7 +705,12 @@ msgstr "Subordinats"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -918,6 +918,12 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progrés de la configuració"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleats previstos"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Taulell director RRHH"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Nombre total d'empleats necessaris per a aquest treball."
 
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 5ebbbdc2af7..a32263a9edb 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -190,8 +190,9 @@ msgstr "Žena"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Celkový požadovaný počet zaměstnanců pro úlohu."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -283,8 +284,8 @@ msgstr "Kategorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekávaní zaměstnanci"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -401,12 +402,6 @@ msgstr "Kontaktní informace"
 msgid "Working Address"
 msgstr "Pracovní adresa"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Nástěnka správce HR"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -696,8 +691,13 @@ msgstr "Podřízení"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Počet zaměstnanců"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Zjednodušuje správu docházky zaměstnance"
@@ -753,6 +753,9 @@ msgstr "Počet zaměstnanců"
 #~ "Můžete rozšířit základní aplikaci HR instalováním několika funkčností "
 #~ "souvisejících s HR."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekávaní zaměstnanci"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Průběh nastavení"
 
@@ -772,6 +775,9 @@ msgstr "Počet zaměstnanců"
 #~ msgid "Recruitment Process"
 #~ msgstr "Průběh náboru"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Nástěnka správce HR"
+
 #~ msgid "Configure"
 #~ msgstr "Nastavit"
 
@@ -853,3 +859,9 @@ msgstr "Počet zaměstnanců"
 
 #~ msgid "Employee's Contracts"
 #~ msgstr "Smlouvy zaměstnance"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Celkový požadovaný počet zaměstnanců pro úlohu."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Počet zaměstnanců"
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index b5d15ee60ad..ba68ff24a13 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,5 +679,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 6967f4ec754..deffd2e4c50 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -198,8 +198,9 @@ msgstr "Weiblich"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Notwendige Anzahl von Mitarbeiter um diesen Job zu erledigen."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -291,8 +292,8 @@ msgstr "Kategorien"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Stellenbedarf"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -422,12 +423,6 @@ msgstr "Kontakt Information"
 msgid "Working Address"
 msgstr "Arbeitgeberanschrift"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Pinnwand Personalleitung"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -725,8 +720,13 @@ msgstr "Unterstellte Mitarbeiter"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Anzahl der Mitarbeiter"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Arbeitszeiten Kategorien"
@@ -898,6 +898,9 @@ msgstr "Anzahl der Mitarbeiter"
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguration Personalwesen"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Stellenbedarf"
+
 #~ msgid "Image"
 #~ msgstr "Bild"
 
@@ -911,6 +914,9 @@ msgstr "Anzahl der Mitarbeiter"
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Verlinkt mit dem Abteilungsleiter"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Pinnwand Personalleitung"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Vorgehen Konfiguration"
 
@@ -1010,3 +1016,9 @@ msgstr "Anzahl der Mitarbeiter"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Untergeordnete Hierarchie"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Notwendige Anzahl von Mitarbeiter um diesen Job zu erledigen."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Anzahl der Mitarbeiter"
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index fe4c89ec881..d1451554a1c 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -181,7 +181,8 @@ msgstr "Γυναίκα"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -274,7 +275,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -392,12 +393,6 @@ msgstr "Πληροφορίες Επαφής"
 msgid "Working Address"
 msgstr "Διεύθυνση Εργασίας"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -686,7 +681,12 @@ msgstr "Υφιστάμενοι"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index d03337c2323..ec8215f8368 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Female"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,5 +679,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index 7340fe3a3cc..e764d663582 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Female"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Expected Employees"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -412,12 +413,6 @@ msgstr "Contact Information"
 msgid "Working Address"
 msgstr "Working Address"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR Manager Dashboard"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -706,7 +701,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -761,6 +761,9 @@ msgstr ""
 #~ msgid "Holidays"
 #~ msgstr "Holidays"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Expected Employees"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -787,6 +790,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "It is linked with manager of Department"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR Manager Dashboard"
+
 #~ msgid "Categories structure"
 #~ msgstr "Categories structure"
 
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 8f693764de1..73ecd398fe1 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número total de empleados necesarios para ese trabajo"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -419,12 +420,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Dirección de trabajo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -719,8 +714,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorías horarios de trabajo"
@@ -883,6 +883,9 @@ msgstr "Número de empleados"
 #~ msgid "No of Employee"
 #~ msgstr "Nº de empleado"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
 #~ msgid ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
@@ -966,6 +969,9 @@ msgstr "Número de empleados"
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Está vinculado con el director del departamento."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
@@ -1007,3 +1013,9 @@ msgstr "Número de empleados"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Jerarquía subirdinada"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de empleados"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número total de empleados necesarios para ese trabajo"
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index 92120bc7403..c01a58a1a54 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Dirección de trabajo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index fa86f0c2dd7..650adcc375b 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -415,12 +416,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Dirección de trabajo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -711,7 +706,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -777,6 +777,9 @@ msgstr ""
 #~ "Puede mejorar la aplicación de recursos humanos base mediante la instalación "
 #~ "de algunas funcionalidades relacionadas con RRHH."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso configuración"
 
@@ -796,6 +799,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Proceso de selección"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 8378839bd8d..5618e4ac2b6 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr
@@ -195,8 +195,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de empleados en total para ese trabajo."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -420,12 +421,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Dirección de trabajo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -720,8 +715,19 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
 
 #~ msgid "Categories structure"
 #~ msgstr "Estructura de categorías"
@@ -1008,3 +1014,9 @@ msgstr "Número de empleados"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Jerarquía subirdinada"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de empleados en total para ese trabajo."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de empleados"
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 96c4a33b4df..09f4d872ce3 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -196,8 +196,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de empleados requeridos en total para este puesto"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -289,8 +290,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -420,12 +421,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Dirección de trabajo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero Director Recursos Humanos"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -719,8 +714,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Work Email"
 #~ msgstr "E-mail de Trabajo"
@@ -848,5 +848,17 @@ msgstr "Número de Empleados"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo inválido en la definición de acción."
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de empleados requeridos en total para este puesto"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero Director Recursos Humanos"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Organigrama Jerárquico"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Empleados"
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index eb56633435d..29b346688a3 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Naine"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr "KontaktInformatsioon"
 msgid "Working Address"
 msgstr "Tööaadress"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Alluvad"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 99f87260a79..672e7146bb9 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -186,8 +186,9 @@ msgstr "Nainen"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Tehtävään vaadittava kokonaishenkilömäärä"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -279,8 +280,8 @@ msgstr "Kategoriat"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Odotetut työntekijät"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -397,12 +398,6 @@ msgstr "Yhteystiedot"
 msgid "Working Address"
 msgstr "Työosoite"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Henkilöstöpäällikön Työpöytä"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -691,8 +686,13 @@ msgstr "Alaiset"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Henkilöstön määrä"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Sunnuntai"
@@ -886,6 +886,9 @@ msgstr "Henkilöstön määrä"
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguraation eteneminen"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Henkilöstöpäällikön Työpöytä"
+
 #~ msgid "Status Description"
 #~ msgstr "Statuksen kuvaus"
 
@@ -917,6 +920,9 @@ msgstr "Henkilöstön määrä"
 #~ "Mahdollistaan määräaikaisarviointien ja suorituskykyanalyysien tekemisen "
 #~ "työntekijöille."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Odotetut työntekijät"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Tarvittava kokonaishenkilömäärä työtä varten."
 
@@ -948,5 +954,11 @@ msgstr "Henkilöstön määrä"
 #~ msgid "Recruitment Process"
 #~ msgstr "Rekrytointiprosessi"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Tehtävään vaadittava kokonaishenkilömäärä"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Alaishierarkia"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Henkilöstön määrä"
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 53d120d2079..85741cfffcd 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Féminin"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Nombre requis d'employés total pour ce poste"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Catégories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Employés attendus"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -417,12 +418,6 @@ msgstr "Informations sur le contact"
 msgid "Working Address"
 msgstr "Adresse professionnelle"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tableau de bord du directeur des ressources humaines"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -718,8 +713,13 @@ msgstr "Subordonnés"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Nombre d'employés"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Catégories de Temps de Travail"
@@ -886,6 +886,9 @@ msgstr "Nombre d'employés"
 #~ msgid "Image"
 #~ msgstr "Image"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Employés attendus"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "C'est lié au directeur du département"
 
@@ -949,6 +952,9 @@ msgstr "Nombre d'employés"
 #~ msgid "Configuration Progress"
 #~ msgstr "Avancement de la configuration"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tableau de bord du directeur des ressources humaines"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Nombre total de salariés nécessaires pour ce travail."
 
@@ -997,5 +1003,11 @@ msgstr "Nombre d'employés"
 #~ msgid "Employee Marital Status"
 #~ msgstr "État civil de l'employé"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Nombre requis d'employés total pour ce poste"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hiérarchie"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Nombre d'employés"
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index edb80992b63..1396e2f0486 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,5 +679,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index e4999ddcb39..ec1ad07181f 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Muller"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empregados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -414,12 +415,6 @@ msgstr "Información de contacto"
 msgid "Working Address"
 msgstr "Enderez do traballo"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Taboleiro Director RRHH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -710,7 +705,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -769,6 +769,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Número de empregados con ese traballo."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empregados previstos"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -795,6 +798,9 @@ msgstr ""
 #~ "Permítelle crear e xestionar a avaliación periódica e revisión da "
 #~ "productividade dos empregados."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Taboleiro Director RRHH"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Xestión de vacacións / ausencias"
 
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 0b59d72ea56..5238ff8e571 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0 field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "જરૂરીયાતો"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -35,7 +35,7 @@ msgstr ""
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "કર્મચારીને માહિતી સાથે સંલિગ્ન કરો."
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -47,17 +47,17 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "માનવ સંશાધન"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "ગ્રુપ દ્વારા..."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "તમારા વિભાગો બનાવો"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -73,7 +73,7 @@ msgstr ""
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
 #: field:hr.job,department_id:0 view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "વિભાગ"
 
 #. module: hr
 #: view:hr.job:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "કાર્યો"
 
 #. module: hr
 #: view:hr.job:0
@@ -94,12 +94,12 @@ msgstr ""
 #: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "કંપની"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "ભરતીમાં અપેક્ષિત"
 
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
@@ -170,7 +170,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "ઓળખ નંબર"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -179,7 +179,8 @@ msgstr "સ્ત્રી"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -200,23 +201,23 @@ msgstr ""
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "વંશજ વર્ગ(શ્રેણી)"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "કાર્યની વિગત"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "કાર્યાલયનું સ્થાન"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "મારા વિભાગના કર્મચારી"
 
 #. module: hr
 #: view:hr.employee:0 model:ir.model,name:hr.model_hr_employee
@@ -227,7 +228,7 @@ msgstr "કર્મચારી"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "અન્ય માહિતી"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -248,12 +249,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.open_board_hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard_user
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "માનવ સંશાધન ડેશબોર્ડ"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "કાર્ય"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -263,22 +264,22 @@ msgstr "સભ્યો"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "રુપરેખાંકન"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "વર્ગો"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "અપેક્ષિત કર્મચારીઓ"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr ""
+msgstr "છુટાછેડા લીધેલ"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -296,7 +297,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_department_tree
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "વિભાગો"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,9 +679,17 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
 msgstr ""
 
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Expected Employees"
+#~ msgstr "અપેક્ષિત કર્મચારીઓ"
+
 #~ msgid "Attendances"
 #~ msgstr "હાજરી"
 
@@ -695,3 +698,30 @@ msgstr ""
 
 #~ msgid "Expenses"
 #~ msgstr "ખર્ચાઓ"
+
+#~ msgid "title"
+#~ msgstr "શીર્ષક"
+
+#~ msgid "Simplifies the management of employee's attendances."
+#~ msgstr "કર્મચાર્યોની હાજરીનું સંચાલન સરળ બનાવે છે."
+
+#~ msgid "Holidays"
+#~ msgstr "રજાના દિવસો"
+
+#~ msgid "Employee Marital Status"
+#~ msgstr "કર્મચારીની વૈવાહિક સ્થિતિ"
+
+#~ msgid "Employee's Contracts"
+#~ msgstr "કર્મચારીના કરારો"
+
+#~ msgid "Position"
+#~ msgstr "સ્થાન"
+
+#~ msgid "Employee Passport Information"
+#~ msgstr "કર્મચારી પાસપોર્ટ માહિતી"
+
+#~ msgid "Periodic Evaluations"
+#~ msgstr "સામયિક મૂલ્યાંકનો"
+
+#~ msgid "Image"
+#~ msgstr "ચિત્ર"
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index af7f0969475..0675a5ffc46 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "स्त्री"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 8301b35a6c4..67416a5bcd6 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -195,8 +195,9 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Ukupan broj potrebnih zaposlenika za taj posao"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivano djelatnika"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -416,12 +417,6 @@ msgstr "Kontakt podaci"
 msgid "Working Address"
 msgstr "Poslovna adresa"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Nadzorna ploča upravitelja HR"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -715,8 +710,13 @@ msgstr "Podređeni djelatnici"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Broj djelatnika"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -898,6 +898,9 @@ msgstr "Broj djelatnika"
 #~ "Moguće je povećati mogućnosti aplikacije ljudskih resursa instalacijom "
 #~ "nekoliko funkcionalnosti povezanih sa odjelom ljudskih resursa."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivano djelatnika"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Tijek konfiguracije"
 
@@ -917,6 +920,9 @@ msgstr "Broj djelatnika"
 #~ msgid "Recruitment Process"
 #~ msgstr "Postupak regrutiranja"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Nadzorna ploča upravitelja HR"
+
 #~ msgid "Categories structure"
 #~ msgstr "Struktura kategorija"
 
@@ -993,5 +999,11 @@ msgstr "Broj djelatnika"
 #~ msgid "Configure"
 #~ msgstr "Promijeni postavke"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Ukupan broj potrebnih zaposlenika za taj posao"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Podređena hijerarhija"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Broj djelatnika"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index c0f57787a35..42effb62e6e 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -197,7 +197,7 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid "Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -290,7 +290,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -408,12 +408,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -702,5 +696,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index e60c45ac809..aef8ced876c 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -185,7 +185,8 @@ msgstr "Nő"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -278,8 +279,8 @@ msgstr "Kategóriák"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Javasolt alkalmazottak"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -397,12 +398,6 @@ msgstr "Kapcsolat információk"
 msgid "Working Address"
 msgstr "Munkahely címe"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR menedzser vezérlőpult"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -693,7 +688,12 @@ msgstr "Beosztottak"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -726,6 +726,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Kép"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR menedzser vezérlőpult"
+
 #~ msgid "Categories structure"
 #~ msgstr "Kategóriák strukturája"
 
@@ -765,6 +768,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Alkalmazott sorszáma"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Javasolt alkalmazottak"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Beállítási folyamat"
 
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index c5abd4e8dc3..83e9e5b5001 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Perempuan"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Dibutuhkan sejumlah karwayan untuk pekerjaan ini"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Kategori"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Karyawan yang diharapkan"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -418,12 +419,6 @@ msgstr "Informasi Kontak"
 msgid "Working Address"
 msgstr "Alamat Kerja"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Dasbor Manager HR"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -718,8 +713,13 @@ msgstr "Bawahan"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Jumlah Karyawan"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Menyederhanakan pengelolaan kehadiran karyawan."
@@ -768,6 +768,9 @@ msgstr "Jumlah Karyawan"
 #~ msgid "Number of employee with that job."
 #~ msgstr "Jumlah pegawai dengan pekerjaan itu."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Karyawan yang diharapkan"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -872,5 +875,14 @@ msgstr "Jumlah Karyawan"
 #~ msgid "Generic Payroll system Integrated with Accountings."
 #~ msgstr "Generik sistem Penggajian Terintegrasi  dengan  Pembukuan."
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Dibutuhkan sejumlah karwayan untuk pekerjaan ini"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Dasbor Manager HR"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Susunan Subordinat"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Jumlah Karyawan"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 5da4967c6de..54ea44b5d83 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Femmina"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Dipendenti previsti"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -414,12 +415,6 @@ msgstr "Informazioni Contatto"
 msgid "Working Address"
 msgstr "Indirizzo di lavoro"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Dashboard manager Ris. Umane"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -711,7 +706,12 @@ msgstr "Subordinati"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -861,6 +861,9 @@ msgstr ""
 #~ "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è "
 #~ "manager."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Dipendenti previsti"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Numero di dipendenti con quel lavoro"
 
@@ -918,6 +921,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Imagine"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Dashboard manager Ris. Umane"
+
 #~ msgid "Attendances"
 #~ msgstr "Presenze"
 
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index b7d2655f45f..3e4c2799d92 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -183,8 +183,9 @@ msgstr "女"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "この職種に必要な従業員の数"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -276,8 +277,8 @@ msgstr "区分"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "従業員候補"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -397,12 +398,6 @@ msgstr "連絡先の情報"
 msgid "Working Address"
 msgstr "勤務先住所"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人事マネジャのダッシュボード"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -691,11 +686,28 @@ msgstr "部下"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "従業員数"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "この職種に必要な従業員の数"
+
+#~ msgid "Expected Employees"
+#~ msgstr "従業員候補"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人事マネジャのダッシュボード"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "下位の階層構造"
 
 #~ msgid "Categories structure"
 #~ msgstr "カテゴリー体系"
+
+#~ msgid "Number of Employees"
+#~ msgstr "従業員数"
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index ad557d0bb25..741facadde0 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "여성"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr "연락처"
 msgid "Working Address"
 msgstr "사무실 주소"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr "종속"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index e30af6a51ff..1f9674891d4 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,5 +679,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 6dc0134341e..66ba2ea0d5d 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Moteris"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr "Kontaktinė informacija"
 msgid "Working Address"
 msgstr "Darbovietės adresas"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Pavaldiniai"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index c6d9cbf05f0..dac8d1c37a3 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Sieviete"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategorijas"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Gaidāmie Darbinieki"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -410,12 +411,6 @@ msgstr "Kontakta Informācija"
 msgid "Working Address"
 msgstr "Darbavietas Adrese"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Personāla Vadītāja Rīku Panelis"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -706,7 +701,12 @@ msgstr "Pakļautie"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
@@ -906,6 +906,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Ļauj periodiski veikt darbinieku novērtējumu un efektivitātes uzskaiti."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Gaidāmie Darbinieki"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Personāla Vadītāja Rīku Panelis"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 19cfd44c0a5..2ed59e21d52 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,8 +195,9 @@ msgstr "Женски"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Потребен број на вработени за тоа работно место"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Потребен број"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -416,14 +417,6 @@ msgstr "Контакт Информации"
 msgid "Working Address"
 msgstr "Службена Адреса"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-"Главна Табла за приказ на информациите поврзани со Менаџерите на Човечките "
-"Ресурси"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -715,7 +708,12 @@ msgstr "Подредени"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -775,6 +773,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Број на вработени на одреденото работно место/позиција."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Потребен број"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -801,6 +802,11 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Процес на Вработување"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr ""
+#~ "Главна Табла за приказ на информациите поврзани со Менаџерите на Човечките "
+#~ "Ресурси"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Раководење/Поставување на Празниците / Отсуствата"
 
@@ -882,3 +888,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Генерички систем на Платните Списоци интегрирани со Сметководствената Бизнис "
 #~ "Апликација."
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Потребен број на вработени за тоа работно место"
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index d9e1b2664fd..44151d80e15 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -74,6 +74,10 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Албан Тушаал нь ажлын байр болон шаардлагыг тодорхойлдог. Ажлын байруудад "
+"хэдэн ажилтан байгаа, ирээдүйд хэдэн ажилтантай болох гэх мэтийг хянаж "
+"хөтлөх боломжтой. Түүнчлэн ажлын байранд ажилтан авах үед өргөдөл гаргагчийг "
+"үнэлэхтэй холбоотой ярилцлагын асуулт зэрэгийг хавсаргах боломжтой."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -161,7 +165,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Өнгөний Индекс"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -189,8 +193,9 @@ msgstr "эм"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Тус албан тушаалд шаардлагатай нийт ажиллагсдын тоо"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -282,8 +287,8 @@ msgstr "Зэрэглэл"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Нийт орон тоо"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -409,12 +414,6 @@ msgstr "Гэрээний мэдээлэл"
 msgid "Working Address"
 msgstr "Ажлын хаяг"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Хүний нөөцийн менежерийн хянах самбар"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -489,7 +488,7 @@ msgstr "Ажилтны маягт дээр холбоо барих хаяг ши
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Хянах самбар"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -539,7 +538,7 @@ msgstr "Хувийн мэдээлэл"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Хот"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -549,7 +548,7 @@ msgstr "Пасспортын дугаар"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Ажлын гар утас"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -594,7 +593,7 @@ msgstr "Үндэстэн"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Амралт, чөлөө"
 
 #. module: hr
 #: view:board.board:0
@@ -703,8 +702,13 @@ msgstr "Харьяалагдсан"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Ажиллагсдын тоо"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Ням"
@@ -880,6 +884,9 @@ msgstr "Ажиллагсдын тоо"
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Хүний нөөцийн модулийн тохиргоо"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Нийт орон тоо"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Харагдацын архитектурын xml алдаатай !"
 
@@ -899,6 +906,9 @@ msgstr "Ажиллагсдын тоо"
 #~ "Ажилтны бүтээмжийн стандарт, үечилсэн үнэлгээг хөтлөх, үүсгэх боломжийг "
 #~ "олгоно."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Хүний нөөцийн менежерийн хянах самбар"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Амралт, чөлөө / Амралт, чөлөөний удирдлага"
 
@@ -978,3 +988,9 @@ msgstr "Ажиллагсдын тоо"
 
 #~ msgid "Configure Your Human Resources Application"
 #~ msgstr "Хүний Нөөцийн Аппликэшныг Тохируулах"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Тус албан тушаалд шаардлагатай нийт ажиллагсдын тоо"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Ажиллагсдын тоо"
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index dc62e39a4bb..7dd1c1ef719 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Kvinne"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr "Kategorier"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr "Kontaktinformasjon"
 msgid "Working Address"
 msgstr "Adresse arbeid"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr "Underordnet"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "title"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 446398d8f58..e3db2b1ca20 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -193,8 +193,9 @@ msgstr "Vrouw"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Benodigd totaal aantal werknemers voor de functie."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -286,8 +287,8 @@ msgstr "Categorieën"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Verwachte werknemers"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -415,12 +416,6 @@ msgstr "Contactgegevens"
 msgid "Working Address"
 msgstr "Werkadres"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR manager dashboard"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -714,8 +709,13 @@ msgstr "Ondergeschikten"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Aantal werknemers"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
@@ -910,6 +910,9 @@ msgstr "Aantal werknemers"
 #~ "Laat u de periodieke evaluaties en functioneringsgesprekken van medewerkers "
 #~ "maken en beheren"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR manager dashboard"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuratievoortgang"
 
@@ -993,5 +996,14 @@ msgstr "Aantal werknemers"
 #~ msgid "Configure Your Human Resources Application"
 #~ msgstr "Configureer uw HR applicatie"
 
+#~ msgid "Number of Employees"
+#~ msgstr "Aantal werknemers"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Benodigd totaal aantal werknemers voor de functie."
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hiërarchische ondergeschikte"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Verwachte werknemers"
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 770273532f4..44ee0fd59df 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 3336e1a628c..380b6daec22 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -182,7 +182,8 @@ msgstr "Kobieta"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -275,13 +276,13 @@ msgstr "Kategorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Spodziewana liczba pracowników"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "Rozwiedziony"
+msgstr "Rozwiedziony(a)"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -393,12 +394,6 @@ msgstr "Informacje kontaktowe"
 msgid "Working Address"
 msgstr "Adres do pracy"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Konsola Dyrektora kadr"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -687,7 +682,12 @@ msgstr "Podlegli"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
@@ -866,6 +866,9 @@ msgstr ""
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguracja kadr"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Spodziewana liczba pracowników"
+
 #~ msgid "Image"
 #~ msgstr "Obraz"
 
@@ -879,3 +882,6 @@ msgstr ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
 #~ msgstr "Pozwala ci zarządzać okresowymi ocenami i osiągnięciami pracowników."
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Konsola Dyrektora kadr"
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 3f0e52d69b8..11dcdca4c9b 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -34,7 +34,7 @@ msgstr "Erro! Não pode criar departamentos recursivos."
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Ligue o colaborador à informação"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -194,8 +194,9 @@ msgstr "Feminino"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de funcionários necessário no total para esse trabalho."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Categorias"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Funcionários previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -419,12 +420,6 @@ msgstr "Informação do Contato"
 msgid "Working Address"
 msgstr "Endereço de Trabalho"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Painel do Gestor de RH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -504,7 +499,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr "Painel de Controlo"
+msgstr "Painel"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -718,8 +713,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Funcionários"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
@@ -796,6 +796,9 @@ msgstr "Número de Funcionários"
 #~ msgid "Recruitment Process"
 #~ msgstr "Processo de Recrutamento"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Painel do Gestor de RH"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progresso da Configuração"
 
@@ -934,6 +937,9 @@ msgstr "Número de Funcionários"
 #~ msgstr ""
 #~ "Regista ausências dos funcionários, requisições de colocação e planeamento"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Funcionários previstos"
+
 #~ msgid "Employee Hierarchy"
 #~ msgstr "Hierarquia dos funcionários"
 
@@ -986,6 +992,9 @@ msgstr "Número de Funcionários"
 #~ "    * Cargos\n"
 #~ "    "
 
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Funcionários"
+
 #~ msgid "title"
 #~ msgstr "Título"
 
@@ -1001,3 +1010,6 @@ msgstr "Número de Funcionários"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hierarquia Subordinada"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de funcionários necessário no total para esse trabalho."
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index d98d7a31f95..10b29cc27a2 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -182,8 +182,9 @@ msgstr "Feminino"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número total de funcionários requeridos para fazer esta tarefa."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -275,8 +276,8 @@ msgstr "Categorias"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Funcionários Esperados"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -394,12 +395,6 @@ msgstr "Informações do contato"
 msgid "Working Address"
 msgstr "Endereço comercial"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Painel do Gerente de RH"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -690,8 +685,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Funcionários"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
@@ -855,6 +855,9 @@ msgstr "Número de Funcionários"
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Está associado ao gerente do Departamento"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Painel do Gerente de RH"
+
 #~ msgid "Status Description"
 #~ msgstr "Descrição do status"
 
@@ -912,6 +915,9 @@ msgstr "Número de Funcionários"
 #~ "Permite criar e gerenciar a avaliação periódica e revisar o desempenho de "
 #~ "funcionários."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Funcionários Esperados"
+
 #~ msgid "Employee Passport Information"
 #~ msgstr "Informação do Passaporte do Funcionário"
 
@@ -949,3 +955,9 @@ msgstr "Número de Funcionários"
 #~ "    * Departamentos de RH\n"
 #~ "    * Cargos de RH\n"
 #~ "    "
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número total de funcionários requeridos para fazer esta tarefa."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Funcionários"
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index f4e2c59fa4d..4dadb4f94eb 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -24,17 +24,17 @@ msgstr "Utilizator OpenERP"
 #. module: hr
 #: view:hr.job:0 field:hr.job,requirements:0
 msgid "Requirements"
-msgstr "Cerințe"
+msgstr "Cerinte"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Eroare! Nu puteţi crea departamente recursive."
+msgstr "Eroare! Nu puteti crea departamente recursive."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Conectează angajatul la informaţii"
+msgstr "Conectati angajatul la informatii"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -46,17 +46,17 @@ msgstr "Nr SIN"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Resurse umane"
+msgstr "Resurse Umane"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Creati-va Departamentele"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -67,11 +67,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
-"Pozitiile de locuri de muncă sunt folosite pentru a defini posturile şi "
-"cerinţele lor. Puteţi ţine evidenţa numărului de salariaţi per post şi la "
-"câţi vă aşteptaţi în viitor. De asemenea, aveţi posibilitatea să ataşaţi un "
-"sondaj la un post de muncă care va fi utilizat în procesul de recrutare "
-"pentru a evalua candidatii pentru acest loc de muncă."
+"Nivelul functiilor sunt folosite pentru a defini posturile si cerintele lor. "
+"Puteti sa tineti evidenta numarului de salariati per post si la cati va "
+"asteptati in viitor. De asemenea, aveti posibilitatea sa atasati un sondaj "
+"la o functie care va fi utilizat in procesul de recrutare pentru a evalua "
+"candidatii pentru aceasta functie."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -82,12 +82,12 @@ msgstr "Departament"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr "Marchează ca veche"
+msgstr "Marcheaza ca vechi(e)"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr "Locuri de muncă"
+msgstr "Locuri de munca"
 
 #. module: hr
 #: view:hr.job:0
@@ -98,7 +98,7 @@ msgstr "In recrutare"
 #: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
@@ -108,7 +108,7 @@ msgstr "Asteptat in recrutare"
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Managementul RU"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -127,7 +127,7 @@ msgstr "Leaga un utilizator de un angajat"
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Departament superior"
+msgstr "Departament Superior"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,notes:0
@@ -137,7 +137,7 @@ msgstr "Note"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married"
-msgstr "Căsătorit(ă)"
+msgstr "Casatorit(a)"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
@@ -147,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Creati formularul angajatilor si conectati-i la un utilizator OpenERP daca "
+"doriti ca ei sa acceseze aceasta instanta. Categoriile pot fi configurate pe "
+"angajati pentru a efectua operatiuni masive pentru toti angajatii din "
+"aceeasi categorie, de ex. alocarea concediilor."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -155,15 +159,15 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
-"Structura Departamentelor Companiei dumenavoastra este folosita pentru a "
+"Structura Departamentelor Companiei dumneavoastra este folosita pentru a "
 "gestiona toate documentele referitoare la angajati per departamente: "
-"validarea cheltuielilor si a foii de pontaj, managementul zilelor libere, "
+"validarea cheltuielilor si a fisei de pontaj, managementul zilelor libere, "
 "recrutari, etc."
 
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Index culori"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -171,7 +175,7 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
-"Campul asociat utilizatorului in formularul Angajatului permite conectarea "
+"Campul asociat utilizatorului in Formularul Angajatului permite conectarea "
 "utilizatorului OpenERP (si drepturile acestuia/acesteia) la angajat."
 
 #. module: hr
@@ -182,22 +186,23 @@ msgstr "In recrutare"
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "CNP"
+msgstr "Nr. de identificare"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "Feminin"
+msgstr "Femeie"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Prezenta"
 
 #. module: hr
 #: view:hr.employee:0
@@ -207,23 +212,23 @@ msgstr "ID-uri sociale"
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "Telefon birou"
+msgstr "Telefon la serviciu"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "Categorii subordonate"
+msgstr "Categorii Subordonate"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr "Fișa postului"
+msgstr "Fisa postului"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Locaţie birou"
+msgstr "Locatia biroului"
 
 #. module: hr
 #: view:hr.employee:0
@@ -239,7 +244,7 @@ msgstr "Angajat"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr "Alte informații"
+msgstr "Alte informatii"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -249,7 +254,7 @@ msgstr "E-mail serviciu"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr "Data nașterii"
+msgstr "Data nasterii"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -265,7 +270,7 @@ msgstr "Tablou de bord Resurse Umane"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr "Loc de muncă"
+msgstr "Loc de munca"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -284,18 +289,18 @@ msgstr "Categorii"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Angajati estimati"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "Divorțat(ă)"
+msgstr "Divortat(a)"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Categorie părinte"
+msgstr "Categorie parinte (superioara)"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -313,7 +318,7 @@ msgstr "Departamente"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contact angajat"
+msgstr "Contact Angajat"
 
 #. module: hr
 #: view:board.board:0
@@ -323,19 +328,19 @@ msgstr "Consiliul meu"
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr "Masculin"
+msgstr "Barbat"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr "Categorii de salariaţi"
+msgstr "Categorii de angajati"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categorie angajat"
+msgstr "Categorie aAgajat"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -345,12 +350,12 @@ msgstr "Contract angajat"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "hr.department (departament.resurse_umane)"
+msgstr "departament.resurse_umane"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Creati-va Angajatii"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -375,28 +380,28 @@ msgstr ""
 "proprietari specifice in sistem. Pastrati toate informatiile legate de "
 "angajati si tineti evidenta a tot ceea ce trebuie sa fie inregistrat pentru "
 "ei. Tabul informatiilor personale va va ajuta sa pastrati datele lor de "
-"identificare. Tabul Categorii va da posibilitatea de a le atribui categorii "
-"asociate de angajati in functie de pozitia si activitatile lor in cadrul "
-"companiei. O categorie poate fi un nivel superior in cadul companiei sau a "
-"unui departament. Tabul Foi de pontaj va permite sa le atribuiti o foaie de "
-"pontaj specifica si un jurnal analitic unde vor putea introduce timpul in "
+"identificare. Tabul Categorii va da posibilitatea sa le atribuiti categorii "
+"asociate de angajati in functie de pozitia si activitatile lor din cadrul "
+"companiei. O categorie poate fi un nivel superior in cadrul companiei sau al "
+"unui departament. Tabul Fise de pontaj va permite sa le atribuiti o fisa de "
+"pontaj specifica si un jurnal analitic unde vor putea introduce orele in "
 "sistem. In tabul note, puteti introduce date text care vor fi inregistrate "
 "pentru un anumit angajat."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Cont bancar pentru salariu al angajatului"
+msgstr "Cont bancar pentru salariul angajatului"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr "Notă"
+msgstr "Nota"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Structură angajaţi"
+msgstr "Structura Angajati"
 
 #. module: hr
 #: constraint:res.users:0
@@ -407,23 +412,17 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Informații de contact"
+msgstr "Informatii de contact"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr "Adresă serviciu"
-
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablou de bord Manager Resurse Umane"
+msgstr "Adresa de la serviciu"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Departamente subordonate"
+msgstr "Departamente Subordonate"
 
 #. module: hr
 #: view:hr.employee:0
@@ -439,22 +438,22 @@ msgstr "Structura categoriilor"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr "necunoscut(ă)"
+msgstr "necunoscut(a)"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Numarul de angajati cu acel post."
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "Număr de securitate socială (CNP)"
+msgstr "Nr de SS (Securitate Sociala)"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -473,11 +472,14 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Structura departamentelor d-voastra este folosita pentru a gestiona toate "
+"documentele asociate angajatilor pe departamente: validarea cheltuielilor si "
+"a fisei de pontaj, gestionarea concediilor, recrutari, etc."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr "Numar cont bancar"
+msgstr "Numar de cont bancar"
 
 #. module: hr
 #: view:hr.department:0
@@ -491,12 +493,12 @@ msgid ""
 "information."
 msgstr ""
 "In formularul Angajatului, exista mai multe tipuri de informatii, cum ar fi "
-"Informatii de contact."
+"Informatiile de contact."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Tablou de bord"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -516,57 +518,57 @@ msgstr "Stare"
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr "Stare civilă"
+msgstr "Stare civila"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
+msgstr "ir.actiuni.act_fereastra"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "Forma şi structura angajați"
+msgstr "Formular si structura angajati"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr "Fotografie"
+msgstr "Poza"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr "res.users (res.utilizatori)"
+msgstr "res.utilizatori"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Informații personale"
+msgstr "Informatii Personale"
 
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Oras"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr "Nr. pașaport"
+msgstr "Nr pasaport"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Mobil serviciu"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorii salariaţi"
+msgstr "Categorii Salariati"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Adresa de acasă"
+msgstr "Adresa de acasa"
 
 #. module: hr
 #: view:hr.job:0
@@ -576,7 +578,7 @@ msgstr "Descriere"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Single"
-msgstr "Necăsatorit(ă)"
+msgstr "Necasatorit(a)"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -591,27 +593,27 @@ msgstr "In pozitie"
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "departamnet"
+msgstr "departament"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Naţionalitate"
+msgstr "Nationalitate"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Concedii"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "Manager consiliu RU"
+msgstr "Panou Manager RU"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr "Resursă"
+msgstr "Resursa"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -634,12 +636,12 @@ msgstr "Sex"
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Angajați"
+msgstr "Angajati"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr "Număr de Asigurări Sociale"
+msgstr "Numar Asigurari Sociale"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -649,7 +651,7 @@ msgstr "Nume departament"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "Număr Asigurare Socială"
+msgstr "Numar Asigurare Sociala"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -659,12 +661,12 @@ msgstr "Crearea unui utilizator OpenERP"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Autentificare"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr "Informații despre funcție"
+msgstr "Informatii despre functie"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -675,7 +677,7 @@ msgstr "Pozitii functie"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Alt Id"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -685,32 +687,37 @@ msgstr "Instructor"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Numele functiei trebuie sa fie unic per companie!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Locurile de munca din Departamentele mele"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "Manager"
+msgstr "Director"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Widower"
-msgstr "Văduv"
+msgstr "Vaduv"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Subordonaţi"
+msgstr "Subordonati"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
@@ -776,9 +783,6 @@ msgstr ""
 #~ msgid "Employee Complete Form"
 #~ msgstr "Formular complet al salariatului"
 
-#~ msgid "Categories structure"
-#~ msgstr "Structura categoriilor"
-
 #~ msgid "Timesheet Line"
 #~ msgstr "Linie foaie de pontaj"
 
@@ -918,6 +922,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Numarul de angajati cu acel loc de munca."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Angajati estimati"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -940,6 +947,9 @@ msgstr ""
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Managementul Concediilor / Liberelor"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablou de bord Manager Resurse Umane"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
@@ -992,3 +1002,15 @@ msgstr ""
 
 #~ msgid "Generic Payroll system Integrated with Accountings."
 #~ msgstr "Sistemul General de Salarizare integrat cu Contabilitatea."
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Numarul necesar de angajati per total pentru acea munca."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Ierarhie Subordonata"
+
+#~ msgid "Categories structure"
+#~ msgstr "Structura categorii"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Numarul de Angajati"
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 5d532420d19..5dbf20102a4 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -56,7 +56,7 @@ msgstr "Объеденить по..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Укажите ваши отделы"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -108,7 +108,7 @@ msgstr "Планируется набрать"
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Управление кадрами"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -147,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Создать сотрудника и добавить ссылку на пользователя OpenERP, если вы "
+"желаете предоставить ему доступ. Категории могут быть указаны для "
+"сотрудников для применения массовых операций на всех сотрудниках данной "
+"категории."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -162,7 +166,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -190,13 +194,14 @@ msgstr "Женский"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Посещаемость"
 
 #. module: hr
 #: view:hr.employee:0
@@ -283,8 +288,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Планируется сотрудников"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -349,7 +354,7 @@ msgstr "hr.department"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Создайте ваших сотрудников."
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -413,12 +418,6 @@ msgstr "Контактная информация"
 msgid "Working Address"
 msgstr "Рабочий адрес"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Инфо-панель менеджера отдела кадров"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -443,7 +442,7 @@ msgstr "неизвестен"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Количество сотрудников с данной работой."
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -472,6 +471,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Структура отделов используется для управления документами, относящимся к "
+"сотрудникам по отделам: проверки расходов и расписания, управления "
+"посещаемостью, набор новых сотрудников и т. д."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -495,7 +497,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Инфо-панель"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -545,7 +547,7 @@ msgstr "Личные данные"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Город"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -555,7 +557,7 @@ msgstr "№ паспорта"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Рабочий сотовый телефон"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -600,7 +602,7 @@ msgstr "Национальность"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Отпуска"
 
 #. module: hr
 #: view:board.board:0
@@ -658,7 +660,7 @@ msgstr "Создание пользователя OpenERP"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Имя пользователя системы"
 
 #. module: hr
 #: view:hr.employee:0
@@ -674,7 +676,7 @@ msgstr "Штатное расписание"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Other Id"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -684,7 +686,7 @@ msgstr "Тренер"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Название должности в компании должно быть уникальным!"
 
 #. module: hr
 #: view:hr.job:0
@@ -709,7 +711,12 @@ msgstr "Подчиненные"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -912,6 +919,9 @@ msgstr ""
 #~ "Вы можете улучшить базовое приложение \"Кадры\" подключив некоторый "
 #~ "дополнительный функционал."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Планируется сотрудников"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Связано с руководителем подразделения"
 
@@ -982,6 +992,9 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Периодические собеседования"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Инфо-панель менеджера отдела кадров"
+
 #~ msgid "No of Employee"
 #~ msgstr "Число сотрудников"
 
@@ -991,3 +1004,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Позволяет создавать и управлять периодическими собеседованиями и "
 #~ "анализировать производительность сотрудников."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Дерево субординации"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Общее необходимое число сотрудников для данной работы."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Количество сотрудников"
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 4b247150c1b..19eebe1c02d 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Žena"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr "Kontaktné informácie"
 msgid "Working Address"
 msgstr "Pracovná adresa"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr "Podriadený"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index e6766fe9f8b..d174d2aa48a 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Ženska"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr "Podatki o stiku"
 msgid "Working Address"
 msgstr "Delovni naslov"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Podrejeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index bae2ed10614..99d054946a4 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -390,12 +391,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,5 +679,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 80f385bcd84..ab929ddae13 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -183,7 +183,8 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -276,8 +277,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivani zapopljeni"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -394,12 +395,6 @@ msgstr "Kontakt Info"
 msgid "Working Address"
 msgstr "Adresa Posla"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -690,7 +685,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
@@ -752,6 +752,9 @@ msgstr ""
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguracija Aplikacije Ljudskih Resursa"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivani zapopljeni"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za pregled arhitekture"
 
@@ -771,6 +774,9 @@ msgstr ""
 #~ "Omogućava ti da kreiraš i upravljaš sa periodičnom procenama i performansama "
 #~ "pregleda zapošljenih."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguracioni Proces"
 
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index aa5c0402cc9..f32af555d5a 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivani zapošljeni"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -411,12 +412,6 @@ msgstr "Kontakt Info"
 msgid "Working Address"
 msgstr "Adresa Posla"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -707,7 +702,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
@@ -752,6 +752,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Proces Zapošljavanja"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguracioni Proces"
 
@@ -826,6 +829,9 @@ msgstr ""
 #~ "Možete da povećate bazu HR Aplikacija instaliranjem nekolikoHR-vezanih "
 #~ "funkcionalnosti."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivani zapošljeni"
+
 #~ msgid ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 4542d3e51bc..ab2b55d9874 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -34,7 +34,7 @@ msgstr "Fel! Det går inte att skapa rekursiva avdelningar!"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Knyt anställd till information"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -67,6 +67,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Befattningar används för att definiera arbetsuppgifter och deras krav. Du "
+"kan hålla reda på antalet anställda du har per befattning och hur många du "
+"förväntar dig i framtiden. Du kan också bifoga en enkät till ett befattning "
+"som kommer att användas i rekryteringsprocessen för att utvärdera de sökande "
+"för denna befattning."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -77,7 +82,7 @@ msgstr "Avdelning"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Märk som gammal"
 
 #. module: hr
 #: view:hr.job:0
@@ -98,7 +103,7 @@ msgstr "Företag"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Väntas i rekryteringen"
 
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
@@ -111,6 +116,8 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Företag som är knutet till den aktuella anställde. Bokföringstransaktioner "
+"kommer att registreras på detta företag som tillhör denna anställd."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -140,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Formulär för registrering av anställda och knyt dem till OpenERP-användare "
+"of du vill att de skall kunna logga in. Kategorier kan sättas på anställda "
+"för att utföra massåtgärder för alla anställda i samma kategori, t ex "
+"semesterplanering."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -148,6 +159,9 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Din bolags avdelningsstruktur används för att hantera alla handlingar som "
+"rör anställda per avdelningar: kostnader och tidrapport utvärderingar,  "
+"ledigheter och rekryteringar, etc."
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -160,11 +174,13 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"I relationsfältet för i anställningsformuläret gör det möjligt att koppla "
+"OpenERP-användaren (och hennes rättigheter) till den anställde."
 
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "I rekrytering"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -178,7 +194,8 @@ msgstr "Kvinna"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -267,11 +284,11 @@ msgstr "Konfiguration"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -337,7 +354,7 @@ msgstr "hr.department"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Registrera dina anställda"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -358,11 +375,21 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Här kan du hantera din arbetsstyrka genom att skapa anställda och ge dem "
+"specifika egenskaper i systemet. Underhåll information om den anställde "
+"hålla koll på allt som måste registreras för dem. Den personliga "
+"informationsfliken hjälper dig att underhålla identitetsdata. Kategorifliken "
+"ger dig möjlighet att tilldela kategorier beroende på den anställdes "
+"befattning och verksamhet inom företaget. En kategori kan vara t ex ange "
+"senioritet inom företaget eller en avdelning. Tidrapportfliken kan tilldela "
+"dem en särskild tidrapport och objektjournal där de kommer att kunna mata in "
+"tid i systemet. I noteringsfliken kan du ange text data som ska registreras "
+"för en viss anställd."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Anställds lönekonto"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -377,7 +404,7 @@ msgstr "Struktur för de anställda"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Detta bolag är inte tillåtet för den här användaren"
 
 #. module: hr
 #: view:hr.employee:0
@@ -389,12 +416,6 @@ msgstr "Kontaktinformation"
 msgid "Working Address"
 msgstr "adress"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -448,6 +469,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Din avdelningsstruktur används för att administrera alla dokument relaterade "
+"till anställda per avdelning; utlägg och tidrapporter, utvärderingar, "
+"semesterplanering, rekrytering etc."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -465,6 +489,8 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"I anställningsformuläret finns olika typer av information, t ex "
+"kontaktinformation."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
@@ -494,12 +520,12 @@ msgstr "Civilstånd"
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Anställdsformulär och struktur"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -509,7 +535,7 @@ msgstr "Bild"
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: view:hr.employee:0
@@ -559,7 +585,7 @@ msgstr "Jobbnamn"
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "I befattning"
 
 #. module: hr
 #: view:hr.department:0
@@ -579,7 +605,7 @@ msgstr "Frånvaro"
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Personaladministrationsinfopanel"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -612,7 +638,7 @@ msgstr "Anställda"
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Försäkringsnummer"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -622,12 +648,12 @@ msgstr "Avdelningsnamn"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Personnummer"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Skapa OpenERP-användare"
 
 #. module: hr
 #: field:hr.employee,login:0
@@ -648,7 +674,7 @@ msgstr "Platser"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Annat ID"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -658,12 +684,12 @@ msgstr "Tränare"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Namnet på befattningen måste vara unikt per bolag!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Min avdelnings arbeten"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
@@ -683,8 +709,13 @@ msgstr "Underordnad"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Antal anställda"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Work Email"
 #~ msgstr "E-post arbete"
@@ -810,3 +841,18 @@ msgstr "Antal anställda"
 
 #~ msgid "Employee Complete Form"
 #~ msgstr "Employee Complete Form"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Antal anställda"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Personalchefens infopanel"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Väntade anställda"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Krävt antal anställda totalt för detta arbete."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Underlydande hierarki"
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 1bc8ade24a0..5ffd98ff445 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "หญิง"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,8 +273,8 @@ msgstr "ประเภท"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "พนักงานที่คาดหวัง"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -390,12 +391,6 @@ msgstr "ข้อมูลการติดต่อ"
 msgid "Working Address"
 msgstr "ที่อยู่ที่ทำงาน"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -684,7 +679,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Holidays"
@@ -724,6 +724,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "จำนวนพนักงาน"
 
+#~ msgid "Expected Employees"
+#~ msgstr "พนักงานที่คาดหวัง"
+
 #~ msgid "Recruitment Process"
 #~ msgstr "ขั้นตอนการสรรหา"
 
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 5d1f03f1631..9631280228f 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,5 +678,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 34647db68ce..911913a4b01 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Kadın"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategoriler"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Beklenen Personel"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -412,12 +413,6 @@ msgstr "İletişim Bilgisi"
 msgid "Working Address"
 msgstr "İş Adresi"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "İK Yönetici Kontrol Paneli"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -706,7 +701,12 @@ msgstr "Emrindekiler"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -908,6 +908,9 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Süreli Değerlendirmeler"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Beklenen Personel"
+
 #~ msgid "Helps you manage and streamline your recruitment process."
 #~ msgstr "Eleman seçme işleminizi yönetmenizi ve yürütmenizi sağlar."
 
@@ -925,6 +928,9 @@ msgstr ""
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "Hata ! Personelin müdür olduğu bir bölümü seçemezsiniz."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "İK Yönetici Kontrol Paneli"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "O iş için gerekli toplam Personel sayısı"
 
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 03df4fc2447..0f669e827c3 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -389,12 +390,6 @@ msgstr ""
 msgid "Working Address"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "Підлеглі"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index 6378c34f2da..bd8a5eca23b 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,7 +195,8 @@ msgstr "Nữ"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -288,8 +289,8 @@ msgstr "Loại"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "nhân viên dự kiến"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -417,12 +418,6 @@ msgstr "Thông tin liên hệ"
 msgid "Working Address"
 msgstr "Địa chỉ làm việc"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "bàng tổng quan nguồn nhân lực"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -713,7 +708,12 @@ msgstr "Người cấp dưới"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Group name"
@@ -913,6 +913,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "số lượng nhân viên đang làm việc trong công viêc"
 
+#~ msgid "Expected Employees"
+#~ msgstr "nhân viên dự kiến"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -933,6 +936,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Liên kết giũa người quản lý và phòng ban"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "bàng tổng quan nguồn nhân lực"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "ngày nghỉ / quản lý nhân viên nghỉ"
 
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 9715ce63c34..c9cdba0e65c 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,8 +179,9 @@ msgstr "女性"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "该职位所需的总员工数"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -272,8 +273,8 @@ msgstr "分类"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "预期员工数"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -395,12 +396,6 @@ msgstr "联系信息"
 msgid "Working Address"
 msgstr "工作地址"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人力资源经理仪表盘"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -689,8 +684,13 @@ msgstr "下属"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "员工数"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Group name"
 #~ msgstr "组名"
@@ -874,6 +874,9 @@ msgstr "员工数"
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "错误！您不能选择一部门因为该员工是经理。"
 
+#~ msgid "Expected Employees"
+#~ msgstr "预期员工数"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -957,5 +960,14 @@ msgstr "员工数"
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "该职务需要的员工数。"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "该职位所需的总员工数"
+
+#~ msgid "Number of Employees"
+#~ msgstr "员工数"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "隶属结构"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人力资源经理仪表盘"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index b7116843ae5..3c81422ce28 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "女"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,8 +272,8 @@ msgstr "分類"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "預期員工數目"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -389,12 +390,6 @@ msgstr "聯絡資料"
 msgid "Working Address"
 msgstr "辦公地址"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人力資源經理儀錶板"
-
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
@@ -683,7 +678,12 @@ msgstr "下屬"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Group name"
@@ -725,12 +725,18 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "員工數目"
 
+#~ msgid "Expected Employees"
+#~ msgstr "預期員工數目"
+
 #~ msgid "Image"
 #~ msgstr "圖像"
 
 #~ msgid "Recruitment Process"
 #~ msgstr "招聘進度"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人力資源經理儀錶板"
+
 #~ msgid "Categories structure"
 #~ msgstr "分類結構"
 
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index fb48f020f24..c9e5b7a8628 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -31,7 +31,7 @@ class hr_config_settings(osv.osv_memory):
         'module_hr_attendance': fields.boolean('Track Attendances',
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('Manage Timesheets',
-            help ="""This installs the module hr_timesheet."""),                                
+            help ="""This installs the module hr_timesheet."""),
         'module_hr_holidays': fields.boolean('Leaves & Holidays',
             help ="""This installs the module hr_holidays."""),
         'module_hr_expense': fields.boolean('Expenses',
@@ -46,4 +46,16 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_payroll."""),
     }
 
+    def onchange_hr_timesheet(self, cr, uid, ids, timesheet, context=None):
+        """ module_hr_timesheet implies module_hr_attendance """
+        if timesheet:
+            return {'value': {'module_hr_attendance': True}}
+        return {}
+
+    def onchange_hr_attendance(self, cr, uid, ids, attendance, context=None):
+        """ module_hr_timesheet implies module_hr_attendance """
+        if not attendance:
+            return {'value': {'module_hr_timesheet': False}}
+        return {}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e3cfd96d26f..f96f4a80ab2 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -16,29 +16,36 @@
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <separator string="Additional Features" colspan="4"/>
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_contract"/>
-                            <field name="module_hr_holidays"/>
-                            <newline/>
-                            <field name="module_hr_payroll"/>
-                            <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                                string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
-
-                            <separator string="Timesheets" colspan="4"/>
-                            <field name="module_hr_attendance"/>
-                            <field name="module_hr_timesheet"/>
-                            <field name="module_hr_timesheet_sheet"/>
-
-                            <group name="config_recruitment" colspan="4"/>
-                         </group>
+                        <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>
+                        <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>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 0f72d37f32f..5e4c3052858 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,12 +3,12 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">HR Officer</field>
+        <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">HR Manager</field>
+        <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
index 0f14828694c..5a01b55439b 100644
--- a/addons/hr/test/open2recruit2close_job.yml
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -26,13 +26,13 @@
   !python {model: hr.employee}: |
     self.write(cr, uid, [ref('employee_niv')], {'job_id':ref('job_developer')})
 -
-  Now I dont want to recruit new employee for this position. so I mark it as Old.
+  Now I dont want to recruit new employee for this position. so I mark it as Open.
 -
   !python {model: hr.job}: |
-    self.job_old(cr, uid, [ref('job_developer')])
+    self.job_open(cr, uid, [ref('job_developer')])
 -
   I check 'state' and number of 'Expected in Recruitment' after closing the Job position.
 -
-  !assert {model: hr.job, id: job_developer, string: Job position is in 'old' state and no_of_recruitment = 0}:
-    - state == 'old'
+  !assert {model: hr.job, id: job_developer, string: Job position is in 'open' state and no_of_recruitment = 0}:
+    - state == 'open'
     - no_of_recruitment == 0
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c2c964565ad..d3047f424ec 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
+                	<sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
                         <field name="action"/>
                         <field name="action_desc"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -52,12 +54,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="name" string="Attendance"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
-                    <field name="name"/>
                     <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -123,7 +125,7 @@
         <menuitem
             sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
             groups="base.group_no_one"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" />
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 6f2ad46e913..ab93bd9c0c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,23 +39,22 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
-                   <separator orientation="vertical"/>
-                   <field name="name"/>
-                   <field name="employee_id"/>
-                   <field name="working_hours"/>
-                   <field name="date_start"/>
-                   <field name="date_end"/>
+                       <field name="name" string="Contracts"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
+                       <separator orientation="vertical"/>
+                       <field name="employee_id"/>
+                       <field name="working_hours"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                   <separator orientation="vertical"/>
-                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                       <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                       <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>
@@ -66,13 +65,14 @@
             <field name="model">hr.contract</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contract">
+                <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" widget="selection"/>
+                        <field name="type_id"/>
                     </group>
                     <notebook>
                         <page string="Information" name="information">
@@ -101,6 +101,7 @@
                             </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -162,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                    <field name="name"/>
+                       <field name="name" string="Contract Type"/>
                    </group>
                </search>
             </field>
@@ -176,7 +177,7 @@
             <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
 
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Contracts Button on Employee Form -->
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index f25c669a973..7ed11beb98c 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
             <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
@@ -16,9 +17,9 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
-            </xpath>
+                <xpath expr="/form/board/column[2]" position="inside">
+                    <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 710c33f12b9..90de785a34a 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <group>
-                       <field name="name"/>
+                       <field name="name" string="Appraisal Plans"/>
+                       <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
@@ -227,29 +228,22 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
-                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                        help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
-                    <filter icon="terp-go-month" name="next_month" string=" Month+1" 
-                         domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
-                         help="Appraisal during next month"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id" />
-                    <field name="plan_id" widget="selection" />
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                        <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>
-                    <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
-                    <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -265,7 +259,7 @@
             <field name="help">Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
         </record>
 
-        <menuitem name="Appraisal" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
+        <menuitem name="Appraisals" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree" groups="base.group_hr_user"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
@@ -327,9 +321,9 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index d9667080f6b..af0e8156f7f 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-21 04:37+0000\n"
+"Last-Translator: lhagvajargal <jagaapu@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -24,7 +24,7 @@ msgstr "Илгээгч нь үл мэдэгдэх товчоог менежер
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr ""
+msgstr "үнэлгээг эхлэх"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
@@ -91,7 +91,7 @@ msgstr "Өдөр"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,phase_ids:0
 msgid "Appraisal Phases"
-msgstr ""
+msgstr "Үнэлгээний үе шатууд"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -133,7 +133,7 @@ msgstr "Өмнөх Шатлалыг Хүлээх"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Appraisal"
-msgstr ""
+msgstr "Ажилчны үнэлгээ"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -199,6 +199,21 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"Огноо: %(date)s\n"
+"\n"
+"Эрхэм %(employee_name)s,\n"
+"\n"
+"%(eval_name)s -н үнэлгээг би хийж байна.\n"
+"\n"
+"Та хариу илгээнэ үү.\n"
+"\n"
+"\n"
+"Баярлалаа,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -208,7 +223,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Ноороглох"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -264,7 +279,7 @@ msgstr "Ажилтан"
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
@@ -287,7 +302,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in last month"
-msgstr ""
+msgstr "Сүүлийн сард хийгдсэн үнэлгээ"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
@@ -297,7 +312,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн огноо"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
@@ -318,7 +333,7 @@ msgstr "Нийтийн тэмдэглэл"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Reminder Email"
-msgstr ""
+msgstr "Сануулга майл явуулах"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr_evaluation.evaluation,rating:0
@@ -359,7 +374,7 @@ msgstr "7 сар"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr ""
+msgstr "Үнэлгээний төлөвлөгөө эргэн харах"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -379,7 +394,7 @@ msgstr "Үйлдлийн төлөвлөгөө"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr ""
+msgstr "Тогтмол хугацааны үнэлгээ"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -434,7 +449,7 @@ msgstr "12 сар"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current year"
-msgstr ""
+msgstr "Энэ жил хийгдсэн үнэлгээ"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,month:0
@@ -454,7 +469,7 @@ msgstr "Э-мэйлийн тохиргоо"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr ""
+msgstr "Шинжилгээний сануулга"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
@@ -501,7 +516,7 @@ msgstr "7 хоног"
 #: field:hr_evaluation.plan,name:0 field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Appraisal Plan"
-msgstr ""
+msgstr "Шинжилгээний төлөвлөгөө"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -568,7 +583,7 @@ msgstr "1 сар"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Appraisal Interviews"
-msgstr ""
+msgstr "Үнэлгээний ярилцлага"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2cf5a930b4d..b6f76777f54 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -46,17 +46,6 @@
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
             	<group>
-            		<filter icon="terp-go-year" string="Year"
-                        name="year"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <separator orientation="vertical"/>						
-                    <filter icon="terp-go-month" string=" Month " name="month" 
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " 
-                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Evaluation done in last month"/>
-                    <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
@@ -73,6 +62,7 @@
                     <field name="deadline"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
+                    <field name="create_date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -100,7 +90,6 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
 
     </data>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index cbf8b322b36..2a1d302e094 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -56,7 +56,6 @@ re-invoice your customer's expenses if your work by project.
         'security/ir_rule.xml',
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
-        'board_hr_expense_manager_view.xml',
         'hr_expense_installer_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
deleted file mode 100644
index 0f09c9a3290..00000000000
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="action_employee_expense" model="ir.actions.act_window">
-            <field name="name">All Employee Expenses</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','in',('confirm', 'accepted'))]</field>
-            <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
-        </record>
-
-        <record id="board_hr_manager_expense_form" model="ir.ui.view">
-            <field name="name">board.hr.manager.expense.form</field>
-            <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-      		<xpath expr="/form/board/column" position="inside">
-				 <action name="%(action_employee_expense)d" string="All Employee Expenses"/>
-			</xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e57f20734eb..703060e792e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -14,7 +14,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount" sum="Total"/>
@@ -29,6 +29,7 @@
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
@@ -96,7 +97,7 @@
                                     </group>
                                     <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
                                         <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
+                                        <field domain="[('type','in',['normal','contract'])]" name="analytic_account"/>
                                     </group>
                                     <group colspan="2" col="2">
                                         <separator string="References" colspan="2"/>
@@ -135,22 +136,17 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
-                        help="Confirmed Expense"/>
-                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
-                        help="Expenses to Invoice"/>
+                      <field name="name" string="Expenses"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
+                      <field name="date"/>
+                      <separator orientation="vertical"/>
+                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id"/>
-                      <field name="date"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                    </field>
-                      <field name="name"/>
-                      <field name="user_id"  string="User">
-                      </field>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
+                      <field name="user_id"  string="User"/>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index cc84d7ec35d..8397e72d7f2 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-06-20 15:22+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -841,7 +841,7 @@ msgstr "Utgifter"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Fel: Felaktig EAN kod"
+msgstr "Fel: felaktig EAN-kod"
 
 #. module: hr_expense
 #: view:hr.expense.report:0 field:hr.expense.report,year:0
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c007f2c2509..1299f4e9ce5 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,23 +53,10 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="Year" name="year"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                      help="Expenses during current year"/>
-                    <separator orientation="vertical"/>					  
-                  <filter icon="terp-go-month" string="Month"
-                      name="month"
-                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " 
-                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                  <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-                    help = "Confirm Expenses"/>
+                      help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
                       help = "Invoiced Expenses"/>
                     <separator orientation="vertical"/>
@@ -118,7 +105,6 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index e60f53d7d1e..09809e488ba 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -65,7 +65,6 @@ Note that:
         'wizard/hr_holidays_summary_department_view.xml',
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
-        'board_hr_manager_holidays_view.xml',
         ],
     'demo_xml': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml',
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 178602725ae..eb3b671af6b 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
             <field name="name">My Leaves</field>
             <field name="res_model">hr.holidays.status</field>
@@ -10,6 +11,7 @@
             <field name="context">{}</field>
             <field name="domain">[]</field>
         </record>
+
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
@@ -17,9 +19,10 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
-                 <action name="%(action_hr_holidays_leaves_by_month)d" string="Leaves"/>
+                    <action name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves"/>
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
deleted file mode 100644
index 1c7c6280f8b..00000000000
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
-            <field name="name">Leaves To Validate</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirm', 'validate', 'validate1'))]</field>
-            <field name="view_id" ref="hr_holidays.view_holiday_allocation_tree"/>
-        </record>
-
-        <record id="board_hr_holidays_manager_form" model="ir.ui.view">
-            <field name="name">board.hr.holidays.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                  <xpath expr="/form/board/column" position="inside">
-                    <action name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index ce11812b479..f5e8ba69e5d 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -76,12 +76,12 @@ class hr_holidays_status(osv.osv):
         '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.'),
         '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 tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        '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."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
         'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
-        'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
+        'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."),
     }
     _defaults = {
         'color_name': 'red',
@@ -280,6 +280,7 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
+                    'leave_id': record.id,
                 }
                 case_id = meeting_obj.create(cr, uid, vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
@@ -396,11 +397,11 @@ class hr_holidays(osv.osv):
         for obj in self.browse(cr, uid, ids):
             if obj.holiday_status_id.double_validation:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. A second validation is necessary and is now pending.")
+                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
             else:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. The validation process is now over.")
+                    _("The %s request has been <b>approved</b>. The validation process is now over.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
     
     def holidays_valid2_notificate(self, cr, uid, ids, context=None):
@@ -512,9 +513,14 @@ class hr_employee(osv.osv):
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
-        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
     }
 
 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_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index b312d79c03d..c5045d7b318 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -20,7 +20,7 @@
     <record model="hr.holidays.status" id="holiday_status_comp">
       <field name="name">Compensatory Days</field>
       <field name="limit">True</field>
-      <field name="color_name">brown</field>
+      <field name="color_name">lavender</field>
     </record>
 
     <!--Unpaid Leave -->
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 4c8ec39a1af..14d4cb99562 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -3,7 +3,7 @@
     <data>
 
         <report id="report_holidays_summary"
-                string="Summary Of Leaves"
+                string="Leaves Summary"
                 model="hr.holidays"
                 name="holidays.summary"
                 xsl="hr_holidays/report/holidays_summary.xsl"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8ab02b528c5..7db5a41b7e8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,22 +8,17 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
+                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
-                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Holidays during last month"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        </field>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        </field>
+                        <field name="employee_id"/>
+                        <field name="department_id" widget="selection"/>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -99,7 +94,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_sheet_width">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
@@ -143,7 +138,7 @@
                     </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_sheet_width">
+            <div class="oe_sheet_width">
                 <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
             </div>
             </form>
@@ -249,7 +244,6 @@
             </field>
         </record>
 
-        <!-- My leave dashboard -->
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
@@ -284,7 +278,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+        <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
             <field name="name">Requests Approve</field>
@@ -358,7 +352,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -424,7 +419,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -493,8 +489,6 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
-                    <field name="current_leave_id"/>
-                    <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
                 </field>
             </field>
         </record>
@@ -505,25 +499,29 @@
             <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
             <field name="arch" type="xml">
                 <xpath expr="//templates" position="before">
+                    <field name="current_leave_id"/>
                     <field name="current_leave_state"/>
-                    <field name="last_login"/>
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
-                        <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
-                                <field name="current_leave_id"/>
-                            </span>
-                        </span>
-                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
-                            <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
-                        </span>
-                    </li>
+                <xpath expr="//div[@class='oe_employee_details']/ul/li[@id='last_login']" position="inside">
+                    <span t-if="record.current_leave_id.raw_value" style="font-size: 100%%"
+                            t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
+                            t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
+                        <field name="current_leave_id"/>
+                    </span>
                 </xpath>
             </field>
         </record>
 
+        <act_window
+            id="act_hr_leave_request_to_meeting"
+            name="Leave Meetings"
+            src_model="hr.holidays"
+            res_model="crm.meeting"
+            domain="[('leave_id', '=', active_id)]"
+            view_mode="tree,form,calendar,gantt"
+            view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index bbf8d4b36bf..b15b1781542 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-12 20:01+0000\n"
-"Last-Translator: amani ali <applepie9911@yahoo.com>\n"
+"Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.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-02-13 04:50+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -39,7 +39,7 @@ msgstr "الحد الاقصى للترك المسموح - اتخذ بالفعل
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "ادارة الاجازات"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -127,6 +127,10 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"يمكن تسجيل طلبات الاجازه من قبل الموظفين والتصديق عليها من قبل مديريهم. "
+"بمجرد التحقق من صحة طلب الإجازة، تبدو تلقائيا في جدول الأعمال للموظف. يمكنك "
+"تحديد أنواع عدة بدل (الإجازات المدفوعة الأجر، والمرض، وما إلى ذلك) وإدارة "
+"البدلات لكل نوع."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -204,6 +208,8 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"اختر 'طلب اجازة \"اذا كان هناك من يريد أن يأخذ يوما للعطلة.\n"
+"اختر 'طلب تخصيص \"إذا كنت ترغب في زيادة عدد الاجازات المتاحة لشخص ما"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -221,7 +227,7 @@ msgstr "التحقّق"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "تحذير !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -315,7 +321,7 @@ msgstr "موظف"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "جديد"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -385,9 +391,9 @@ msgstr "اختر موظف أو فئة"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "اذا كانت القيمة صحيح فالتوزيع/الطلبات ستطلب مرة ثانية للتحقق"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -426,7 +432,7 @@ msgstr "ارجواني"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "شهر"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -526,15 +532,10 @@ msgstr "يجب ان يكون تاريخ البدء قبل تاريخ الانت
 msgid "Active"
 msgstr "نشط"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "أجازات للتحقق من صحة"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "خطأ ! لايمكنك انشاء تسلسل هرمي عودي  للعاملين"
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
@@ -549,7 +550,7 @@ msgstr "الموافقة الاولى"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "غير مدفوعة"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -757,11 +758,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"إذا بالتعليم، سيسمح النظام، لموظفين هذا القسم ان يأخذو اجازات اكثر من المتاح "
-"لهم."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -799,7 +798,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "نمط"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -821,7 +820,7 @@ msgstr "تاريخ البدء"
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "طلبات التوزيع"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -846,12 +845,12 @@ msgstr "للتأكيد"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "السّنة"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "للموافقة"
 
 #~ msgid "Holidays"
 #~ msgstr "الأعياد"
@@ -871,9 +870,96 @@ msgstr ""
 #~ msgid "Casual Leave"
 #~ msgstr "اجازة عرضية"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "أجازات للتحقق من صحة"
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "يتم مليء هذه المنطقة تلقائيًا من المستخدم الذي تم التحقق من صلاحية أجازته"
 
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "الموارد البشرية: إدارة الاجازات"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "إذا بالتعليم، سيسمح النظام، لموظفين هذا القسم ان يأخذو اجازات اكثر من المتاح "
+#~ "لهم."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "اذا كانت القيمة صحيح فالتوزيع/الطلبات ستطلب مرة ثانية للتحقق"
+
+#~ msgid ""
+#~ "Human Resources: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implements a dashboard for human resource management that includes.\n"
+#~ "        * My Leaves\n"
+#~ "        * My Expenses\n"
+#~ "    Note that:\n"
+#~ "    - A synchronisation with an internal agenda (use of the CRM module) is "
+#~ "possible: in order to automatically create a case when an holiday request is "
+#~ "accepted, you have to link the holidays status to a case section. You can "
+#~ "set up this info and your colour preferences in\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - An employee can make an ask for more off-days by making a new "
+#~ "Allocation It will increase his total of that leave type available (if the "
+#~ "request is accepted).\n"
+#~ "    - There are two ways to print the employee's holidays:\n"
+#~ "        * The first will allow to choose employees by department and is used "
+#~ "by clicking the menu item located in\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * The second will allow you to choose the holidays report for "
+#~ "specific employees. Go on the list\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            then select the ones you want to choose, click on the print icon "
+#~ "and select the option\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+#~ msgstr ""
+#~ "ألموارد البشرية: تعقب الاجازات و سير العمل\n"
+#~ "هذا النموذج يسمح لك لإدارة الأوراق وطلبات الإجازات \".\n"
+#~ "وتنفذ لوحة القيادة لإدارة الموارد البشرية التي تتضمن.\n"
+#~ "* بلادي أوراق\n"
+#~ "* بلادي النفقات\n"
+#~ "ملاحظة ما يلي:\n"
+#~ "- وتزامن مع جدول أعمال داخلي (استخدام وحدة إدارة علاقات العملاء) هو ممكن: من "
+#~ "أجل خلق حالة تلقائيا عندما يتم قبول طلب عطلة، لديك لربط حالة العطل إلى قسم "
+#~ "القضية. يمكنك إعداد هذه المعلومات والتفضيلات الخاصة بك في اللون\n"
+#~ "الموارد البشرية / تكوين / العطل الحالة\n"
+#~ "- يمكن للموظف تقديم طلب أيام خارج أكثر من خلال جعل توزيع جديد أنه سيزيد "
+#~ "مجموع له من هذا النوع إجازة المتاحة (في حال قبول الطلب).\n"
+#~ "- هناك طريقتان لطباعة العطل الموظف:\n"
+#~ "* وسيكون أول تسمح لاختيار الموظفين من خلال قسم ويستخدم من خلال النقر على "
+#~ "عنصر القائمة الموجود في\n"
+#~ "الموارد البشرية / العطل طلب / ملخص طباعة من العطل\n"
+#~ "* والثانية تسمح لك لاختيار تقرير العطل للموظفين محددة. يذهب على لائحة\n"
+#~ "الموارد البشرية / الموظفين / العاملين\n"
+#~ "ثم حدد تلك التي تريد أن تختار، انقر على أيقونة الطباعة وحدد الخيار\n"
+#~ "\"ملخص طباعة من العطل الموظف '\n"
+#~ "- المعالج تسمح لك لاختيار ما إذا كنت تريد طباعة إما العطلات مؤكد والمصادق "
+#~ "عليها أو فقط تلك التحقق من صحتها. يجب أن يتم تعيين هذه الدول حتى من قبل "
+#~ "مستخدم من \"الموارد البشرية\" للمجموعة. يمكنك تحديد هذه الخصائص في علامة "
+#~ "التبويب أمان من بيانات المستخدم في\n"
+#~ "إدارة / المستخدمين / المستخدمين\n"
+#~ "على سبيل المثال، كنت ستفعل ربما ل 'مشرف' للمستخدم\n"
+
+#~ msgid ""
+#~ "When the holiday request is created the state is 'Draft'.\n"
+#~ " It is confirmed by the user and request is sent to admin, the state is "
+#~ "'Waiting Approval'.            If the admin accepts it, the state is "
+#~ "'Approved'. If it is refused, the state is 'Refused'."
+#~ msgstr ""
+#~ "عند انشاء طلب الاجازة الحالة تصبح ‘سحب‘.\n"
+#~ "تم تأكيدها بواسطة المستخدم وتم ارسال الطلب للمدير, الحالة تصبح ‘قبول "
+#~ "الانتظار‘. اذا قبلها المدير, تصبح الحالة ‘مقبولة‘. اذا تم رفضها , الحالة "
+#~ "تصبح‘مرفوض‘."
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 3a39c04eeb7..e38cd03174c 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr "Вие трябва да изберете служител или кат
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr "Началната дата трябва да бъде преди кра
 msgid "Active"
 msgstr "Активен"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Отпуски за одобрение"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -857,3 +852,6 @@ msgstr "За одобрение"
 
 #~ msgid "Sick Leave"
 #~ msgstr "Отпуск по болест"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Отпуски за одобрение"
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index a608b9b299c..404c9e32ca4 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 4e0fd1ab423..160b49cc32a 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -396,11 +396,9 @@ msgstr "Heu de seleccionar un empleat o una categoria"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si és cert, les assignacions/peticions han de ser validades per un segon "
-"validador."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -541,11 +539,6 @@ msgstr "La data d'inici ha de ser anterior a la data de fi!"
 msgid "Active"
 msgstr "Actiu"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Absències per validar"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -775,11 +768,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marqueu aquesta casella, el sistema permetrà als empleats, per aquesta "
-"secció, agafar-se més absències de les disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -893,9 +884,26 @@ msgstr "Per aprovar"
 #~ "'Esperant aprovació'. Si el responsable l'autoritza, l'estat canvia a "
 #~ "'Aprovada', però si la rebutja el seu estat canvia a 'Rebutjada'."
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si és cert, les assignacions/peticions han de ser validades per un segon "
+#~ "validador."
+
 #~ msgid "Casual Leave"
 #~ msgstr "Absència ocasional"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Absències per validar"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marqueu aquesta casella, el sistema permetrà als empleats, per aquesta "
+#~ "secció, agafar-se més absències de les disponibles."
+
 #~ msgid "This Month"
 #~ msgstr "Aquest mes"
 
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 21c2cd37e53..0fd861b54af 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
@@ -396,11 +396,9 @@ msgstr "Musíte vybrat zaměstnance nebo kategorii"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
-"ověřovatelem"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -541,11 +539,6 @@ msgstr "Počáteční datum musí být před datem ukončení !"
 msgid "Active"
 msgstr "Aktivní"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Uvolnění k ověření"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -775,11 +768,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Pokud zaškrtnete toto políčko, systém vám pro tuto sekci umožní, aby "
-"zaměstnanci mohli vzít více uvolnění než mají dostupných."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -959,6 +950,16 @@ msgstr "Ke schválení"
 #~ "            na příklad, můžete chtít toto udělat pro uživatele 'admin'\n"
 #~ "            .\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
+#~ "ověřovatelem"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Uvolnění k ověření"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
@@ -968,6 +969,13 @@ msgstr "Ke schválení"
 #~ msgid "This Month"
 #~ msgstr "Tento měsíc"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Pokud zaškrtnete toto políčko, systém vám pro tuto sekci umožní, aby "
+#~ "zaměstnanci mohli vzít více uvolnění než mají dostupných."
+
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Lidské zdroje: Správa dovolených"
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index bd2a2888ebf..d118018970a 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index d52460ed66d..282c5d75638 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n"
-"X-Generator: Launchpad (build 14860)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -414,11 +414,9 @@ msgstr "Sie müssen einen Mitarbeiter oder eine Kategorie auswählen"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Durch Aktivierung muss Urlaubszuweisung / Urlaubsantrag durch einen weitern "
-"Vorgesetzten, z.B. Projektmanager oder Personalleiter genehmigt werden."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -559,11 +557,6 @@ msgstr "Das Startdatum muss vor dem Enddatum sein!"
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Zu genehmigende Urlaubsanträge"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -794,11 +787,9 @@ msgstr "Krankheitsstände"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Wenn Sie diese Option über die Checkbox auszuwählen, können  Ihre "
-"Mitarbeiter mehr Urlaub beantragen als Ihnen ursprünglich zugewiesen wurde."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -982,6 +973,13 @@ msgstr "Zu Genehmigen"
 #~ "Urlaubsmanagement/Reporting/Urlaubsmanagement/Urlaub nach Abteilungen\n"
 #~ "         durch Klick auf den Drucken Button.\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Durch Aktivierung muss Urlaubszuweisung / Urlaubsantrag durch einen weitern "
+#~ "Vorgesetzten, z.B. Projektmanager oder Personalleiter genehmigt werden."
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Erweiterter Filter..."
 
@@ -991,10 +989,20 @@ msgstr "Zu Genehmigen"
 #~ msgid "This Month"
 #~ msgstr "Dieser Monat"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Wenn Sie diese Option über die Checkbox auszuwählen, können  Ihre "
+#~ "Mitarbeiter mehr Urlaub beantragen als Ihnen ursprünglich zugewiesen wurde."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Dieser Bereich wird autom. mit dem Benutzer ausgefüllt, der dem Benutzer "
 #~ "seinen Urlaub genehmigen muss."
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Zu genehmigende Urlaubsanträge"
+
 #~ msgid "Sick Leave"
 #~ msgstr "Fehltage Krankheit"
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index b716691876a..543345a6dda 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -385,8 +385,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -524,11 +524,6 @@ msgstr ""
 msgid "Active"
 msgstr "Ενεργό"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -751,8 +746,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 3fde454cd86..60249de359c 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -396,11 +396,9 @@ msgstr "Debe seleccionar un empleado o una categoría"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
-"segundo validador"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -541,11 +539,6 @@ msgstr "¡La fecha de inicio debe ser anterior a la fecha de fin!"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Ausencias por validar"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -774,11 +767,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
-"sección, cogerse más ausencias de las disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -879,12 +870,26 @@ msgstr "Para aprobar"
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+#~ "segundo validador"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
 #~ msgid "Casual Leave"
 #~ msgstr "Ausencia ocasional"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+#~ "sección, cogerse más ausencias de las disponibles."
+
 #~ msgid "This Month"
 #~ msgstr "Este Mes"
 
@@ -893,6 +898,9 @@ msgstr "Para aprobar"
 #~ "Este espacio es rellenado automáticamente por el usuario que valida la "
 #~ "ausencia"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausencias por validar"
+
 #~ msgid ""
 #~ "When the holiday request is created the state is 'Draft'.\n"
 #~ " It is confirmed by the user and request is sent to admin, the state is "
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 8138180193b..db90b867ca7 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index 73c4c0fa26a..973ca29a37d 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-16 15:29+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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-02-17 05:00+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_holidays
@@ -417,11 +417,9 @@ msgstr "Debe seleccionar un empleado o una categoría"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
-"segundo validador"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -562,11 +560,6 @@ msgstr "¡La fecha de inicio debe ser anterior a la fecha de fin!"
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Ausencias por validar"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -795,11 +788,9 @@ msgstr "Permisos de"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
-"sección, cogerse más ausencias de las disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -896,6 +887,23 @@ msgstr "Año"
 msgid "To Approve"
 msgstr "Para aprobar"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+#~ "segundo validador"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausencias por validar"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+#~ "sección, cogerse más ausencias de las disponibles."
+
 #~ msgid "Sick Leave"
 #~ msgstr "Ausencia por enfermedad"
 
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index fe816de7d0a..18b17c8098b 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "Activo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index eadf044acf8..20e524fafcd 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiivne"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 7e040f0e382..a9b2f500afa 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiivinen"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -545,7 +540,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Palkaton"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 37091535fcc..3401dc4550e 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -50,7 +50,7 @@ msgstr "Grouper par..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Mode d'allocation"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -60,7 +60,7 @@ msgstr "Département"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Approuver la demande"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -75,7 +75,7 @@ msgstr "Catégorie d'employé"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Mois -1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -119,7 +119,7 @@ msgstr "Vert clair"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Type d'absence"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -149,7 +149,7 @@ msgstr "Approuvée"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Dernière connexion"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -175,6 +175,13 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"L'état est défini à «brouillon», quand une demande de congés est créé.\n"
+"L'état est «en attente» (d'approbation) lorsque la demande de congés est "
+"confirmée par l'utilisateur.\n"
+"L'état est «refusé», lorsque la demande de congés est refusée par le "
+"responsable.\n"
+"L'état est «approuvé», lorsque la demande de congés est validée par le "
+"responsable."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -192,7 +199,7 @@ msgstr "Congé"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Demandes de congés à valider"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
@@ -221,6 +228,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Nombre total de jours de congés alloués à cet employé, modifier cette valeur "
+"pour créer des demandes de congés."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -231,7 +240,7 @@ msgstr "Validation"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -247,6 +256,8 @@ msgstr "Rapport de synthèse des congés par employé"
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Cette partie est automatiquement remplie par l'utilisateur qui valide la "
+"demande"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -298,7 +309,7 @@ msgstr "Confirmer"
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Demande de congés pour %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -313,7 +324,7 @@ msgstr "Statut"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "Total des vacances par type"
+msgstr "Total des congés par type"
 
 #. module: hr_holidays
 #: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
@@ -325,7 +336,7 @@ msgstr "Employé"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -362,7 +373,7 @@ msgstr ""
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Allocation pour %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
@@ -382,6 +393,14 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"Le champ \"Jours de congés restants\" ne peut être utilisé que si il "
+"n'existe qu' un seul type de congés et que l'option 'Autoriser à outrepasser "
+"la limite' est décochée. (% s trouvé). Sinon, la mise à jour est ambigu, car "
+"le système ne peut pas décider quel type de congés doit être mis à jour.\n"
+"Dans ce cas, il est préférable d' utiliser les menus classiques des demandes "
+"de congés et les demandes d'allocation situés dans le menu des ressources "
+"humaines \\ Congés pour gérer les congés des employés si la configuration ne "
+"permet pas d'utiliser le champ précité."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -396,11 +415,9 @@ msgstr "Vous devez sélectionner un employé ou une catégorie"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si cette case est cochée, la demande / attribution de congés devra être "
-"validée par un deuxième valideur"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -439,7 +456,7 @@ msgstr "Lavande"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -487,7 +504,7 @@ msgstr "Corail clair"
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr "Vacances par département"
+msgstr "Congés par département"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -497,7 +514,7 @@ msgstr "Noir"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Allouer des congés pour les employés"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -541,20 +558,16 @@ msgstr "La date de début doit être antérieure à la date de fin !"
 msgid "Active"
 msgstr "Actif"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Congés à valider"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Jours de congés restants"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -564,7 +577,7 @@ msgstr "Première approbation"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Impayé"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -576,7 +589,7 @@ msgstr "Résumé des congés"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Congés du mois dernier"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -587,7 +600,7 @@ msgstr "Erreur"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Assigner des congés"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -597,12 +610,12 @@ msgstr "Bleu clair"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Les congés de mon département"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Statut du congés courant"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -631,7 +644,7 @@ msgstr "Général"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Jours de compensation"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
@@ -714,7 +727,7 @@ msgstr "Description"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Congés légaux"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -771,16 +784,14 @@ msgstr "Date de fin"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Arrêts maladie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si vous cochez cette case, le système autorisera, pour cette section, "
-"l'employé à prendre plus de congés qu'il n'en a de disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -802,6 +813,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Vous pouvez assigner des jours de congés restants pour chaque employé, "
+"OpenERP va automatiquement créer et valider des demandes d'allocation."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -821,7 +834,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -868,7 +881,7 @@ msgstr "À confirmer"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -884,6 +897,13 @@ msgstr "À approuver"
 #~ msgid "Draft"
 #~ msgstr "Brouillon"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si cette case est cochée, la demande / attribution de congés devra être "
+#~ "validée par un deuxième valideur"
+
 #~ msgid "Casual Leave"
 #~ msgstr "Congés légaux"
 
@@ -912,6 +932,13 @@ msgstr "À approuver"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Ressources humaines : gestion des vacances"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si vous cochez cette case, le système autorisera, pour cette section, "
+#~ "l'employé à prendre plus de congés qu'il n'en a de disponibles."
+
 #~ msgid ""
 #~ "Human Resources: Holidays tracking and workflow\n"
 #~ "\n"
@@ -965,3 +992,6 @@ msgstr "À approuver"
 #~ "congés (si la demande est acceptée).\n"
 #~ "    - Il y a 2 moyens d'imprimer les vacances de l'employé :\n"
 #~ ".\n"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Congés à valider"
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index bf9e1b5626f..9df36005551 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "સક્રિય"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index cbea6632e7c..3ea70cea7b9 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "सक्रिय"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 9279766a8c4..45bf9ad258c 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 76cbd507c0e..3763f5ac568 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -401,8 +401,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -540,11 +540,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -767,8 +762,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 059efd0ffab..9b978f36b4c 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr "A kezdő dátumnak előbb kell lennie mint a zárónak !"
 msgid "Active"
 msgstr "aktív"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 84d4eba11ae..60a3df91298 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -402,11 +402,9 @@ msgstr "Anda harus memilih karyawan atau kategori"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Jika Benar dari perusahaan perusahaan Alokasi / Permintaan harus divalidasi "
-"dari validator kedua"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -547,11 +545,6 @@ msgstr "Tanggal mulai haruslah sebelum Tanggal berakhir!"
 msgid "Active"
 msgstr "Aktif"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Cuti untuk Divalidasi"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -781,11 +774,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Jika Anda mencentang kotak centang  ini, sistem akan memungkinkan, atas "
-"bagian ini, karyawan untuk mengambil cuti lebih dari yang tersedia."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -903,15 +894,32 @@ msgstr "Untuk Disetujui"
 #~ msgid "Draft"
 #~ msgstr "Draft"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Jika Benar dari perusahaan perusahaan Alokasi / Permintaan harus divalidasi "
+#~ "dari validator kedua"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filter Tambahan"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Cuti untuk Divalidasi"
+
 #~ msgid "Casual Leave"
 #~ msgstr "Cuti Biasa"
 
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Sumber Daya Manusia: Manajemen Liburan"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Jika Anda mencentang kotak centang  ini, sistem akan memungkinkan, atas "
+#~ "bagian ini, karyawan untuk mengambil cuti lebih dari yang tersedia."
+
 #~ msgid "This Month"
 #~ msgstr "Bulan Ini"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 0e562724340..f0c951a054d 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -389,11 +389,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Se è impostato a vero allora le sue assegnazioni / richieste devono essere "
-"convalidate da un secondo convalidatore"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -532,11 +530,6 @@ msgstr ""
 msgid "Active"
 msgstr "Attivo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -766,11 +759,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Se spuntate questo riquadro, il sistema permetterà, per questa sezione, "
-"all'impiegato di prendere più permessi di quelli disponibili."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -964,3 +955,17 @@ msgstr "Da Approvare"
 #~ "                per esempio, vorrete farlo sicuramente per l'utente "
 #~ "\"admin\"\n"
 #~ "                .\n"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Se spuntate questo riquadro, il sistema permetterà, per questa sezione, "
+#~ "all'impiegato di prendere più permessi di quelli disponibili."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Se è impostato a vero allora le sue assegnazioni / richieste devono essere "
+#~ "convalidate da un secondo convalidatore"
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 2877f7d9bb9..18729539955 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/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-04-18 23:32+0000\n"
+"PO-Revision-Date: 2012-06-16 01:12+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-20 04:43+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -351,7 +351,7 @@ msgstr "小麦色"
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr "エラー：休暇開始日は休暇終了日の前でなければいけません。"
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
@@ -394,9 +394,9 @@ msgstr "従業員あるいはカテゴリーを選んで下さい。"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -533,11 +533,6 @@ msgstr "開始日は終了日の前でなければなりません。"
 msgid "Active"
 msgstr "有効"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "承認すべき休暇"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -760,9 +755,9 @@ msgstr "病欠"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
-msgstr "このボックスをチェックすると、従業員はこの部分について有効な休暇よりも多くの休暇を取ることができます。"
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -851,3 +846,16 @@ msgstr "年"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "承認する"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "承認すべき休暇"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr "このボックスをチェックすると、従業員はこの部分について有効な休暇よりも多くの休暇を取ることができます。"
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 43b56ea3347..7dee2f289a0 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr "활성"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index d8eec2cb350..0a34e11ba7c 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 43ffce1ea56..adf2d08d629 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 1fc6bd2b7da..a022b320f6b 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-04 04:48+0000\n"
-"X-Generator: Launchpad (build 15195)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -49,7 +49,7 @@ msgstr "Бүлэглэх..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Хуваарилах горим"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Хэлтэс"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "зөвшөөрөх хүсэлт"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Татгалзах"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Ажилчдын ангилал"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " сар-1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -143,7 +143,7 @@ msgstr "Зөвшөөрсөн"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Сүүлийн холболт"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -184,7 +184,7 @@ msgstr "Амралт, чөлөө"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Батлах шаардлагатай Чөлөөний хүсэлтүүд"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
@@ -223,7 +223,7 @@ msgstr "Хяналт"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Анхаар !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -382,16 +382,14 @@ msgstr "Амралтын Төрөл хайх"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Ажилчин эсвэл ангиллаас сонгох хэрэгтэй."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Энэ нь үнэн утгатай бол амралт, чөлөө хүсэх/ хуваарилахыг хүсэх хүсэлт нь 2 "
-"дах менежерээр батламжлагдсан байна"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -428,7 +426,7 @@ msgstr "Цайвар ягаан"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -496,7 +494,7 @@ msgstr "Амралт, чөлөө"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Уулзалт"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,18 +521,13 @@ msgstr "Хэрэглэгч"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Эхлэх өдөр нь дууах өдрөөс өмнө байх ёстой."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
 msgstr "Идэвхтэй"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -553,7 +546,7 @@ msgstr "Эхний зөвшөөрөл"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Төлөгдөөгүй"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -764,11 +757,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Энэ талбарыг сонговол ажилтан өөрт хуваарилагдсан боломжит амралт, чөлөөнөөс "
-"хязгаарыг хэтрүүлэн амралт, чөлөө авах боломжтой болно."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -934,6 +925,13 @@ msgstr "Зөвшөөрөх"
 #~ msgid "This Month"
 #~ msgstr "Энэ сар"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Энэ талбарыг сонговол ажилтан өөрт хуваарилагдсан боломжит амралт, чөлөөнөөс "
+#~ "хязгаарыг хэтрүүлэн амралт, чөлөө авах боломжтой болно."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Энэ талбарт амралт, чөлөөг батламжилсан менежерийн нэвтэрсэн хэрэглэгчийн "
@@ -942,5 +940,12 @@ msgstr "Зөвшөөрөх"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Хүний нөөц: Амралт, чөлөөний удирдлага"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Энэ нь үнэн утгатай бол амралт, чөлөө хүсэх/ хуваарилахыг хүсэх хүсэлт нь 2 "
+#~ "дах менежерээр батламжлагдсан байна"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Өргөтгөсөн хайлт..."
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index cad7786d59e..fef2be48c1e 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -69,7 +69,7 @@ msgstr "Geweigerd"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr "Medewerker categorie"
+msgstr "Werknemer categorie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -89,7 +89,7 @@ msgstr "Resterende dagen"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "Per medewerker"
+msgstr "Per werknemer"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -98,7 +98,7 @@ msgid ""
 "for every employee"
 msgstr ""
 "De verlof manager kan dit veld leeg laten als de aanvraag/reservering voor "
-"elke medewerker is"
+"elke werknemer is"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -130,9 +130,8 @@ msgid ""
 msgstr ""
 "Verlofaanvragen kunnen worden ingediend door medewerkers en goedgekeurd door "
 "hun managers. Als een verlofaanvraag is goedgekeurd, verschijnt het "
-"automatisch in de agenda van de medewerker. U kunt verschillende "
-"verlofvormen definiëren (betaald verlof, ziek, etc.) en verlof per vorm "
-"beheren."
+"automatisch in de agenda van de werknemer. U kunt verschillende verlofvormen "
+"definiëren (betaald verlof, ziek, etc.) en verlof per vorm beheren."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -161,7 +160,7 @@ msgstr "Weigeren"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
-"U kunt geen verlof goedkeuren voor medewerker %s: onvoldoende resterende "
+"U kunt geen verlof goedkeuren voor werknemer %s: onvoldoende resterende "
 "dagen (%s)."
 
 #. module: hr_holidays
@@ -249,7 +248,7 @@ msgstr "Kleur in overzicht"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "HR Vakantie samenvatting overzicht per medewerker"
+msgstr "HR Vakantie samenvatting overzicht per werknemer"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
@@ -330,7 +329,7 @@ msgstr "Totaal vakantiedagen per soort"
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
-msgstr "Medewerker"
+msgstr "Werknemer"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -409,16 +408,14 @@ msgstr "Verlofsoort zoeken"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr "U moet een medewerker of categorie selecteren"
+msgstr "U moet een werknemer of categorie selecteren"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Als dit aanstaat moeten aanvragen/reserveringen door een tweede beoordelaar "
-"worden goedgekeurd"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -428,7 +425,7 @@ msgstr "Wacht op goedkeuring"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr "Medewerkers"
+msgstr "Werknemer(s)"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -475,7 +472,7 @@ msgstr "Toestaan om de limiet te overschrijden"
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Medewerkers vakantie"
+msgstr "Werknemer vakantie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -494,7 +491,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr "Alle medewerkers verlof"
+msgstr "Alle werknemer verlof"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -559,11 +556,6 @@ msgstr "De begindatum moet liggen vóór de einddatum !"
 msgid "Active"
 msgstr "Actief"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Goed te keuren verlof"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -717,7 +709,7 @@ msgstr "Mijn verlof"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "Per medewerker categorie"
+msgstr "Per werknemer categorie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -745,9 +737,8 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
-"Per medewerker: Reservering/aanvraag voor individuele medewerker. Per "
-"medewerker categorie: Reservering/aanvraag voor groep medewerkers in "
-"categorie"
+"Per werknemer : Reservering/aanvraag voor individuele medewerker. Per "
+"werknemer categorie: Reservering/aanvraag voor groep werknemers in categorie"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
@@ -793,11 +784,9 @@ msgstr "Ziekteverlof"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Als u dit aanvinkt laat het systeem toe dat de medewerkers voor deze sectie "
-"meer verlof opnemen dan er beschikbaar is."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -985,6 +974,13 @@ msgstr "Goed te keuren"
 #~ " Als de manager goedkeurt gaat de status naar 'Goedgekeurd'.\n"
 #~ " Als de manager afkeurt gaat de status naar 'Geweigerd'"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Als dit aanstaat moeten aanvragen/reserveringen door een tweede beoordelaar "
+#~ "worden goedgekeurd"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Uitgebreide filters..."
 
@@ -998,3 +994,13 @@ msgstr "Goed te keuren"
 #~ msgstr ""
 #~ "Dit gebied wordt automatisch gevuld door de gebruiker die het verlof "
 #~ "goedkeurt"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Goed te keuren verlof"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Als u dit aanvinkt laat het systeem toe dat de werknemers voor deze sectie "
+#~ "meer verlof opnemen dan er beschikbaar is."
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 5caa07c3bc8..74ca2e0d23e 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 82a6c618483..442d88b94be 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -387,11 +387,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego "
-"zatiwerdzającego"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -528,11 +526,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktywny"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -755,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -873,3 +866,10 @@ msgstr ""
 #~ "'Oczekuje na aprobatę'.            Jeśli admin aprobuje, to stan zmienia się "
 #~ "na 'Zaaprobowano'. Jeśli zostanie odrzucony, to stan zmienia się na "
 #~ "'Odrzucony'."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego "
+#~ "zatiwerdzającego"
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 7928580f000..fb1ae02bcdf 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -24,22 +24,22 @@ msgstr "Azul"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Tipo de alocação"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr "Aguardando confirmação da aprovação"
+msgstr "A aguardar confirmação da aprovação"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Máximo de Ausências Permitidas - Ausências Já Tomadas"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Gestão de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -49,7 +49,7 @@ msgstr "Agrupar por..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Modo de Alocação"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Departamento"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Aprovar Pedidos"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Recusado"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Categoria do funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Mês - 1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -89,7 +89,7 @@ msgstr "Dias restantes"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "Por empregado"
+msgstr "Por funcionário"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -97,6 +97,8 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"Deixe este campo em branco se pretender que este pedido de licença se "
+"aplique a todos os funcionários"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -116,7 +118,7 @@ msgstr "Verde claro"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Tipo de Licença Atual"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -126,11 +128,15 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"Leave pedidos podem ser registados por funcionários e validado pelos "
+"gerentes. Uma vez que um pedido de licença é validado, ele aparece "
+"automaticamente na agenda do funcionário. Pode definir os tipos de abono "
+"diversos (férias pagas, doença, etc) e gerir abonos por tipo."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Listagem de Ausências"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
@@ -141,7 +147,7 @@ msgstr "Aprovado"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Última Conexão"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -154,6 +160,7 @@ msgstr "Recusar"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
+"Não pode validar ausências para o funcionário %s: poucos dias restantes(%s)."
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -165,6 +172,13 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"O estado é definido para 'Rascunho', quando um pedido de férias é criado.    "
+"        \n"
+"O estado é 'Aprovação em espera',quando o pedido de férias é confirmado pelo "
+"utilizador.          \n"
+"O estado é 'Recusado', quando o pedido de férias é recusado pelo gerente.    "
+"        \n"
+"O estado é 'Aprovado', quando o pedido de férias é aprovado pelo gerente."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -172,7 +186,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Leaves"
-msgstr "Baixas"
+msgstr "Ausências"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -182,12 +196,12 @@ msgstr "Baixa"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Pedidos de Ausência para Aprovar"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "Ausências por Departamento"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -201,6 +215,9 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Escolha 'Leave Request' se alguém quer tirar um dia de folga. \n"
+"Escolha 'Solicitação de Alocação' se quiser aumentar o número de folhas "
+"disponíveis para alguém"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -208,6 +225,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Número total de ausências legais alocadas a este funcionário, mude este "
+"valor para criar alocação / pedido de ausência."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -218,22 +237,23 @@ msgstr "Validação"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Aviso !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Cor no Relatório"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "Relatório de resumo de férias, por empregado"
+msgstr "Relatório de resumo de férias, por funcionário"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Esta área é automaticamente preenchida pelo utilizador que valida a licença"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -262,7 +282,7 @@ msgstr "Magenta"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "Deve selecionar pelo menos 1 Departamento. E volte a tentar"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -285,12 +305,12 @@ msgstr "Confirmar"
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Pedido de Ausência para %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Ausências Restantes"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,state:0
@@ -307,12 +327,12 @@ msgstr "Total de férias, por tipo"
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
-msgstr "Empregado"
+msgstr "Funcionário"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -327,7 +347,7 @@ msgstr "Vermelho"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Ausências por Tipo"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -342,13 +362,13 @@ msgstr "Trigo"
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Erro! A data de inicio deve ser inferior à data de fim."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Alocação para %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
@@ -368,22 +388,27 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"O recurso por trás do campo 'Ausências Remanescentes' só pode ser usado "
+"quando há apenas um tipo de licença com a opção' Permitir para substituir "
+"Limite' desmarcada. (%s encontrado). Caso contrário, a atualização é "
+"ambígua, pois não podemos decidir sobre que ausência digitar a atualização a "
+"ser feita."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Pesquisar tipo Leave"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Deve escolher um funcionário ou uma categoria"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -394,7 +419,7 @@ msgstr "Aguardando aprovação"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr "Empregado(s)"
+msgstr "Funcionário(s)"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -402,11 +427,13 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
+"Se definir um tipo reunião, o OpenERP criará uma reunião no calendário, "
+"quando uma ausência for validada."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr "Pedidos relacionados"
+msgstr "Pedidos Relacionados"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
@@ -421,25 +448,25 @@ msgstr "Lavanda"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Pedidos de Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Permitido ultrapassar o limite"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Férias do empregado"
+msgstr "Férias do funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -452,11 +479,13 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Este valor é dado pela soma de todos os pedidos de férias com um valor "
+"positivo."
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Ausências de Todos os Funcionários"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -477,7 +506,7 @@ msgstr "Preto"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Alocar Ausências para Funcionários"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -503,7 +532,7 @@ msgstr "Ambos validados e confirmados"
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Saídas tomadas"
+msgstr "Ausências Já Tomadas"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -514,49 +543,44 @@ msgstr "Utilizador"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "A data de começo deve ser anterior à data final !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr "Activo"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Férias por validar"
+msgstr "Ativo"
 
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro ! Não pode criar uma Hierarquia recursiva de Funcionários."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Ausências Legais Remanescentes"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "Primeira aprovação"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Por pagar"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "Listagem de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Férias durante o mês passado"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -567,7 +591,7 @@ msgstr "Erro"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Atribuir Ausências"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -577,12 +601,12 @@ msgstr "Azul claro"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Ausências do Departamento"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Estado da ausência atual"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -595,6 +619,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Se o campo ativo é definido como falso, ela permitirá que oculte o tipo de "
+"licença sem a remover."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -609,18 +635,18 @@ msgstr "Geral"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Dias Compensatórios"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Razões"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Análise de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
@@ -633,6 +659,8 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Esta côr será usada na listagem das ausências alocadas em Relatórios \\ "
+"Ausências por Departamento"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
@@ -643,18 +671,18 @@ msgstr "Validado"
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Pedido de Atribuição"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalhe Leave"
 
 #. module: hr_holidays
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Aplicar validação dupla"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
@@ -670,17 +698,17 @@ msgstr "Detalhes"
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "Minhas Ausências"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "Por categoria de empregado"
+msgstr "Por categoria de funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Pedido de Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -690,7 +718,7 @@ msgstr "Descrição"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Ausências Válidas"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -703,17 +731,20 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Por funcionário: Pedido para funcionário individual, Pela Categoria do "
+"Funcionário: Pedido para grupos de funcionários na categoria"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
 msgstr ""
+"Não é possível eliminar a ausência que não esteja no estado de rascunho !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Pesquisar Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -723,7 +754,7 @@ msgstr "Selecione o tipo de férias"
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Relembrar Ausências"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -743,13 +774,13 @@ msgstr "Data de fim"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Ausências por Doença"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -758,6 +789,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Este valor é dado pela soma de todos os pedidos de férias com um valor "
+"negativo."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -770,6 +803,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Pode atribuir as restantes ausências válidas de cada funcionário, o OpenERP "
+"automaticamente cria e valida as solicitações de alocação."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -782,16 +817,18 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Esta área é automaticamente preenchida pelo utilizador que validar a leave "
+"com segundo nível (If Leave type need second validation)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "RH Relatório Resumido de Férias Por Departamento"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -808,7 +845,7 @@ msgstr "Data de início"
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Pedidos de Alocação"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -833,7 +870,7 @@ msgstr "Para confirmar"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -857,3 +894,104 @@ msgstr "Para aprovar"
 
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros avançados..."
+
+#~ msgid ""
+#~ "When the holiday request is created the state is 'Draft'.\n"
+#~ " It is confirmed by the user and request is sent to admin, the state is "
+#~ "'Waiting Approval'.            If the admin accepts it, the state is "
+#~ "'Approved'. If it is refused, the state is 'Refused'."
+#~ msgstr ""
+#~ "Quando o pedido de férias é criado o estado é 'Rascunho'.\n"
+#~ "Confirma-se pelo usuário e pedido é enviado ao administrador, o Estado é "
+#~ "'Aprovação em espera'.            Se o administrador aceita, o estado é "
+#~ "'Aprovado'. Se for recusada, o estado é 'Recusado'."
+
+#~ msgid ""
+#~ "Human Resources: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implements a dashboard for human resource management that includes.\n"
+#~ "        * My Leaves\n"
+#~ "        * My Expenses\n"
+#~ "    Note that:\n"
+#~ "    - A synchronisation with an internal agenda (use of the CRM module) is "
+#~ "possible: in order to automatically create a case when an holiday request is "
+#~ "accepted, you have to link the holidays status to a case section. You can "
+#~ "set up this info and your colour preferences in\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - An employee can make an ask for more off-days by making a new "
+#~ "Allocation It will increase his total of that leave type available (if the "
+#~ "request is accepted).\n"
+#~ "    - There are two ways to print the employee's holidays:\n"
+#~ "        * The first will allow to choose employees by department and is used "
+#~ "by clicking the menu item located in\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * The second will allow you to choose the holidays report for "
+#~ "specific employees. Go on the list\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            then select the ones you want to choose, click on the print icon "
+#~ "and select the option\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+#~ msgstr ""
+#~ "?!?!?!?!?!?Recurso Humanos: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implementa um painel para gestão de recursos humanos, que inclui.\n"
+#~ "        * My Leaves\n"
+#~ "        * Despesas\n"
+#~ "    Note that:\n"
+#~ "    - A sincronização com uma agenda interna (use módulo CRM)é possível: a "
+#~ "fim de criar automaticamente um caso quando um pedido de férias é aceite, "
+#~ "tem que ligar o status férias a uma secção de caso. Pode configurar esta "
+#~ "informação e as suas preferências de cor em\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - Um funcionário pode fazer uma peça mais off-days, fazendo uma nova "
+#~ "alocação ela vai aumentar o total desse tipo ficando disponíveis (se o "
+#~ "pedido for aceite).\n"
+#~ "    - Existem duas maneira de print the employee's holidays:\n"
+#~ "        * A primeira irá permitir que escolha os funcionários por "
+#~ "departamento e usado ao clicar no item menu localizado no\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * O segundo irá permitir que escolha holidays report para "
+#~ "funcionários específicos. Vá para a lista\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            e escolha o que quer seleccionar, clique no print icon e "
+#~ "seleccione a opção\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+
+#~ msgid "Casual Leave"
+#~ msgstr "?!?!??!Casual Leave"
+
+#~ msgid "This area is automaticly filled by the user who validate the leave"
+#~ msgstr ""
+#~ "Esta área é automaticamente preenchido pelo utilizador que validar o leave"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausências por Validar"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Se o pedido for verdadeiro  tem que ser validado pelo segundo validador"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Se marcar esta opção, o sistema permitirá que, para esta seção, os "
+#~ "funcionários possam tirar mais ausências do que as disponíveis."
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 2d51a3c124f..e6501508fa6 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr "Você deve selecionar um funcionário ou uma categoria"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr "A data inicial deve ser antes da data final!"
 msgid "Active"
 msgstr "Ativo"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index e39530d949f..6c895ccbec4 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -24,17 +24,17 @@ msgstr "Albastru"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr "Tipul alocării"
+msgstr "Tipul alocarii"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr "Se așteaptă a doua aprobare"
+msgstr "Se asteapta a doua aprobare"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr "Maximum de concedii permise - Concedii deja luate"
+msgstr "Maximul de concedii permise - Concedii deja luate"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -44,12 +44,12 @@ msgstr "Managementul concediilor"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Mod Alocare"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Departament"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Aprobare cereri"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Respins"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr "Categoria angajatului"
+msgstr "Categorie Angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Luna-1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -84,12 +84,12 @@ msgstr "Maro"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr "Zile rămase"
+msgstr "Zile ramase"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "De către angajat"
+msgstr "De catre angajat"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -97,13 +97,13 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
-"Administratorul concediilor poate lăsa acest câmp necompletat dacă această "
+"Administratorul concediilor poate lasa acest camp necompletat daca aceasta "
 "cerere/alocare de concediu este pentru fiecare angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr "Setare ca ciornă"
+msgstr "Setati ca ciorna"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -118,7 +118,7 @@ msgstr "Verde deschis"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Tipul Concediului actual"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -128,26 +128,27 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
-"Cererile de concediu pot fi înregistrate de către angajați și validate de "
-"către șefii lor. Odată ce o cerere de concediu este validată, ea apare "
-"automat în agenda angajatului. Se pot defini multiple tipuri de permisiuni "
-"(concedii plătite, medicale etc.) si se pot administra după tip."
+"Cererile de concediu pot fi inregistrate de catre angajati si validate de "
+"catre sefii lor. Odata ce o cerere de concediu este validata, ea apare "
+"automat in agenda angajatului. Se pot defini mai multe tipuri de permisiuni "
+"(concedii platite, concedii medicale etc.) si se pot administra dupa tipul "
+"lor."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr "Rezumat concedii"
+msgstr "Rezumat Concedii"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr "Aprobat"
+msgstr "Aprobat(e)"
 
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Conexiune recenta"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -160,7 +161,7 @@ msgstr "Respingeti"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
-"Nu puteți valida concediul pentru angajatul %s: prea puține zile rămase (%s)."
+"Nu puteti valida concediul pentru angajatul %s: prea putine zile rămase (%s)."
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -172,6 +173,14 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"Starea este setata ca 'Ciorna', atunci cand este creata o cerede de "
+"concediu.            \n"
+"Starea este 'In asteptarea aprobarii', atunci cand cererea de concediu este "
+"confirmata de utilizator.             \n"
+"Starea este 'Respins', atunci cand cererea de concediu este respinsa de "
+"director.            \n"
+"Starea este 'Aprobat', atunci cand cererea de concediu este aprobata de "
+"director."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -189,17 +198,17 @@ msgstr "Concediu"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Cerere de concediu pentru Aprobare"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr "Concedii după departament"
+msgstr "Concedii dupa Departament"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -208,9 +217,9 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
-"Selectați 'Cerere de concediu' cănd cineva dorește o zi liberă. Selectați "
-"'Cerere de alocare' dacă doriți să mariți numarul de concedii disponibile "
-"pentru cineva"
+"Selectati 'Cerere de concediu' atunci cand cineva doreste sa isi ia o zi "
+"libera. Selectati 'Cerere de alocare' daca doriti sa mariti numarul de "
+"concedii disponibile pentru cineva"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -218,6 +227,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Numarul total de concedii legale alocate acestui angajat, schimbati aceasta "
+"valoare pentru a crea cereri de alocare/concediu."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -228,22 +239,24 @@ msgstr "Validare"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr "Culoare în raport"
+msgstr "Culoare in Raport"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "Resurse Umane Raport Rezumat Concedii pe angajat"
+msgstr "Resurse Umane Raport Rezumat Concedii dupa Angajat"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Aceasta parte este completata automat de utilizatorul care valideaza "
+"concediul"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -254,31 +267,32 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leave Type"
-msgstr "Tipul de concediu"
+msgstr "Tipul concediului"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #: code:addons/hr_holidays/hr_holidays.py:344
 #, python-format
 msgid "Warning!"
-msgstr "Avertisment!"
+msgstr "Avertizare!"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "Magenta (culoare)"
+msgstr "Magenta"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr "trebuie să selectați cel puțin un departament. Și încercați din nou."
+msgstr ""
+"Trebuie sa selectati cel putin un departament.Apoi incercati din nou."
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
-msgstr "Confirmat"
+msgstr "Confirmat(a)"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,date_from:0
@@ -289,18 +303,18 @@ msgstr "De la"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr "Confirmă"
+msgstr "Confirmati"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Cerere de concediu pentru %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr "Concedii rămase"
+msgstr "Concedii ramase"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,state:0
@@ -310,7 +324,7 @@ msgstr "Stare"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "Totalul concediilor după tip"
+msgstr "Total concedii dupa tip"
 
 #. module: hr_holidays
 #: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
@@ -322,7 +336,7 @@ msgstr "Angajat"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Nou(a)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -332,12 +346,12 @@ msgstr "Tip"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr "Roșu"
+msgstr "Rosu"
 
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr "Concedii după tip"
+msgstr "Concedii dupa Tip"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -347,26 +361,26 @@ msgstr "Somon deschis"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "Grâu"
+msgstr "Grau"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
-"Eroare! data de inceput a concediului trebuie să fie sub data de sfarsit a "
-"concediului."
+"Eroare! data de inceput a concediului trebuie sa fie mai mica decat data de "
+"sfarsit a concediului."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Alocare pentru %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
-msgstr "Număr de zile"
+msgstr "Numar de zile"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:377
@@ -380,30 +394,37 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"Caracteristica asociata campului 'Concedii Legale Ramase' poate fi utilizata "
+"numai atunci cand exista un singur tip de concediu cu optiunea 'Permite "
+"depasirea limitei' nebifata. (%s gasit). In caz contrar actualizarea este "
+"ambigua deoarece nu putem decide pentru care tip de concediu trebuie facuta "
+"actualizarea. \n"
+"Poate preferati sa folositi meniurile clasice 'Cereri de concediu' si "
+"'Cereri de alocare' localizate in 'Resurse Umane \\ Concedii' pentru a "
+"gestiona zilele de concediu ale angajatilor daca configurarea nu permite "
+"utilizarea acestui camp."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr "Caută Tipul concediului"
+msgstr "Cautati Tipul concediului"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr "Trebuie să selectati un angajat sau o categorie"
+msgstr "Trebuie sa selectati un angajat sau o categorie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Dacă este Adevărat, Alocarea/Cererea trebuie să fie validată de către un al "
-"doilea validator"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr "Așteaptă aprobare"
+msgstr "Asteapta aprobare"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -416,8 +437,8 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
-"Dacă setati un tip de intalnire, OpenERP va crea o intalnire in calendar de "
-"indată ce concediul este validat."
+"Daca setati un tip de intalnire, OpenERP va crea o intalnire in calendar de "
+"indata ce concediul este validat."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
@@ -427,17 +448,17 @@ msgstr "Cereri asociate"
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr "Părinte"
+msgstr "Parinte"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr "Lavandă"
+msgstr "Lavanda"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Luna"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -449,13 +470,13 @@ msgstr "Cereri de concediu"
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr "Permite depasirea limitei"
+msgstr "Permiteti depasirea limitei"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Concediile angajatului"
+msgstr "Concediile Angajatului"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -468,8 +489,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
-"Această valoare este dată de suma tuturor cererilor de concediu cu o valoare "
-"pozitivă."
+"Aceasta valoare este data de suma tuturor cererilor de concediu cu valoare "
+"pozitiva."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -495,7 +516,7 @@ msgstr "Negru"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Alocati Concedii pentru Angajati"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -505,7 +526,7 @@ msgstr "Concediu"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr "Întâlnire"
+msgstr "Intalnire"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -516,12 +537,12 @@ msgstr "Fildes"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr "Validat și confirmat"
+msgstr "Validat si confirmat"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Libere deja luate"
+msgstr "Concedii luate deja"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -532,49 +553,44 @@ msgstr "Utilizator"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr "Data de început trebuie să fie anterioară datei de sfârșit."
+msgstr "Data de inceput trebuie sa fie anterioara datei de sfarsit !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr "Activ(ă)"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Libere de validat"
+msgstr "Activ(a)"
 
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Concedii legale ramase"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr "Prima apobare"
+msgstr "Prima aprobare"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Neplatit"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr "Rezumat concediu"
+msgstr "Rezumat concedii"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Concedii in ultima luna"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -585,7 +601,7 @@ msgstr "Eroare"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Atribuiti Concedii"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -595,12 +611,12 @@ msgstr "Albastru deschis"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Concediile din Departamentul meu"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Statusul concediului actual"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -613,8 +629,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
-"Dacă campul activ este setat pe fals, vă va permite să ascundeti tipul "
-"concediului fără a-l sterge."
+"Daca campul activ este setat pe fals, va va permite sa ascundeti tipul "
+"concediului fara a-l sterge."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -629,7 +645,7 @@ msgstr "General"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Zile compensatorii"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
@@ -640,12 +656,12 @@ msgstr "Motive"
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr "Analiză concediu"
+msgstr "Analiza concediu"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -653,14 +669,14 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
-"Această culoare va fi folosită in rezumatul concediului localizat in "
-"Rapoarte\\Concedii după Departament"
+"Aceasta culoare va fi folosita in rezumatul concediului localizat in "
+"Rapoarte\\Concedii dupa Departament"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr "Validat"
+msgstr "Validat(a)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -676,12 +692,12 @@ msgstr "Detalii concediu"
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr "Aplică Validarea Dublă"
+msgstr "Aplicati Validarea Dubla"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr "Imprimă"
+msgstr "Tipariti"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -697,7 +713,7 @@ msgstr "Concediile mele"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "După categoria salariatului"
+msgstr "Dupa Categoria Angajatului"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -712,12 +728,12 @@ msgstr "Descriere"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Concedii Legale"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr "Numărul de zile trebuie să fie mai mare de 0 !"
+msgstr "Numarul de zile trebuie sa fie mai mare de 0 !"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -725,29 +741,29 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
-"După Angajat: Alocare/Cerere pentru un Angajat individual, După Categoria "
+"Dupa Angajat: Alocare/Cerere pentru un Angajat individual, Dupa Categoria "
 "Angajatului: Alocare/Cerere pentru un grup de angajati in categorie"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr "Nu puteti sterge un concediu care nu se află in stare de ciornă !"
+msgstr "Nu puteti sterge un concediu care nu se afla in starea ciorna !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr "Caută Concediu"
+msgstr "Cautati Concediul"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr "Selectează tipul concediului"
+msgstr "Selectati Tipul de concediu"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr "Concedii (zile libere) rămase"
+msgstr "Concedii ramase"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -762,21 +778,19 @@ msgstr "A doua aprobare"
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Concedii medicale"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Dacă bifati această căsută, sistemul va permite, pentru această sectiune, "
-"angajatilor să ia mai multe zile libere decat cele disponibile."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -784,8 +798,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
-"Acestă valoare este dată de suma tuturor cererilor de concediu cu o valoare "
-"negativă."
+"Acesta valoare este data de suma tuturor cererilor de concediu cu valoare "
+"negativa."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -798,6 +812,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Puteti atribui Concedii Legale ramase fiecarui angajat, OpenERP va crea si "
+"valida automat cererile de alocare."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -810,36 +826,36 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
-"Acest camp este completat automat de către utilizatorul care validează "
-"concediul cu al doilea nivel (Dacă tipul de concediu necesită o a doua "
+"Acest camp este completat automat de catre utilizatorul care valideaza "
+"concediul cu al doilea nivel (Daca Tipul de concediu necesita o a doua "
 "validare)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Mod"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr "Resurse Umane Raport Rezumat Concedii după Departament"
+msgstr "Resurse Umane Raport Rezumat Concedii dupa Departament"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr "Aprobă"
+msgstr "Aprobati"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr "Cereri alocare"
+msgstr "Cereri de alocare"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -854,7 +870,7 @@ msgstr "Roz deschis"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr "Manager"
+msgstr "Director"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -864,7 +880,7 @@ msgstr "De confirmat"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "An"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -976,3 +992,20 @@ msgstr "De aprobat"
 #~ msgstr ""
 #~ "Acest camp este completat automat de către utilizatorul care validează "
 #~ "concediul"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Daca este Adevarat, atunci Alocarea/Cererea trebuie sa fie validata de catre "
+#~ "un al doilea validator"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Concedii de validat"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Daca bifati aceasta casuta, sistemul va permite, pentru aceasta sectiune, "
+#~ "angajatilor sa isi ia mai multe zile libere decat cele disponibile."
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index b3c25a51d70..eedfac61f13 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -384,9 +384,9 @@ msgstr "Вы должны выбрать сотрудника или катег
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "Если это истина, то заявка должна быть утверждения второй проверкой"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -525,11 +525,6 @@ msgstr "День начала должен быть до дня завершен
 msgid "Active"
 msgstr "Активно"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Отгулы на утверждение"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -754,11 +749,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Если выбрать данную галочку, система позволит сотрудникам в данном разделе "
-"создавать больше отгулов, чем доступно."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -864,6 +857,21 @@ msgstr ""
 #~ "\"Ожидает утверждения\". Если админ принимает его, то статус изменится на "
 #~ "\"Утвержден\". Если он отклонен, статус будет \"Отклонен\"."
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "Если это истина, то заявка должна быть утверждения второй проверкой"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Отгулы на утверждение"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Если выбрать данную галочку, система позволит сотрудникам в данном разделе "
+#~ "создавать больше отгулов, чем доступно."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Эта область автоматически заполняется утверждающим отгул пользователем."
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 924ef46b250..1de03976383 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktivno"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index 5ca61227010..277e0e45f67 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 22e759daa9b..4c278b4be7f 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 2565db3fbd7..94d99fd1ec5 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 42648c1c6ed..aa946469160 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 89c9fadc993..3a2bd6cd35b 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr "คุณต้อง เลือกพนักงานหรือ
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr "วันเริ่มต้นต้องอยู่ก่อนว
 msgid "Active"
 msgstr "เปิดใช้งาน"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "ใบลาที่รอตรวจ"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -850,6 +845,9 @@ msgstr "ให้การอนุมัติ"
 #~ msgid "Draft"
 #~ msgstr "ฉบับร่าง"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "ใบลาที่รอตรวจ"
+
 #~ msgid "Casual Leave"
 #~ msgstr "ลาป่วย"
 
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index b982e89b7e6..c3fae04b051 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 29a0af3d080..b812ee9f397 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr "Aktif"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 4b692250f0c..b2649a72436 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 3e188ef4109..5174ec049b7 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -522,11 +522,6 @@ msgstr "Ngày bắt đầu phải trước ngày kết thúc !"
 msgid "Active"
 msgstr "Hoạt động"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -749,8 +744,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 0796bb02964..6784fa93d24 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:00+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,9 +392,9 @@ msgstr "您必须选择一个员工或分类"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "如果为真，分配 / 申请要二次审核才能生效。"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -531,11 +531,6 @@ msgstr "开始日期必须在结束日期前！"
 msgid "Active"
 msgstr "生效"
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "准假等待生效"
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -758,9 +753,9 @@ msgstr "病假"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
-msgstr "如果您勾选，系统将允许员工获得比可得到更多的准假。"
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -931,5 +926,18 @@ msgstr "待审批"
 #~ "向导可以让您选择打印确认并生效的假期或者看确认或只看生效的，但必须是人力资源组的用户，您可以在“管理/用户”的安全标签里更改用户的数据。\n"
 #~ "             例如你可能把用户定义为admin\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "如果为真，分配 / 申请要二次审核才能生效。"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "准假等待生效"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr "如果您勾选，系统将允许员工获得比可得到更多的准假。"
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr "这里自动填充谁生效这准假"
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 4d204f36768..b4a3ba93760 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -521,11 +521,6 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
@@ -748,8 +743,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index a65425dd0b3..4d83cd9cdc7 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -149,9 +149,9 @@
             </tr>
         </blockTable>
         <spacer length="1.0cm" />
-        <para style="title" t="1">Off-Days' Summary</para>
+        <para style="title" t="1">Leaves Summary <xsl:value-of select="report/name" /></para>
         <spacer length="0.5cm" />
-        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
+        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> leaves. </para>
         <spacer length="1.0cm" />
         <xsl:variable name="cols_legend">
             <xsl:text>0.7cm,5.0cm</xsl:text>
@@ -236,7 +236,7 @@
             <xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
             <tr>
                     <td>Color</td>
-                    <td>Holiday Type</td>
+                    <td>Leave Type</td>
 
             </tr>
             <xsl:for-each select="report/legend">
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index d756dfe6dfd..8a782075853 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -106,6 +106,10 @@ class report_custom(report_rml):
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
 
+        name = ''
+        if len(data['form'].get('emp', ())) == 1:
+            name = obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
+
         if data['form']['holiday_type']!='both':
             type=data['form']['holiday_type']
             if data['form']['holiday_type']=='Confirmed':
@@ -113,11 +117,12 @@ class report_custom(report_rml):
             else:
                 holiday_type=('validate')
         else:
-            type="Confirmed and Validated"
+            type="Confirmed and Approved"
             holiday_type=('confirm','validate')
         date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<type>%s</type>'%(type))
+        date_xml.append('<name>%s</name>'%(name))
 
 #        date_xml=[]
         for l in range(0,len(legend)):
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
index 29b6b8c36cd..854ad34d5ff 100644
--- a/addons/hr_holidays/test/hr_holidays_report.yml
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -5,7 +5,7 @@
     import time
     ctx={}
     ctx.update({'model': 'hr.department','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
-    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Validated'}
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Approved'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_dept',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
 
@@ -16,7 +16,7 @@
     import time
     ctx={}
     ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
-    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])],'holiday_type' : 'Validated'}
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])],'holiday_type' : 'Approved'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_employee',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
 
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index f21dca92393..53f981424d2 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -26,16 +26,16 @@ from tools.translate import _
 
 class hr_holidays_summary_dept(osv.osv_memory):
     _name = 'hr.holidays.summary.dept'
-    _description = 'HR Holidays Summary Report By Department'
+    _description = 'HR Leaves Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Leave Type', required=True)
+        'holiday_type': fields.selection([('Approved','Approved'),('Confirmed','Confirmed'),('both','Both Approved and Confirmed')], 'Leave Type', required=True)
     }
 
     _defaults = {
          'date_from': lambda *a: time.strftime('%Y-%m-01'),
-         'holiday_type': 'Validated'
+         'holiday_type': 'Approved'
     }
 
     def print_report(self, cr, uid, ids, context=None):
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 12cb3ceeb0d..72844a58ccb 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Holidays by Department" version="7.0">
+            <form string="Leaves by Department" version="7.0">
                 <header>
                     <button icon="gtk-print" name="print_report" string="Print" type="object"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
-            <field name="name">Holidays by Department</field>
+            <field name="name">Leaves by Department</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.dept</field>
             <field name="view_type">form</field>
@@ -30,11 +30,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
-        
         <menuitem
             name="Leaves by Department"
-            parent="menu_hr_leaves_reports"
+            parent="menu_hr_reporting_holidays"
             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.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index b6aeee96b00..2622ffa7493 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -24,16 +24,16 @@ from osv import osv, fields
 
 class hr_holidays_summary_employee(osv.osv_memory):
     _name = 'hr.holidays.summary.employee'
-    _description = 'HR Holidays Summary Report By Employee'
+    _description = 'HR Leaves Summary Report By Employee'
     _columns = {
         'date_from': fields.date('From', required=True),
         'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+        'holiday_type': fields.selection([('Approved','Approved'),('Confirmed','Confirmed'),('both','Both Approved and Confirmed')], 'Select Leave Type', required=True)
     }
 
     _defaults = {
          'date_from': lambda *a: time.strftime('%Y-%m-01'),
-         'holiday_type': 'Validated',
+         'holiday_type': 'Approved',
     }
 
     def print_report(self, cr, uid, ids, context=None):
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 d8a46ff4af4..1f330580c6e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -7,25 +7,25 @@
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Employee's Holidays">
-                <group col="4" colspan="6">
-                    <field name="date_from"/>
-                    <newline/>
-                    <field name="holiday_type"/>
-                    <newline/>
-                    <field name="emp" invisible="True"/>
-                </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
+                <form string="Leaves Summary">
+                    <group col="4" colspan="6">
+                        <field name="date_from"/>
+                        <newline/>
+                        <field name="holiday_type"/>
+                        <newline/>
+                        <field name="emp" invisible="True"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
                         <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                         <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                </group>
-            </form>
+                    </group>
+                </form>
             </field>
         </record>
 
         <record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
-            <field name="name">Employee's Holidays</field>
+            <field name="name">Leaves Summary</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.employee</field>
             <field name="view_type">form</field>
@@ -35,7 +35,7 @@
 
         <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="name">Employee's Holidays</field>
+            <field name="name">Leaves Summary</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
             <field name="key">action</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a8bb5ea83c8..03fd4762262 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
 
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_no_one" sequence="45"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager" sequence="45"/>
         <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"/>
 
@@ -93,8 +93,7 @@
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                     </group>
                     <newline/>
                 </search>
@@ -212,8 +211,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -266,9 +265,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <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_form_readonly_hidden" string="Period"/>
+                    <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"/>
@@ -383,13 +382,14 @@
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <group>
+                        <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
                         <field name="employee_id"/>
-                        <field name="name"/>
-                        <field name="date_from"/>
                         <field name="payslip_run_id"/>
                     </group>
                     <newline/>
@@ -464,8 +464,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" string="Salary Rule Categories" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                </search>
             </field>
         </record>
@@ -482,6 +481,7 @@
             action="action_hr_salary_rule_category"
             parent="payroll_configure"
             sequence="11"
+            groups="base.group_no_one"
         />
         <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
             <field name="name">Salary Rule Categories Hierarchy</field>
@@ -496,6 +496,7 @@
             parent="payroll_configure"
             sequence="12"
             icon="STOCK_INDENT"
+            groups="base.group_no_one"
         />
 
         <!--
@@ -518,7 +519,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
-                    <field name="name"/>
+                    <field name="name" string="Contribution Registers"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </search>
             </field>
@@ -588,9 +590,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Rules" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_id" class="oe_form_readonly_hidden"/>
+                    <label for="category_id" class="oe_edit_only"/>
                     <h2><field name="category_id"/></h2>
 
                     <group col="4">
@@ -648,8 +650,8 @@
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <group col="8">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
@@ -670,7 +672,7 @@
             <field name="search_view_id" ref="view_hr_rule_filter"/>
         </record>
 
-        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
 
         <act_window name="All Children Rules"
@@ -689,12 +691,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <field name="name" string="Payslip Batches"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index 23ae902148b..d1e33173f77 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -25,5 +25,5 @@ class human_resources_configuration(osv.osv_memory):
     _inherit = 'hr.config.settings'
     _columns = {
         'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
-            help ="""This installs the module hr_payroll_account."""),
+            help ="""Create Journal Entries from Payslips"""),
     }
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c2f760d8864..051c720667b 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,9 +7,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_holidays" position="after">
+                <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
+                <xpath expr="//field[@name='module_hr_payroll']/.." position="after">
                     <field name="module_hr_payroll_account"/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index acc48224afa..e06a43588c4 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -60,10 +60,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                	<newline/>
+                <filter name='done_filter' position="after">
+                    <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                </field>
+                </filter>
             </field>
         </record>
 
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index e9054416eea..468d3a8d66e 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -30,13 +30,14 @@
     <record id="board_hr_applicants_status_form" model="ir.ui.view">
         <field name="name">board.hr.applicants.status.form</field>
         <field name="model">board.board</field>
-        <field name="inherit_id" ref="hr.board_hr_manager_form"/>
+        <field name="inherit_id" ref="hr.board_hr_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-          <xpath expr="/form/board/column" position="inside">
-            <action name="%(action_applicants_status)d" string="Applicants Status"/>
-          </xpath>
+            <xpath expr="/form/board/column[1]" position="inside">
+                <action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
+            </xpath>
         </field>
     </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 73cec8fccf2..c893755c7c0 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -187,7 +187,7 @@ class hr_applicant(base_stage, osv.Model):
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'probability': fields.float('Probability'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Contact'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
@@ -221,7 +221,7 @@ class hr_applicant(base_stage, osv.Model):
         'department_id': fields.many2one('hr.department', 'Department'),
         'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response': fields.integer("Response"),
-        'reference': fields.char('Refered By', size=128),
+        'reference': fields.char('Referred By', size=128),
         'source_id': fields.many2one('hr.recruitment.source', 'Source'),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),
@@ -309,24 +309,19 @@ class hr_applicant(base_stage, osv.Model):
         value = {}
         for opp in self.browse(cr, uid, ids, context=context):
             # 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'], context=context)
-            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 = {
+            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_name': opp.name
-            }
+                'default_categ_id': category.id,
+                'default_name': opp.name,
+            })
             value = {
                 'name': ('Meetings'),
                 'domain': "[('user_id','=',%s)]" % (uid),
@@ -335,10 +330,10 @@ class hr_applicant(base_stage, osv.Model):
                 'view_mode': 'calendar,form,tree',
                 'res_model': 'crm.meeting',
                 'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'views': [(calendar_view.id, 'calendar'), (form_view.id, 'form'), (tree_view.id, 'tree')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-                'nodestroy': True
+                'search_view_id': search_view.id,
+                'nodestroy': True,
             }
         return value
 
@@ -557,6 +552,29 @@ class hr_job(osv.osv):
     _columns = {
         'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),
     }
+    
+    def action_print_survey(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        datas = {}
+        record = self.browse(cr, uid, ids, context=context)[0]
+        if record.survey_id:
+            datas['ids'] = [record.survey_id.id]
+        datas['model'] = 'survey.print'
+        context.update({'response_id': [0], 'response_no': 0,})
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'survey.form',
+                'datas': datas,
+                'context' : context,
+                'nodestroy':True,
+            }
 
 
+class crm_meeting(osv.osv):
+    _inherit = 'crm.meeting'
+    _columns = {
+        'applicant_id': fields.many2one('hr.applicant','Applicant'),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 8cbebda5f1f..13436bef45a 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,6 +5,13 @@
 -->
 <data>
 
+    <!-- Case category (for interview meetings) -->
+    <record model="crm.case.categ" 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        -->
 
     <record model="hr.recruitment.source" id="source_linkedin">
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 058eb3e2e6c..3a75b6df7c1 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,6 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
@@ -54,7 +53,7 @@
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
 	
-	    <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+	    <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 
 
     </data>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 75a74c88139..f31778b7874 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -7,6 +7,15 @@
             parent="hr.menu_hr_configuration"
             sequence="40" />
 
+        <act_window
+            domain="[('applicant_id', '=', active_id)]"
+            id="act_hr_applicant_to_meeting"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="hr.applicant"
+            view_mode="tree,form,calendar,graph"
+            view_type="form"/>
+
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -70,7 +79,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form" version="7.0">
+          <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
@@ -89,76 +98,81 @@
                 <field name="stage_id" widget="statusbar"/>
             </header>
             <sheet>
-                <group col="4">
-                    <field name="name" string="Subject"/>
-                    <group colspan="2" col="4">
-                        <field name="partner_name"/>
-                        <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                    </group>
-                    <field name="user_id"/>
-                    <field name="job_id" on_change="onchange_job(job_id)"/>
-                    <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                    <field name="state" groups="base.group_no_one"/>
-                    <field name="date_action"/>
-                    <group colspan="2" col="8">
+                <div class="oe_right oe_button_box">
+                    <button name="action_makeMeeting" type="object"
+                        string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
+                    <button name="%(survey.action_view_survey_question_message)d" type="action"
+                        string="Start Interview" icon="gtk-execute" help="Answer related job question"
+                        context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                    <button name="action_print_survey" type="object"
+                        string="Print Interview" icon="gtk-print" help="Print interview report"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                </div>
+                <div class="oe_title">
+                    <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"/>
+                </div>
+
+                <group>
+                    <group>
+                        <field name="user_id"/>
                         <field name="title_action"/>
-                        <field name="survey" invisible="1"/>
-                        <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <field name="response" invisible="1"/>
+                        <field name="date_action"/>
+                    </group>
+                    <group>
+                        <field name="job_id" on_change="onchange_job(job_id)"/>
+                        <field name="priority" string="Appreciation"/>
+                        <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"/>
                     </group>
-                    <newline/>
                 </group>
-                <notebook colspan="4">
-                    <page string="Job Info">
+                <notebook>
+                    <page string="Application">
                         <group>
                             <group string="Contact">
                                 <label for="partner_id"/>
                                 <div>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button string="Create Partner"
-                                        name="%(action_hr_recruitment_partner_create)d"
-                                        icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
+                                    <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"/>
+                                <field name="email_from" widget="email"/>
                                 <field name="partner_phone"/>
                                 <field name="partner_mobile"/>
                             </group>
-                            <group string="Contract Data">
-                                <field name="availability"/>
-                                <field name="salary_expected"/>
-                                <field name="salary_expected_extra" nolabel="1"/>
-                                <field name="salary_proposed"/>
-                                <field name="salary_proposed_extra" nolabel="1"/>
-                            </group>
-                            <group string="Qualification">
-                                <field name="type_id"/>
-                                <field name="priority" string="Appreciation"/>
+                            <group string="Reference">
                                 <field name="source_id"/>
                                 <field name="reference"/>
                             </group>
-                            <group string="Dates">
-                               <field name="create_date"/>
-                               <field name="write_date"/>
-                               <field name="date_closed"/>
-                               <field name="date_open"/>
+                            <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>
-                 <page string="Notes">
-                     <field name="description"/>
-                 </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_bottom">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+            <footer>
+                <field name="message_ids" widget="ThreadView"/>
+            </footer>
+          </form>
         </field>
     </record>
 
-
     <record model="ir.ui.view" id="crm_case_graph_view_job">
         <field name="name">Jobs - Recruitment Graph</field>
         <field name="model">hr.applicant</field>
@@ -178,29 +192,25 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-document-new" string="New" name="filter_new" 
+               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-document-new" string="New" 
                    domain="[('state','=','draft')]"
-                   help="All Initial Jobs"
-               />
-               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
+                   help="All Initial Jobs"/>
+               <filter icon="terp-camera_test" string="In Progress" 
                    domain="[('state','=','open')]"
-                   help="Open Jobs"
-               />
+                   help="Open Jobs"/>
                <filter icon="terp-gtk-media-pause" string="Pending"
                    domain="[('state','=','pending')]"
-                   help="Pending Jobs"
-               />
-               <separator orientation="vertical"/>
+                   help="Pending Jobs"/>
+               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]"
                     help="Filter and view on next actions and date"/>
                <separator orientation="vertical"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
-               </field>
+               <field name="user_id"/>
                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
@@ -233,7 +243,7 @@
                 date_start="date_action" color="user_id">
                 <field name="name" />
                 <field name="partner_name" />
-                <field name="stage_id" />
+                <field name="title_action"/>
             </calendar>
         </field>
     </record>
@@ -252,93 +262,72 @@
                 <field name="survey"/>
                 <field name="user_id"/>
                 <field name="user_email"/>
-                <templates>
-                    <t t-name="partner-infos">
-                        <div t-if="record.partner_phone.raw_value">
-                            Phone: <field name="partner_phone"/>
-                        </div>
-                        <div t-if="record.partner_mobile.raw_value">
-                            Mobile: <field name="partner_mobile"/>
-                        </div>
-                    </t>
-                    <t t-name="kanban-box">
-                        <t t-if="record.priority.raw_value == 1" t-set="border">oe_kanban_color_red</t>
-                        <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                            <div class="oe_kanban_box oe_kanban_color_border">
-                                <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                <tr>
-                                    <td align="left" valign="middle" class="oe_kanban_title" tooltip="partner-infos">
+                <field name="partner_name"/>
+                <field name="type_id"/>
+                <field name="job_id"/>
+                 <field name="title_action"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-if="record.priority.raw_value == '1'" t-set="border">oe_kanban_color_green</t>
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
+                                <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"><field name="name"/>
+                                    </h3> 
+                                    <div style="margin-bottom:2;padding-top:5px;white-space: nowrap;" >                               
                                         <field name="partner_name"/>
-                                        <t t-if="!record.partner_name.raw_value">
-                                            <field name="email_from"/>
-                                        </t>
-                                    </td>
-                                    <td valign="top" width="22"><img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/></td>
-                                </tr>
-                                </table>
-                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
-                                    <div class="oe_kanban_right">
-                                        <span class="oe_kanban_highlight">
+                                        <div class="oe_kanban_right">
+                                          <span class="oe_kanban_highlight">
                                             <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                             <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
-                                                <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['2']">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['1']">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
-                                        </span>
+                                         </span>
+                                     </div>
+                                  </div>
+                                  <div style="white-space: nowrap;" >
+                                        <div t-if="record.type_id.raw_value">
+                                          (<field name="type_id"/>)
+                                        </div>
+                                  </div>
+                                   <div style="padding-top:5px;white-space: nowrap;" >
+                                      <t t-if="record.job_id.raw_value">Applied for <field name="job_id" /></t> 
+                                   </div>
+                                   <div style="padding-top:5px;white-space: nowrap;" >
+                                      <t t-if="record.title_action.raw_value">
+                                          <field name="title_action" /> on 
+                                           <field name="date_action" />
+                                       </t>
                                     </div>
-
-                                    <field name="job_id"/>
-                                    <t t-if="!record.job_id.raw_value">
-                                        <field name="name"/>
-                                    </t>
-
-                                    <div class="oe_kanban_clear" style="padding-top: 4px"/>
-
-                                    <div t-if="record.type_id.raw_value or record.source_id.raw_value">
-                                        <span t-if="record.type_id.raw_value" class="oe_kanban_highlight oe_kanban_button" style="font-size: 100%%">
-                                            <field name="type_id"/>
-                                        </span>
-                                        <span t-if="record.source_id.raw_value" class="oe_kanban_highlight oe_kanban_button" style="font-size: 100%%">
-                                            <field name="source_id"/>
-                                        </span>
+                                    <div align="left" width="22" style="padding-top:5px;white-space: nowrap;" >
+                                      <div align="right">
+                                           <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                      </div>
                                     </div>
-                                    <div t-if="record.date_action.raw_value or record.title_action.raw_value">
-                                        <i t-if="record.date_action.raw_value"><field name="date_action"/> :</i> <field name="title_action"/>
-                                    </div>
-                                </div>
-                                <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                    <div class="oe_kanban_left">
-                                        <a string="Edit" icon="gtk-edit" type="edit"/>
-                                        <a string="Delete" icon="gtk-close" type="delete"/>
-                                        <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
-                                        <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/>
-                                        <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
-                                    </div>
-                                    <div class="oe_kanban_right">
-                                        <a name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                                        <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
-                                        <a name="case_pending" string="Pending" states="open" type="object" icon="kanban-pause"/>
-                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                                    </div>
-                                    <br class="oe_kanban_clear"/>
                                 </div>
                             </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
     # ------------------------------------------------------
     # HR Job
     # ------------------------------------------------------
@@ -349,8 +338,15 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="department_id" position="after">
-                <field name="survey_id"/>
+            <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>
         </field>
     </record>
@@ -379,7 +375,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
-                <group col="4" string="Stage Definition">
+                <group string="Stage Definition">
                     <field name="name"/>
                     <field name="department_id"/>
                     <field name="sequence"/>
@@ -406,7 +402,7 @@
         name="Stages"
         parent="menu_hr_recruitment_recruitment"
         action="hr_recruitment_stage_act"
-        sequence="1"/>
+        sequence="1" groups="base.group_no_one"/>
 
 <!-- Degree Tree View -->
 
@@ -471,10 +467,8 @@
         <field name="model">hr.recruitment.source</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Sources of Applicants" version="7.0">
-                <group>
-                    <field name="name"/>
-                </group>
+            <form string="Sources of Applicants">
+                <field name="name"/>
             </form>
         </field>
     </record>
@@ -490,6 +484,23 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
+    <record model="ir.ui.view" id="crm_meeting_form_view">
+        <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="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>
 
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 7d141991480..7521fab460e 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -54,14 +54,9 @@ msgstr ""
 msgid "Sources of Applicants"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,delay_open:0
-msgid "Avg. Delay to Open"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
-msgid "# of Cases"
+msgid "# of Applications"
 msgstr ""
 
 #. module: hr_recruitment
@@ -150,7 +145,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0 view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
-msgid "Create Partner"
+msgid "Create Contact"
 msgstr ""
 
 #. module: hr_recruitment
@@ -160,7 +155,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
-msgid "Refered By"
+msgid "Referred By"
 msgstr ""
 
 #. module: hr_recruitment
@@ -239,6 +234,11 @@ msgstr ""
 msgid "Interview Form"
 msgstr ""
 
+#. module: hr_recruitment
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.job,survey_id:0
 msgid ""
@@ -349,7 +349,7 @@ msgstr ""
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
-msgid "A partner is already defined on this job request."
+msgid "A contact is already defined on this job request."
 msgstr ""
 
 #. module: hr_recruitment
@@ -516,6 +516,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
+#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 msgid "Contact"
 msgstr ""
 
@@ -530,7 +531,6 @@ msgid "Qualification"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 #: field:hr.recruitment.report,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -828,7 +828,12 @@ msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
-msgid "Avg Salary Proposed"
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
 msgstr ""
 
 #. module: hr_recruitment
@@ -871,7 +876,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
-msgid "Are you sure you want to create a partner based on this job request ?"
+msgid "Are you sure you want to create a contact based on this job request ?"
 msgstr ""
 
 #. module: hr_recruitment
@@ -959,7 +964,7 @@ msgstr ""
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
 #, python-format
-msgid "A partner is already existing with the same name."
+msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 5c74bac4a5a..e888da9ead7 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -40,8 +40,8 @@ class hr_recruitment_report(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        'nbr': fields.integer('# of Applications', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -59,12 +59,11 @@ class hr_recruitment_report(osv.osv):
         'department_id': fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
-        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+        'salary_prop_avg' : fields.float("Avg. Proposed Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),
         'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
+        'salary_exp_avg' : fields.float("Avg. Expected Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),        
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'available': fields.float("Availability"),
-        'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
-                                       help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
     }
@@ -93,7 +92,7 @@ class hr_recruitment_report(osv.osv):
                      sum(salary_proposed) as salary_prop,
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
-                     extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
+                     (sum(salary_expected)/count(*)) as salary_exp_avg,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
                      count(*) as nbr
                  from hr_applicant s
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 6fee524157a..5ddbe5045ab 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -9,23 +9,24 @@
             <tree string="Recruitment Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
-                <field name="job_id" invisible="1"/>
+                <field name="job_id"/>
                 <field name="stage_id" invisible="1" />
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="nbr" sum="# Cases"/>
+                <field name="nbr" sum="# of Applications"/>
                 <field name="available" sum="Available"/>
                 <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_exp_avg" sum="Avg Expected Salary" />
                 <field name="salary_prop" sum="Proposed Salary" />
                 <field name="salary_prop_avg" sum="Avg Proposed Salary" />
-                <field name="delay_open" avg='Avg Delay to Open'/>
                 <field name="delay_close" avg='Avg Delay to Close'/>
+                <field name="priority"/>
             </tree>
         </field>
     </record>
@@ -49,19 +50,6 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Recruitment performed in current year"/>
-                    <separator orientation="vertical"/>	
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment performed in current month"/>
-                    <filter icon="terp-go-month"
-                        string="    Month-1    "
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment during last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="New"
                         icon="terp-document-new"
                         domain="[('state','=','draft')]"
@@ -70,23 +58,22 @@
                         icon="terp-camera_test"
                         domain="[('state', '=' ,'open')]"
                         help = "In progress recruitment"/>
-                       <filter string="Pending"
-                           icon="terp-gtk-media-pause"
-                           domain="[('state','=','pending')]"
-                           help = "Pending recruitment"/>
+                    <filter string="Pending"
+                        icon="terp-gtk-media-pause"
+                        domain="[('state','=','pending')]"
+                        help = "Pending recruitment"/>
                     <filter string="Hired"
-                           icon="terp-camera_test"
-                           domain="[('state','=','done')]"
-                           help = "Hired employees"/>
-                      <separator orientation="vertical"/>
-                      <field name="job_id"/>
+                        icon="terp-camera_test"
+                        domain="[('state','=','done')]"
+                        help = "Hired employees"/>
+                    <filter icon="terp-personal"
+                        string="My Recruitment"
+                        help="My Recruitment"
+                        domain="[('user_id','=',uid)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible">
-                        <filter icon="terp-personal"
-                            string="My Recruitment"
-                            help="My Recruitment"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id" string="Responsible"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -115,9 +102,7 @@
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
-
-
-                </search>
+            </search>
         </field>
     </record>
 
@@ -129,7 +114,6 @@
         <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 id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
     <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 6fe0a7b88dd..4818d280879 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -28,9 +28,9 @@ class hr_applicant_settings(osv.osv_memory):
     _columns = {
         'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
-                This installs the module document_ftp."""),
-        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
-            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',                                            
+                This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
+        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails',
+            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
             help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
                 and create automatically application documents in the system."""),
     }
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 659aa586d56..011e3816c2c 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,12 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="config_recruitment" position="after">
-                    <separator  string="Recruitment" colspan="4"/>
-                    <field name="module_document_ftp"/>
-                    <newline/>
-                    <field name="fetchmail_applicants"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
+                <group name="config_recruitment" position="replace">
+                    <group name="config_recruitment" string="Recruitment">
+                        <field name="module_document_ftp"/>
+                        <label for="fetchmail_applicants"/>
+                        <div>
+                            <field name="fetchmail_applicants"/>
+                            <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                                attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index 5e868e6f49a..ef44a4e253d 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -36,7 +36,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
         for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
             if case.partner_id:
                 raise osv.except_osv(_('Error !'),
-                    _('A partner is already defined on this job request.'))
+                    _('A contact is already defined on this job request.'))
         pass
 
     def make_order(self, cr, uid, ids, context=None):
@@ -53,7 +53,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
         for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
             partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)], context=context)
             if partner_id:
-                raise osv.except_osv(_('Error !'),_('A partner is already existing with the same name.'))
+                raise osv.except_osv(_('Error !'),_('A contact is already existing with the same name.'))
             partner_id = partner_obj.create(cr, uid, {
                 'name': case.partner_name or case.name,
                 'user_id': case.user_id.id,
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 1a779fba1f9..15bede42e96 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
@@ -9,19 +9,19 @@
             <field name="arch" type="xml">
 			<form string="Convert To Partner">
 			    <group col="4" colspan="6">
-			            <label string="Are you sure you want to create a partner based on this job request ?"/>
+			            <label string="Are you sure you want to create a contact based on this job request ?"/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="make_order" string="Create Partner" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
+					<button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
 				</group>
 			</form>
             </field>
         </record>
 
         <record id="action_hr_recruitment_partner_create" model="ir.actions.act_window">
-            <field name="name">Create Partner</field>
+            <field name="name">Create Contact</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.recruitment.partner.create</field>
             <field name="view_type">form</field>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 12fbbcdedef..66911f25ff5 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -190,4 +190,15 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
+class account_analytic_account(osv.osv):
+
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    
+    _columns = {
+        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
+    }
+
+account_analytic_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index 3ec7664bcb7..077aaf6179c 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -12,6 +12,18 @@
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
+        <record id="account.analytic_administratif" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+         <record id="account.analytic_partners" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="account.analytic_consultancy" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="account.analytic_super_product_trainings" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
 
         <record id="working_hours_requirements" model="hr.analytic.timesheet">
             <field name="name">Requirements analysis and specification</field>
@@ -20,7 +32,7 @@
             <field eval="2.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -33,7 +45,7 @@
             <field eval="1.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -46,7 +58,7 @@
             <field eval="03.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -59,7 +71,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -72,7 +84,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 3dc825e4519..a8a361ed633 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -12,7 +12,7 @@
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
                     <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')]" invisible="1"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
@@ -60,11 +60,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="account_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -79,6 +78,21 @@
             </field>
 
         </record>
+        
+        <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_timesheets"/>
+                </xpath>
+            </field>
+        </record>
 
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Timesheet Lines</field>
@@ -107,7 +121,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_hr_timesheet_reports" parent="base.menu_hr_reports" sequence="5" name="Timesheet"/>
+        <menuitem id="menu_hr_timesheet_reports" parent="hr.menu_hr_reporting" sequence="5" name="Timesheet"/>
 
 
     </data>
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index df51e03b685..16ef5249809 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -467,8 +467,8 @@ msgstr "معلومات عامة"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "سجل الدوام الخاص بي"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -667,6 +667,9 @@ msgstr "تغيير العمل"
 #~ msgid "To be invoiced"
 #~ msgstr "لتتضمن في الفاتورة"
 
+#~ msgid "My Timesheet"
+#~ msgstr "سجل الدوام الخاص بي"
+
 #~ msgid "Anlytic account"
 #~ msgstr "حساب تحليلي"
 
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 6abda281c74..17442b1f33f 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Обща информация"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Моят график"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -663,5 +663,8 @@ msgstr ""
 #~ msgid "Analytic line"
 #~ msgstr "Аналитичен ред"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моят график"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Услуги по график"
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 8bce7bd7023..7862ee3dc1a 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index df7c258b044..609409c2811 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -472,8 +472,8 @@ msgstr "Informació general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "El meu part d'hores"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -809,3 +809,6 @@ msgstr "Canvia treball"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Registrar entrada/sortida per projecte"
+
+#~ msgid "My Timesheet"
+#~ msgstr "El meu part d'hores"
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index d25a516a8a2..59b1a7df048 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
@@ -473,8 +473,8 @@ msgstr "Obecné informace"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Moje časové rozvrhy"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -722,6 +722,9 @@ msgstr "Změnit práci"
 #~ msgid "To be invoiced"
 #~ msgstr "K fakturaci"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Moje časové rozvrhy"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Souhrn analýzy"
 
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index c876b4e34e0..0025f7e00f1 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index d3fb821ad79..5c81c3a3ebc 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -479,8 +479,8 @@ msgstr "Grundinformation"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Meine Zeiterfassung"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -768,6 +768,9 @@ msgstr "Ändere Projekt /Aufgabe"
 #~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Beschaffungs Mengeneinheit "
 #~ "(ME) muss in derselben Kategorie sein."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Meine Zeiterfassung"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Analytisches Konto"
 
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index 2dea4974f57..517e19a988b 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -462,7 +462,7 @@ msgstr "Γενικές Πληροφορίες"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 326641598d9..d600cc7d4a6 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -471,8 +471,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mi parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -798,6 +798,9 @@ msgstr "Cambiar trabajo"
 #~ "establecer una gestión por asunto.\n"
 #~ "    "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Servicio en parte de horas"
 
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 82c9a9461fa..222bdc625fa 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Información General"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/es_CR.po b/addons/hr_timesheet/i18n/es_CR.po
index 038ad5ff3f5..7c0d17f2799 100644
--- a/addons/hr_timesheet/i18n/es_CR.po
+++ b/addons/hr_timesheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -478,8 +478,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mi parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -660,3 +660,6 @@ msgstr "Cambiar trabajo"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Registrar entrada/salir por proyecto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
index 66bab56efff..7f0ae452f89 100644
--- a/addons/hr_timesheet/i18n/es_EC.po
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -476,8 +476,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "My horario"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -658,3 +658,6 @@ msgstr "Cambiar trabajo"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Acceder/salir del proyecto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "My horario"
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index dd0ba997865..ef049db4ce9 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Üldine info"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 5205b4bab0f..414638eae7b 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Yleiset Tiedot"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Minun tuntikortti"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -732,6 +732,9 @@ msgstr "Vaihda työtä"
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "Virhe! Osastoa, jolla työntekijä on esimiehenä, ei voi valita."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Minun tuntikortti"
+
 #~ msgid "Partner Id"
 #~ msgstr "Kumppanin tunnus"
 
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 6d09af802be..080b0e0bb1f 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
@@ -481,8 +481,8 @@ msgstr "Informations générales"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Ma feuille de temps"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -764,6 +764,9 @@ msgstr "Changer de travail"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Entrée/Sortie par projet"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Ma feuille de temps"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Compte analytique"
 
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index f4c564f8537..d40b8f46fbc 100644
--- a/addons/hr_timesheet/i18n/gl.po
+++ b/addons/hr_timesheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -471,8 +471,8 @@ msgstr "Información xeral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "O meu parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -692,6 +692,9 @@ msgstr "Cambiar traballo"
 #~ msgid "To be invoiced"
 #~ msgstr "A facturar"
 
+#~ msgid "My Timesheet"
+#~ msgstr "O meu parte de horas"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Resumo da análise"
 
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 388828719e5..5e5f0def946 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
@@ -460,7 +460,7 @@ msgstr "Opći Podaci"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 07450f04ca0..21027a659b1 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -446,7 +446,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 413303c30b5..5efc5cc1002 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -473,8 +473,8 @@ msgstr "Általános információ"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Munkaidőm"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -660,6 +660,9 @@ msgstr "Másik munkára váltás"
 #~ msgid "To be invoiced"
 #~ msgstr "Számlázandó"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Munkaidőm"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Elemzés összesító"
 
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 35d8afe5d0b..a22daba3961 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index 5a82902d664..b14f1512b3c 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -468,8 +468,8 @@ msgstr "Informazioni Generali"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Il mio Timesheet"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -754,6 +754,9 @@ msgstr "Cambia Lavoro"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Ingresso/Uscita per Progetto"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Il mio Timesheet"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Conto analitico"
 
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 0aa5e1bbdfd..2e6071624fb 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -466,8 +466,8 @@ msgstr "一般情報"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "私の勤務表"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -645,3 +645,6 @@ msgstr "作業の変更"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "プロジェクトごとにサインイン / サインアウト"
+
+#~ msgid "My Timesheet"
+#~ msgstr "私の勤務表"
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 4ef8fe52241..15bd67e12a7 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr "일반 정보"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 34aa60debf7..d19b043eb75 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index 6c8db7e11a1..a952b205b44 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -469,8 +469,8 @@ msgstr "Vispārīgā informācija"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Personīgā Darba laika uzskaites Tabele"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -773,6 +773,9 @@ msgstr "Izmainīt Darbu"
 #~ msgid "Anlytic account"
 #~ msgstr "Analītiskais konts"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Personīgā Darba laika uzskaites Tabele"
+
 #~ msgid "Partner Id"
 #~ msgstr "Partnera ID"
 
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 1f44a60fcd3..2d5f2c1f0b4 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -468,8 +468,8 @@ msgstr "Ерөнхий мэдээлэл"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Өөрийн цаг бүртгэл"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -675,6 +675,9 @@ msgstr "Ажлыг өөрчлөх"
 #~ msgid "To be invoiced"
 #~ msgstr "Нэхэмжлэл үүсгэх"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Өөрийн цаг бүртгэл"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Аналитик данс"
 
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index 67e57503462..18344658f5b 100644
--- a/addons/hr_timesheet/i18n/nb.po
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Generell informasjon"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Min timeliste"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -638,6 +638,9 @@ msgstr ""
 #~ msgid "Analytic Account"
 #~ msgstr "Analytisk konto"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Min timeliste"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Analytisk konto"
 
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index 83edd638525..53ce23030df 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -476,8 +476,8 @@ msgstr "Algemene informatie"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mijn urenverantwoording"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -770,6 +770,9 @@ msgstr "Verander taak"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "In-/Uitklokken per project"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mijn urenverantwoording"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Kostenplaats"
 
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 1a35046dd80..fdd1535cd22 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -168,7 +168,7 @@ msgstr "Ostrzeżenie !"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Błąd Użytkownika"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
@@ -290,7 +290,7 @@ msgstr "Pozycja karty czasu pracy"
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "pracownicy"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -471,8 +471,8 @@ msgstr "Informacje ogólne"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Moja karta czasu pracy"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -740,5 +740,8 @@ msgstr "Zmień pracę"
 #~ msgid "Consultancy - Senior Developer"
 #~ msgstr "Konsultacje - Straszy inżynier"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Moja karta czasu pracy"
+
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Wejścia / Wyjścia wg projektów"
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index a0b241d7d67..648c4b357fc 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -129,7 +129,7 @@ msgstr "Montante Mínimo Analítico"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "Folha de horas mensal do funcionário"
+msgstr "Folha de Horas Mensal do Funcionário"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -320,7 +320,7 @@ msgstr "Análise de fatura"
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "Folha de Horas do funcionário"
+msgstr "Folha de Horas do Funcionário"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
@@ -396,7 +396,7 @@ msgstr "Junho"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr "Imprimir a minha folha de horas"
+msgstr "Imprimir a Minha Folha de Horas"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -476,8 +476,8 @@ msgstr "Informação Geral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "A Minha Folha de Horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -502,7 +502,7 @@ msgstr "Cancelar"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Horário dos Funcionários"
+msgstr "Folhas de Horas dos Funcionários"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -816,3 +816,6 @@ msgstr "Mudar Trabalho"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Sign In/Out por Projeto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "A Minha Folha de Horas"
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 6a907525ac5..668b4812eb0 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Informação Geral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Minha Planilha de Horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -680,3 +680,6 @@ msgstr "Alterar Trabalho"
 
 #~ msgid "Analytic line"
 #~ msgstr "Linha analítica"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Minha Planilha de Horas"
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index d137a6e4e25..e1f22e8b262 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -13,31 +13,31 @@ msgstr ""
 "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 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
-msgstr "Mie"
+msgstr "Miercuri"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr "(Pastrati necompletat pentru data curenta)"
+msgstr "(Lasati necompletat pentru data_curenta)"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "Nici un salariat nu ete definit pentru acest utilizator !"
+msgstr "Nici un angajat nu este definit pentru utilizatorul dumneavoastra !"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -47,66 +47,66 @@ msgid ""
 "analytic account. This feature allows to record at the same time the "
 "attendance and the timesheet."
 msgstr ""
-"Angajatii isi pot coda timpul petrecut cu diferite proiecte. Un proiect este "
-"un cont analitic, iar timpul petrecut la un proiect generează cheltuieli in "
-"contul analitic. Această caracteristică permite inregistrarea in acelasi "
-"timp si a prezentei si a foii de pontaj."
+"Angajatii isi pot inregistra timpul petrecut cu diferite proiecte. Un "
+"proiect este un cont analitic, iar timpul petrecut la un proiect genereaza "
+"cheltuieli in contul analitic. Aceasta caracteristica permite inregistrarea "
+"in acelasi timp si a prezentei si a fisei de pontaj."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr "Astăzi"
+msgstr "Astazi"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "Jurnal analitic"
+msgstr "Jurnal Analitic"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr "Încetarea lucrului"
+msgstr "Incetarea lucrului"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr "Foaie de pontaj angajat"
+msgstr "Fisa de pontaj angajat"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr "Statistici sarcini îndeplinite"
+msgstr "Statistica sarcini efectuate"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
 msgid "Timesheet"
-msgstr "Foaie de pontaj"
+msgstr "Fisa de pontaj"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
-msgstr "Lun"
+msgstr "Luni"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in"
-msgstr "Intrat"
+msgstr "Autentificare"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
-msgstr "Vin"
+msgstr "Vineri"
 
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdeM"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -116,20 +116,20 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
-"Angajatii isi pot coda timpul petrecut cu diferite proiecte care le sunt "
-"atribuite. Un proiect este un cont analitic, iar timpul petrecut cu un "
-"proiect generează cheltuieli in contul analitic. Această caracteristică "
-"permite inregistrarea in acelasi timp si a prezentei si a foii de pontaj."
+"Angajatii isi pot inregistra timpul petrecut cu diferite proiecte care le "
+"sunt atribuite. Un proiect este un cont analitic, iar timpul petrecut cu un "
+"proiect genereaza cheltuieli in contul analitic. Aceasta caracteristica "
+"permite inregistrarea in acelasi timp si a prezentei si a fisei de pontaj."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "Suma analitica minima"
+msgstr "Suma Analitica Minima"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "Foaie de pontaj lunară a angajatului"
+msgstr "Fisa de pontaj lunara a angajatului"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -146,31 +146,31 @@ msgstr "Starea curenta"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr "Nume angajați"
+msgstr "Nume angajati"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proiect / Cont Analitic"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr "Imprima Foaia de pontaj a angajatilor"
+msgstr "Tipariti Fisa de pontaj a angajatilor"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
 #: code:addons/hr_timesheet/hr_timesheet.py:177
 #, python-format
 msgid "Warning !"
-msgstr "Avertisment !"
+msgstr "Avertizare !"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr "Eroare Utilizator"
+msgstr "EroareUtilizator"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
@@ -183,18 +183,18 @@ msgstr "Nici o unitate de cost nu este definita pentru acest salariat !"
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
-msgstr "Mar"
+msgstr "Marti"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr "Avertisment"
+msgstr "Atentionare"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -207,37 +207,37 @@ msgstr "Semnare la intrare/la iesire după Proiect"
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
-msgstr "Sam"
+msgstr "Sambata"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
-msgstr "Dum"
+msgstr "Duminica"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Cont analitic"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
 msgid "Print"
-msgstr "Tiparire"
+msgstr "Tipariti"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Lines"
-msgstr "Linii foaie de pontaj"
+msgstr "Linii Fisa de pontaj"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr "Foaie de pontaj lunară a angajatului"
+msgstr "Fisa de pontaj lunara a angajatului"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -252,7 +252,7 @@ msgstr "Iulie"
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -263,11 +263,13 @@ msgstr "Categorii"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr "Specifică numirea angajatului drept un produs de tipul 'servici'."
+msgstr "Specifica numirea angajatului drept un produs de tipul 'servici'."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -286,7 +288,7 @@ msgstr "Septembrie"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linie foaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -296,14 +298,14 @@ msgstr "angajati"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr "Statistici lunare"
+msgstr "Statistici dupa luna"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: field:hr.analytical.timesheet.employee,month:0
 #: field:hr.analytical.timesheet.users,month:0
 msgid "Month"
-msgstr "Lună"
+msgstr "Luna"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
@@ -313,28 +315,28 @@ msgstr "Descrierea muncii"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Analiza facturii"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "Foaia de pontaj a salariatului"
+msgstr "Fisa de pontaj a angajatului"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr "Pontaj intrari / iesiri pe proiect"
+msgstr "Pontaj intrare / iesire dupa proiect"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Definiti-va Structura Analitica"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in / Sign out"
-msgstr "Pontaj Intrari / Iesiri"
+msgstr "Pontaj Intrare / Iesire"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
@@ -350,12 +352,12 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr "(Lăsati necompletat pentru timpul curent)"
+msgstr "(Lasati necompletat pentru moment)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
@@ -364,11 +366,15 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Ar trebui sa creati o structura a contului analitic in functie de nevoile d-"
+"voastra de analiza a costurilor si a veniturilor. In OpenERP, conturile "
+"analitice sunt folosite de asemenea pentru a tine evidenta contractelor "
+"clientilor."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linie analitica"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -391,12 +397,12 @@ msgstr "Iunie"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr "Imprimă Foaia mea de pontaj"
+msgstr "Tipareste Fisa mea de pontaj"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr "Dată"
+msgstr "Data"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -415,7 +421,7 @@ msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr "Data închidere"
+msgstr "Data de inchidere"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -455,7 +461,7 @@ msgstr "Analiza statistica"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr "Imprimă Foaia de Pontaj a angajatului & Imprimă Foaia mea de pontaj"
+msgstr "Tipariti Fisa de Pontaj a angajatului & Tipareste Fisa mea de pontaj"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
@@ -466,12 +472,12 @@ msgstr "ID angajat"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "General Information"
-msgstr "Informații generale"
+msgstr "Informatii generale"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Foaia mea de pontaj"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -488,7 +494,7 @@ msgstr "Decembrie"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulati"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
@@ -496,12 +502,12 @@ msgstr "Anulare"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Foaia de pontaj a angajatilor"
+msgstr "Fisa de pontaj a angajatilor"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr "Informații"
+msgstr "Informatii"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
@@ -515,17 +521,19 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Prin acest meniu va puteti inregistra si urmari orele lucrate la proiect in "
+"fiecare zi."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
 #: field:hr.sign.out.project,server_date:0
 msgid "Current Date"
-msgstr "Data curentă"
+msgstr "Data curenta"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr "Acest wizard va imprima foaia de pontaj lunară"
+msgstr "Acest wizard va imprima fisa de pontaj lunara"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -555,12 +563,12 @@ msgstr "Timp total"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(fus orar de pe server)"
+msgstr "(ora locala pe partea de server)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr "Semnare la intrare după Proiect"
+msgstr "Pontaj la intrare dupa Proiect"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -574,12 +582,12 @@ msgstr "Februarie"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr "Semnează la iesire după Proiect"
+msgstr "Pontaj la iesire dupa Proiect"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr "Angajați"
+msgstr "Angajati"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -607,7 +615,7 @@ msgid ""
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
 "Nici un cont analitic nu este definit pentru acest  proiect.\n"
-"Configurati unul altfel nu va fi posibila completarea automata a foilor de "
+"Configurati unul, altfel nu va fi posibila completarea automata a fiselor de "
 "pontaj."
 
 #. module: hr_timesheet
@@ -619,18 +627,18 @@ msgstr "Utilizatori"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Start Working"
-msgstr "Inceputul lucrului"
+msgstr "Incepeti lucrul"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr "Statistici pe utilizator"
+msgstr "Statistici dupa utilizator"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr "Nu există nici un angajat definit pentru acest utilizator"
+msgstr "Nu exista nici un angajat definit pentru acest utilizator"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -646,7 +654,7 @@ msgstr "Contabilitate"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr "Schimba activitatea"
+msgstr "Schimbati activitatea"
 
 #~ msgid "Day"
 #~ msgstr "Zi"
@@ -738,9 +746,6 @@ msgstr "Schimba activitatea"
 #~ "Prin Programul de lucru puteti vă puteti inregistra orele de lucru după "
 #~ "proiect in fiecare zi."
 
-#~ msgid "Sign In/Out By Project"
-#~ msgstr "Semnare la intrare/la iesire după Proiect"
-
 #~ msgid "Anlytic account"
 #~ msgstr "Cont analitic"
 
@@ -784,3 +789,9 @@ msgstr "Schimba activitatea"
 #~ msgstr ""
 #~ "Numele obiectului trebuie să înceapă cu x_ și să nu conțină nici un caracter "
 #~ "special !"
+
+#~ msgid "Sign In/Out By Project"
+#~ msgstr "Intrare/Iesire dupa Proiect"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Fisa mea de pontaj"
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index 1a439e10f05..6ee1541e17d 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -470,8 +470,8 @@ msgstr "Общая информация"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Моё расписание"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -777,5 +777,8 @@ msgstr "Изменить неделю"
 #~ msgid "Partner Id"
 #~ msgstr "ID контрагента"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моё расписание"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Итог анализа"
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index 91345467e54..167358c5237 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Splošne informacije"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index a862f816f00..be89e1c0d9a 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index 18b9c3cc334..ce4e15d5500 100644
--- a/addons/hr_timesheet/i18n/sr@latin.po
+++ b/addons/hr_timesheet/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index a0c454fcea0..e6140fb8d35 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -105,7 +105,7 @@ msgstr "Fri"
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -149,7 +149,7 @@ msgstr "Namn på anställda"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt / objektkonto"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -192,7 +192,7 @@ msgstr "Varning"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -217,7 +217,7 @@ msgstr "Sun"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Objektkonto"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -260,7 +260,7 @@ msgstr "Kategorier"
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Du kan inte ändra en post i en bekräftad/färdig tidrapport !"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -311,7 +311,7 @@ msgstr "Arbetsbeskrivning"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Fakturaanalys"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -327,7 +327,7 @@ msgstr "Logga in till/Logga ut från projektet"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Definiera din objektkontostruktur"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -341,6 +341,8 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Objektjournal saknas för medarbetare %s\n"
+"Definiera en anställd för den valda användaren och tilldela en objektjournal!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -359,11 +361,14 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Du bör skapa ett objektkontostruktur beroende på dina behov för att "
+"analysera kostnader och intäkter. I OpenERP, är objektkonton också "
+"användbara för att följa upp kundavtal."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Objektrad"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -465,8 +470,8 @@ msgstr "Allmän information"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Min tidsrapport"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -510,6 +515,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Genom denna meny kan du registrera och följa upp din arbetstid per projekt "
+"varje dag."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -752,6 +759,9 @@ msgstr "Ändra arbete"
 #~ msgid "Service on Timesheet"
 #~ msgstr "Underhåll på tidsrapporter"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Min tidsrapport"
+
 #~ msgid "Partner Id"
 #~ msgstr "Partner ID"
 
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 7ae44d9f08d..b6eb50a7497 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index ab1b14e42e7..a9ab05def31 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index 2e4f591163a..2dc164d342e 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Загальна інформація"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index f1ce58fcc0d..4deb4682d3b 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr "Thông tin chung"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 529eb4f6555..a8e9eecbfa6 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -467,8 +467,8 @@ msgstr "一般信息"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "我的计工单"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -736,6 +736,9 @@ msgstr "修改工作"
 #~ msgid "Partner Id"
 #~ msgstr "业务伙伴ID"
 
+#~ msgid "My Timesheet"
+#~ msgstr "我的计工单"
+
 #~ msgid ""
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index 6255bb1d3f6..bdb7bcdf9a5 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. 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 197b3d2435d..1eda6de05cb 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
-        	parent="menu_hr_timesheet_reports"
+        	parent="menu_hr_reporting_timesheet"
         	sequence="2" icon="STOCK_PRINT"/>
 
 
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 f51ccc769c4..95b7bd3b93e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -37,7 +37,7 @@
 
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
-        	parent="menu_hr_timesheet_reports"
+        	parent="menu_hr_reporting_timesheet"
         	groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 7e11fdad723..65b8905fca0 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -45,7 +45,6 @@ reports, etc.""",
         'wizard/hr_timesheet_analytic_profit_view.xml',
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
-        'board_hr_timesheet_invoice.xml',
     ],
     'demo': [
         'hr_timesheet_invoice_demo.xml',
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
deleted file mode 100644
index 7327ca66f63..00000000000
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
-
-        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
-            <field name="name">Costs to invoice</field>
-            <field name="res_model">report.account.analytic.line.to.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
-       <!--  <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.invoice</field>
-            <field name="model">board.board</field>
-             <field name="type">form</field>
-            <field name="inherit_id" ref="account.board_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='Draft Customer Invoices']" position="before">
-                    <action name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close"/>
-                    <action name="%(act_my_account)d" string="Accounts to invoice"/>
-                </xpath>
-            </field>
-        </record> -->
-
-        <!-- Need to merge in above view -->
-        <!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.invoice</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.board_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='Aged income']" position="after">
-                    <action name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-                </xpath>
-            </field>
-        </record> -->
-
-        <record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
-            <field name="name">timesheet.uninvoiced.line.tree</field>
-            <field name="model">report.timesheet.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Uninvoiced line with billing rate">
-                    <field name="date"/>
-                    <field name="account_id"/>
-                    <field name="user_id" />
-                    <field name="name"/>
-                    <field name="cost"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_timesheet_uninvoiced_line" model="ir.actions.act_window">
-            <field name="name">Uninvoice lines with billing rate</field>
-            <field name="res_model">report.timesheet.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="domain">[('invoice_id','=',False)]</field>
-            <field name="view_id" ref="view_timesheet_uninvoiced_line_tree"/>
-        </record>
-
-        <record id="board_hr_timesheet_uninvoiced_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.uninvoiced.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column" position="inside">
-                    <action name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 0a58efb782b..f1138d7b246 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,39 +63,58 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'pricelist_id': fields.many2one('product.pricelist', 'Customer Pricelist',
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
             help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price',
             help="Keep empty if this contract is not limited to a total fixed price."),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoice on Timesheet & Costs',
-            help="Fill this field if you plan to automatically generate invoices based " \
-            "on the costs in this analytic account: timesheets, expenses, ..." \
-            "You can configure an automatic invoice rate on analytic accounts."),
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
+            help="This field allows you to define the rate in case you plan to reinvoice " \
+            "the costs in this analytic account: timesheets, expenses, ..."),
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
-        res={}
-        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+
+    def on_change_use_timesheets(self, cr, uid, ids, use_timesheets, context=None):
+        res = {'value': {}}
+        if use_timesheets:
+            ir_model_obj = self.pool.get('ir.model.data')
+            res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
+        return res
+
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
+        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:
-            res['pricelist_id'] = pricelist
-        return {'value': res}
+            res['value']['pricelist_id'] = pricelist
+        return res
 
     def set_close(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+        self.write(cr, uid, ids, {'state':'close'}, context=context)
+        message = _("Contract has been <b>closed</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        message = _("Contract has been <b>cancelled</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_open(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        message = _("Contract has been <b>opened</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_pending(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        message = _("Contract has been set as <b>pending</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
 account_analytic_account()
 
@@ -107,10 +126,6 @@ class account_analytic_line(osv.osv):
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
     }
 
-    def unlink(self, cursor, user, ids, context=None):
-        return super(account_analytic_line,self).unlink(cursor, user, ids,
-                context=context)
-
     def write(self, cr, uid, ids, vals, context=None):
         self._check_inv(cr, uid, ids, vals)
         return super(account_analytic_line,self).write(cr, uid, ids, vals,
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c18ac4de667..64e0ef592b7 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -5,28 +5,23 @@
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="priority">30</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="on_change_partner_id(partner_id, context)"/>
-                </field>
-                <group name="contract" position="after">
-                    <group name="invoice_data">
-                        <separator colspan="2" string="Invoicing Data"/>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <group string="Invoice on Timesheets Options" name="invoice_on_timesheets" col="4">
+                        <field name="pricelist_id" />
                         <field name="to_invoice" widget="selection"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
-                        <field name="amount_max"/>
                     </group>
-                    <group name="invoice_stats">
-                        <separator colspan="4" string="Invoicing Statistics"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </group>
+                 </xpath>
+                <xpath expr="//field[@name='use_timesheets']" position="replace">
+                    <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
+                </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
                         <button name="set_pending" string="Pending" type="object" states="open"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending" class="oe_highlight"/>
+                        <button name="set_open" string="Re-open Project" type="object" states="draft,cancelled,close,pending" class="oe_highlight"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
@@ -57,7 +52,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -80,9 +75,8 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
-
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -150,7 +144,7 @@
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Type of invoicing"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index a43dc30197e..633275d5a10 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "حساب تحليلي"
 msgid "Deadline"
 msgstr "الموعد النهائي"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "الحسابات للفاتورة"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "المستخدم او اسم اليومية"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "القيم الى الفاتورة"
@@ -940,11 +934,6 @@ msgstr "سجل الدوام اليومي للحاسب"
 msgid "Product"
 msgstr "المنتج"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "الخطوط بدون فواتير مع معدل  الفواتير"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1175,6 +1164,9 @@ msgstr ""
 #~ msgid "Final Invoice"
 #~ msgstr "الفاتورة النهائية"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "الحسابات للفاتورة"
+
 #, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "لا يمكنك تصنيف الخط التحليلي للفاتورة"
@@ -1200,6 +1192,9 @@ msgstr ""
 #~ msgid "Balance product needed"
 #~ msgstr "الحاجة الى ميزانية المنتج"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "الخطوط بدون فواتير مع معدل  الفواتير"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "الفاتورة على الخطوط التحليلية"
 
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 5811db3b269..6a5d1606f12 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Аналитична сметка"
 msgid "Deadline"
 msgstr "Краен срок"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Превърни \"разходи\" на фактура"
@@ -928,11 +922,6 @@ msgstr "Дневен график според сметка"
 msgid "Product"
 msgstr "Продукт"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 156571da4af..535e047a703 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index 11646bcbee1..4afc7ec859a 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "Compte analític"
 msgid "Deadline"
 msgstr "Data límit"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Comptes a facturar"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Nom del usuari o diari"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -945,11 +939,6 @@ msgstr "Full de serveis diària per compte"
 msgid "Product"
 msgstr "Producte"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No factura línies amb cost"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1329,6 +1318,12 @@ msgstr ""
 #~ "Empleneu els camps empresa i tarifa del compte analític:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No factura línies amb cost"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Comptes a facturar"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura final del compte analítica"
 
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 75eb15a014f..99ff4b0ba2e 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/da.po b/addons/hr_timesheet_invoice/i18n/da.po
index 35a57ba2c56..f0b73f83161 100644
--- a/addons/hr_timesheet_invoice/i18n/da.po
+++ b/addons/hr_timesheet_invoice/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 8027e1c5fa8..051912e0faf 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -65,7 +65,7 @@ msgstr "tägliche Zeiterfassung aktuelles Jahr"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr "Porjekt wiedereröffnen"
+msgstr "Projekt wiedereröffnen"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -248,11 +248,6 @@ msgstr "Analytisches Konto"
 msgid "Deadline"
 msgstr "Frist"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Abzurechnende Analytische Konten"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Benutzer oder Journalname"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Abzurechnende Kosten"
@@ -955,11 +949,6 @@ msgstr "Tägliche Zeiterfassung nach Konto"
 msgid "Product"
 msgstr "Produkt"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Storno Rechnungszeile mit Abrechnungsquote"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1300,9 +1289,15 @@ msgstr "Zeiterfassung der letzten 7 Tage"
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Schlussrechnung für Analytisches Konto"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Abzurechnende Analytische Konten"
+
 #~ msgid "Reinvoice Costs"
 #~ msgstr "Weiterberechnung"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Storno Rechnungszeile mit Abrechnungsquote"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index c3d98e2dc6b..a0fa29f0f7f 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -250,11 +250,6 @@ msgstr ""
 msgid "Deadline"
 msgstr "Χρονικό Όριο"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -292,7 +287,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -935,11 +929,6 @@ msgstr ""
 msgid "Product"
 msgstr "Προϊόν"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 254d74a9174..eb2f6727ebe 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "Cuenta analítica"
 msgid "Deadline"
 msgstr "Fecha límite"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Nombre del Usuario o Diario"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -945,11 +939,6 @@ msgstr "Hoja de servicios diaria por cuenta"
 msgid "Product"
 msgstr "Producto"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No facturar líneas con coste"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1303,6 +1292,9 @@ msgstr ""
 #~ msgid "Invoicing"
 #~ msgstr "A facturar"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura final para la cuenta analítica"
 
@@ -1337,3 +1329,6 @@ msgstr ""
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No facturar líneas con coste"
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index ec75a64cef9..2fa3e77fe46 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgstr ""
 msgid "Product"
 msgstr "Producto"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/es_CR.po b/addons/hr_timesheet_invoice/i18n/es_CR.po
index 8fdd83c4698..0ee3c65f379 100644
--- a/addons/hr_timesheet_invoice/i18n/es_CR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_timesheet_invoice
@@ -249,11 +249,6 @@ msgstr "Cuenta analítica"
 msgid "Deadline"
 msgstr "Fecha límite"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -291,7 +286,6 @@ msgstr "Nombre del Usuario o Diario"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -953,11 +947,6 @@ msgstr "Hoja de servicios diaria por cuenta"
 msgid "Product"
 msgstr "Producto"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No facturar líneas con coste"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1167,6 +1156,12 @@ msgstr "Año"
 msgid "Timesheet lines during last 7 days"
 msgstr "Lineas de hojas de diario durante los últimos 7 días"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No facturar líneas con coste"
+
 #, python-format
 #~ msgid "Analytic account incomplete"
 #~ msgstr "Cuenta analítica incompleta"
diff --git a/addons/hr_timesheet_invoice/i18n/es_EC.po b/addons/hr_timesheet_invoice/i18n/es_EC.po
index 5c81b10b86c..b2e66d2ba2a 100644
--- a/addons/hr_timesheet_invoice/i18n/es_EC.po
+++ b/addons/hr_timesheet_invoice/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgstr "Cuenta Analítica"
 msgid "Deadline"
 msgstr "Fecha límite"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -291,7 +286,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -942,11 +936,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1152,3 +1141,6 @@ msgstr ""
 #: view:report.timesheet.line:0
 msgid "Timesheet lines during last 7 days"
 msgstr ""
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index a8b507f141e..f399636621e 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Analüütiline konto"
 msgid "Deadline"
 msgstr "Tähtaeg"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Kulud arveldamiseks"
@@ -928,11 +922,6 @@ msgstr "Igapäevane tööajakaart konto järgi"
 msgid "Product"
 msgstr "Toode"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 012084e01fe..fa164655d95 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Laskutettavat tilit"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -934,11 +928,6 @@ msgstr ""
 msgid "Product"
 msgstr "Tuote"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1228,3 +1217,6 @@ msgstr ""
 
 #~ msgid "Create invoices"
 #~ msgstr "Luo laskut"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Laskutettavat tilit"
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 149a7fc480e..6afdb14aefa 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "Compte analytique"
 msgid "Deadline"
 msgstr "Echéance"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Comptes à facturer"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Utilisateur ou nom du journal"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Coûts à facturer"
@@ -956,11 +950,6 @@ msgstr "Feuilles de présences jounalière par Compte"
 msgid "Product"
 msgstr "Produit"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Lignes non-facturées avec le taux de facturation"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1292,6 +1281,9 @@ msgstr "Lignes des feuilles de temps des 7 derniers jours"
 #~ msgid "Reactivate Account"
 #~ msgstr "Réactiver le compte"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Comptes à facturer"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Facture finale pour le compte analytique"
 
@@ -1317,6 +1309,9 @@ msgstr "Lignes des feuilles de temps des 7 derniers jours"
 #~ "Erreur ! La monnaie doit être la même que la monnaie de la société "
 #~ "sélectionnée"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Lignes non-facturées avec le taux de facturation"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index 75aa35c0092..16837ac91f6 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Analitički konto"
 msgid "Deadline"
 msgstr "Rok"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Troškovi za fakturiranje"
@@ -928,11 +922,6 @@ msgstr "Dnevni Rasporedi po Kupcu"
 msgid "Product"
 msgstr "Proizvod"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index ca1fd1105fd..768c4be3dac 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -243,11 +243,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -285,7 +280,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -907,11 +901,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 746126f98aa..00596ba933f 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgstr "Gyűjtőkód"
 msgid "Deadline"
 msgstr "Határidő"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Számlázandó gyűjtőkódok"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -291,7 +286,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Kiszámlázandó költségek"
@@ -947,11 +941,6 @@ msgstr "Gyűjtőkód szerinti napi munkaidő-kimutatás"
 msgid "Product"
 msgstr "Termék"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Nem számlázott sorok számlázási rátával"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1207,6 +1196,9 @@ msgstr ""
 #~ msgid "Reactivate Account"
 #~ msgstr "Gyűjtőkód újraaktíválása"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Számlázandó gyűjtőkódok"
+
 #~ msgid ""
 #~ "\n"
 #~ "Module to generate invoices based on costs (human resources, expenses, "
@@ -1232,6 +1224,9 @@ msgstr ""
 #~ msgid "Analytic account incomplete"
 #~ msgstr "Nem adott meg gyűjtőkódot!"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Nem számlázott sorok számlázási rátával"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index d6ff1597e34..581780c37f7 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 48f2c4f7cfb..b32105671bd 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "Contabilità Analitica"
 msgid "Deadline"
 msgstr "Scadenza"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Conti da Fatturare"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Nome Utente o Giornale"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costi da Fatturare"
@@ -940,11 +934,6 @@ msgstr "Orari di Lavoro giornalieri da Contabilità"
 msgid "Product"
 msgstr "Prodotto"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Linee non fatturate con tasso di fatturazione"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1296,6 +1285,12 @@ msgstr ""
 #~ "Per favore compilare il partner e il campo listino nel conto analitico:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Linee non fatturate con tasso di fatturazione"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Conti da Fatturare"
+
 #~ msgid ""
 #~ "\n"
 #~ "Module to generate invoices based on costs (human resources, expenses, "
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index 23865a6e70a..bfb8cd16222 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr "分析アカウント"
 msgid "Deadline"
 msgstr "期限"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "請求するアカウント"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr "ユーザあるいはジャーナルの名称"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "請求書へ計上する経費"
@@ -314,7 +308,7 @@ msgstr "状態"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
-msgstr "日付の指定が足りません。"
+msgstr "データ不足です。"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -412,7 +406,7 @@ msgstr "印刷日"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Bill Tasks Works"
-msgstr "課金が"
+msgstr "請求タスク作業"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -935,11 +929,6 @@ msgstr "アカウントごとの日々の勤務表"
 msgid "Product"
 msgstr "製品"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "請求料率を持つ未請求の行"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1146,5 +1135,11 @@ msgstr "年"
 msgid "Timesheet lines during last 7 days"
 msgstr "過去7日間の勤務表の行"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "請求するアカウント"
+
 #~ msgid "Do you want to display work details on the invoice ?"
 #~ msgstr "この請求書の作業明細を表示しますか。"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "請求料率を持つ未請求の行"
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index 1e66d669777..3a321d4c428 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr "마감시한"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr "상품"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 969e9978c82..ff0436a865e 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 451d7f300b0..a84fc215aaf 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 1f97a98efd2..e4b47c70bba 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -17,14 +17,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-25 19:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-06-21 04:33+0000\n"
+"Last-Translator: lhagvajargal <jagaapu@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -258,11 +258,6 @@ msgstr "Аналитик данс"
 msgid "Deadline"
 msgstr "Тогтсон өдөр"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Нэхэмжлэл үүсгэх дансууд"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -296,11 +291,10 @@ msgstr "Хэзээнээс"
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "User or Journal Name"
-msgstr ""
+msgstr "Хэрэглэгч болон журналын нэр"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Нэхэмжлэх үнийн дүн"
@@ -443,7 +437,7 @@ msgstr "Онолын"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "Configuration Error"
-msgstr ""
+msgstr "Тохиргооны алдаа"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -500,7 +494,7 @@ msgstr "12 сар"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Invoice contract"
-msgstr ""
+msgstr "Нэхэмжлэлийн гэрээ"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
@@ -543,7 +537,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Users"
-msgstr ""
+msgstr "Хэрэглэгчид"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -951,11 +945,6 @@ msgstr "Өдөр бүрийн цаг бүртгэлийг дансаар хар
 msgid "Product"
 msgstr "Бараа"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Тооцооны үнэ бүхий нэхэмжлээгүй мөрүүд"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1169,6 +1158,9 @@ msgstr ""
 #~ msgid "Sale Pricelist"
 #~ msgstr "Борлуулалтын үнийн жагсаалт"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Нэхэмжлэл үүсгэх дансууд"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Аналитик дансны эцсийн нэхэмжлэл"
 
@@ -1214,6 +1206,9 @@ msgstr ""
 #~ msgid "Invoicing"
 #~ msgstr "Нэхэмжилж байгаа"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Тооцооны үнэ бүхий нэхэмжлээгүй мөрүүд"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "Аналитик мөрүүдийг үндэслэн нэхэмжлэх"
 
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 557bb39050d..a47be5c87d3 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgstr "Kostenplaats"
 msgid "Deadline"
 msgstr "Deadline"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Te factureren klanten"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -272,7 +267,7 @@ msgstr "De tijd van elk verricht werk zal getoond worden op de factuur"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "Roosters"
+msgstr "Urenstaten"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
@@ -291,7 +286,6 @@ msgstr "Gebruiker of dagboeknaam"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Nog te ontvangen facturen"
@@ -959,11 +953,6 @@ msgstr "Dagelijkse urenstaat per rekening"
 msgid "Product"
 msgstr "Product"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Niet-gefactureerde regels met factuurtarief"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1290,6 +1279,9 @@ msgstr "Urenstaatregels in afgelopen 7 dagen"
 #~ msgid "Balance product"
 #~ msgstr "Saldo product"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Te factureren klanten"
+
 #, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "U kunt een gefactureerde kostenplaatsboeking niet wijzigen!"
@@ -1311,6 +1303,9 @@ msgstr "Urenstaatregels in afgelopen 7 dagen"
 #~ "Val aub de relatie en prijslijst velden in bij de kostenplaats:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Niet-gefactureerde regels met factuurtarief"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index 6c52eabcc56..b2162e53c23 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 8a0b41aa9d0..dc73068a124 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -233,7 +233,7 @@ msgstr "Dzienna karta czasu pracy na konto"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr ""
+msgstr "Niekompletne konto analityczne"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -248,11 +248,6 @@ msgstr "Konto analityczne"
 msgid "Deadline"
 msgstr "Termin"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Koszty do faktury"
@@ -315,7 +309,7 @@ msgstr "Stan"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Zbyt mało danych!"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -354,7 +348,7 @@ msgstr "Pozycje do fakturowania"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:128
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
@@ -386,7 +380,7 @@ msgstr "Zysk karty czasu pracy"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
 #, python-format
 msgid "Partner incomplete"
-msgstr ""
+msgstr "Niekomplenty partner"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,name:0
@@ -471,7 +465,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:220
 #, python-format
 msgid "Invoices"
-msgstr ""
+msgstr "Faktury"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -654,7 +648,7 @@ msgstr "Data"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "Wypełnij pole adresu dla partnera: %s."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -724,7 +718,7 @@ msgstr "Ma"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date2:0
@@ -896,7 +890,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
 #, python-format
 msgid "At least one line has no product !"
-msgstr ""
+msgstr "Co najmniej jedna pozycja nie ma produktu !"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,date:0
@@ -932,11 +926,6 @@ msgstr "Dzienna karta czasu pracy wg konta"
 msgid "Product"
 msgstr "Produkt"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -982,7 +971,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
-msgstr ""
+msgstr "Nie znaleziono rekordów dla raportu!"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 0bdfa54c14b..54768835d2e 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgstr "Conta analítica"
 msgid "Deadline"
 msgstr "Prazo Limite"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Contas a Faturar"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -290,7 +285,6 @@ msgstr "Utilizador ou Nome diário"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Custos a Faturar"
@@ -950,11 +944,6 @@ msgstr "Folha de Horas diária por conta"
 msgid "Product"
 msgstr "Artigo"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Linhas de  re-fatura com taxa de faturamento"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1345,3 +1334,9 @@ msgstr "Linhas da folha de horas durante os últimos 7 dias"
 
 #~ msgid "Do you want to display work details on the invoice ?"
 #~ msgstr "Deseja exibir os detalhes do trabalho na fatura?"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Contas a Faturar"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Linhas de  re-fatura com taxa de faturamento"
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 7b0705750c0..b713991aa8c 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr "Conta Analítica"
 msgid "Deadline"
 msgstr "Prazo final"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Custos para fatura"
@@ -931,11 +925,6 @@ msgstr "Planilha de Horas Diária por Conta"
 msgid "Product"
 msgstr "Produto"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index f8999a32911..14affe21d78 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -13,19 +13,19 @@ msgstr ""
 "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:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr "Foaie de pontaj pe utilizator"
+msgstr "Fisa de pontaj dupa utilizator"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines in this year"
-msgstr ""
+msgstr "Linii fise de pontaj din acest an"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -40,7 +40,7 @@ msgstr "Profit"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr "Creare factura din foaia de pontaj finala"
+msgstr "Creare factura din fisa de pontaj finala"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -55,22 +55,22 @@ msgstr "    7 zile    "
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Income"
-msgstr "Venituri"
+msgstr "Venit"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily Timesheets for this year"
-msgstr ""
+msgstr "Fise de pontaj zilnice pentru anul acesta"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Redeschideti proiectul"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr "Foaie de pontaj pe zi"
+msgstr "Fisa de pontaj pe zi"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -84,7 +84,7 @@ msgstr "Martie"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
 msgid "Name of entry"
-msgstr "Numele intrarii"
+msgstr "Numele inregistrarii"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,pricelist_id:0
@@ -93,13 +93,13 @@ msgid ""
 "deduced by this pricelist on the product."
 msgstr ""
 "Produsul de facturat este definit in formularul angajatului, pretul va fi "
-"dedus din aceasta lista de preturi pe produs."
+"dedus din aceasta lista de preturi pentru produs."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:129
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
-msgstr ""
+msgstr "Nu puteti modifica o linie analitica a facturii!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -118,7 +118,7 @@ msgstr "Anul acesta"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
 msgid "Display time in the history of works"
-msgstr "Afisaj timp in istoricul activitatilor"
+msgstr "Afisajeaza perioada in istoricul activitatilor"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -145,12 +145,12 @@ msgstr "Cont"
 #: field:hr.timesheet.invoice.create,time:0
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time spent"
-msgstr "Timp consumat"
+msgstr "Timp petrecut"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Suma facturată"
+msgstr "Suma facturata"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -160,7 +160,7 @@ msgstr "Linie nefacturata cu rata facturarii"
 #. module: hr_timesheet_invoice
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Numarul Facturii trebuie sa fie unic per Companie!"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -176,6 +176,7 @@ msgstr "Suma"
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
+"Valoare gresita a creditului sau debitului in inregistrarea contabila !"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -186,12 +187,12 @@ msgstr "Detaliile fiecarei activitati prestate vor aparea pe factura"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr "Creare factura din foaia de pontaj"
+msgstr "Creati factura din fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -211,29 +212,29 @@ msgstr "Linii nefactuate cu rata facturarii"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr "Grupare dupa..."
+msgstr "Grupati dupa..."
 
 #. module: hr_timesheet_invoice
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Comunicare Structurata BBA Nevalida !"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
-msgstr "Creare facturi"
+msgstr "Creati Facturi"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr "Foaia de pontaj zilnica per cont"
+msgstr "Fisa de pontaj zilnica per cont"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr "Cont analitic incomplet"
+msgstr "Cont Analitic incomplet"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -246,12 +247,7 @@ msgstr "Cont analitic"
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr "Scadenta"
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Conturi de facturat"
+msgstr "Termen limita"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -271,14 +267,12 @@ msgstr "Timpul fiecarei activitati efectuate va fi afisat pe factura"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
 msgid "hr.timesheet.analytic.cost.ledger"
-msgstr ""
-"hr.timesheet.analytic.cost.ledger (resurse umane.fisa de "
-"pontaj.analitic.cost.registru)"
+msgstr "ru.registru.fisa de pontaj.cost.analitic"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -292,7 +286,6 @@ msgstr "Nume Utilizator sau Jurnal"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costuri de facturat"
@@ -300,7 +293,7 @@ msgstr "Costuri de facturat"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by user in this month"
-msgstr ""
+msgstr "Fisa de pontaj dupa utilizator in aceasta luna"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,account_id:0
@@ -328,12 +321,12 @@ msgstr "Debit"
 #: view:hr.timesheet.analytic.cost.ledger:0
 #: view:hr.timesheet.analytic.profit:0
 msgid "Print"
-msgstr "Imprima"
+msgstr "Tipariti"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr "Va permite setarea discountului in timp ce faceti factura"
+msgstr "Va permite setarea reducerii in timp ce faceti factura"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
@@ -347,7 +340,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Force to use a special product"
-msgstr ""
+msgstr "Impune utilizarea unui produs special"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -378,7 +371,7 @@ msgid ""
 "an automatic invoice rate on analytic accounts."
 msgstr ""
 "Completati acest camp daca planuiti sa generati automat facturi bazate pe "
-"costurile din acest cont analitic: foi de pontaj, cheltuieli,... Puteti "
+"costurile din acest cont analitic: fise de pontaj, cheltuieli,... Puteti "
 "configura o rata automata a facturii in conturile analitice."
 
 #. module: hr_timesheet_invoice
@@ -387,7 +380,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
 msgid "Timesheet Profit"
-msgstr "Beneficii foi de pontaj"
+msgstr "Profit Fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
@@ -398,7 +391,7 @@ msgstr "Partener incomplet"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,name:0
 msgid "Display detail of work in the invoice line."
-msgstr "Afisarea detaliilor activitatii in linia facturii."
+msgstr "Afisati detaliile activitatii in linia facturii."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -418,7 +411,7 @@ msgstr "Data imprimarii"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Bill Tasks Works"
-msgstr "Facturare activitati sarcini"
+msgstr "Facturati Activitati Sarcini"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -435,27 +428,27 @@ msgstr "Teoretic"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "Configuration Error"
-msgstr ""
+msgstr "Eroare de configurare"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr "Linii analitice de factura raport"
+msgstr "Raport Linii analitice de facturat"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Invoice on Timesheet & Costs"
-msgstr ""
+msgstr "Facturi pe Fisele de pontaj & Costuri"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
 msgid "Timesheet by User"
-msgstr "Foaie de pontaj dupa Utilizator"
+msgstr "Fisa de pontaj dupa Utilizator"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
 msgid "Timesheet by Invoice"
-msgstr "Foaie de pontaj dupa Factura"
+msgstr "Fisa de pontaj dupa Factura"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
@@ -471,7 +464,7 @@ msgstr "Reducere (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr "DA (100%)"
+msgstr "Da (100%)"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:55
@@ -492,7 +485,7 @@ msgstr "Decembrie"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Invoice contract"
-msgstr ""
+msgstr "Facturati contractul"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
@@ -501,6 +494,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Contul selectat din Inregistrarea in Jurnal solicita furnizarea unei monede "
+"secundare. Ar trebui sa stergeti moneda secundara din cont sau sa selectati "
+"o vizualizare multi-moneda in jurnal."
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -515,12 +511,12 @@ msgstr "Luna"
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Currency"
-msgstr "Valuta"
+msgstr "Moneda"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Elementele Jurnalului"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,product:0
@@ -529,7 +525,8 @@ msgid ""
 "Keep empty to use the real product that comes from the cost."
 msgstr ""
 "Completati acest camp doar daca doriti sa impuneti folosirea unui anumit "
-"produs.Lasati necompletat pentru a folosi produsul real care reiese din cost."
+"produs. Lasati necompletat pentru a folosi produsul real care reiese din "
+"cost."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -539,7 +536,7 @@ msgstr "Utilizatori"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr "Foi de pontaj neatribuite utilizatorilor"
+msgstr "Fise de pontaj neatribuite utilizatorilor"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
@@ -558,12 +555,14 @@ 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 ""
+"Data Inregistrarii in Jurnal nu se afla in perioada definita! Ar trebui sa "
+"schimbati data sau sa eliminati aceasta restrictie din jurnal."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "No income account defined for product '%s'"
-msgstr ""
+msgstr "Nu exista nici un cont de venituri definit pentru acest produs '%s'"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -573,7 +572,7 @@ msgstr "Rata factura dupa utilizator"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr "Foaie de pontaj dupa cont"
+msgstr "Fisa de pontaj dupa cont"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -588,7 +587,7 @@ msgstr "Total facturat"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr "Perioada la"
+msgstr "Perioada pana la"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
@@ -637,18 +636,18 @@ msgstr "Iunie"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
 msgid "Display date in the history of works"
-msgstr "Afisare data in istoricul activitatilor"
+msgstr "Afisati data in istoricul activitatilor"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr "Foaie de pontaj per cont"
+msgstr "Fisa de pontaj per cont"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
 msgid "Timesheet by Account"
-msgstr "Foaie de pontaj dupa cont"
+msgstr "Fisa de pontaj dupa Cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,date:0
@@ -661,7 +660,7 @@ msgstr "Data"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr "Va rugam completati campul Adresa din formularul Partenerului: %s."
+msgstr "Va rugam completati campul Adresa in formularul Partenerului: %s."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -675,7 +674,7 @@ msgstr "Noiembrie"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -701,7 +700,7 @@ msgstr "Utilizator"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "J.C. /Mutare nume"
+msgstr "J.C. /Nume mutare"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -720,7 +719,7 @@ msgstr "Ianuarie"
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Nu puteti crea elemente ale jurnalului intr-un cont inchis."
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -753,6 +752,7 @@ msgstr "Sold"
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Nu puteti crea elemente ale jurnalului intr-un cont de tipul vizualizare."
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity:0
@@ -778,7 +778,7 @@ msgstr "Cont General"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr "Imprimare profit fioaie de pontaj"
+msgstr "Imprimati Profitul Fisei de pontaj"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -812,7 +812,7 @@ msgstr "Septembrie"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Nu puteti crea o linie analitica in vizualizarea contului."
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -825,6 +825,8 @@ msgstr "Factura"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -833,17 +835,17 @@ msgstr ""
 #: view:hr.timesheet.invoice.create:0
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Cancel"
-msgstr "Anuleaza"
+msgstr "Anulati"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr "Inchide"
+msgstr "Inchideti"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr "Afiseaza costul articolului pe care il refacturati"
+msgstr "Afisati costul articolului pe care il refacturati"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -854,7 +856,7 @@ msgid ""
 "speed up your invoicing."
 msgstr ""
 "OpenERP va permite sa creati tipuri predefinite de facturare. S-ar putea ca "
-"dumneavoastra sa trebuiasca sa atribuiti frecvent discounturi datorita unui "
+"dumneavoastra sa trebuiasca sa atribuiti frecvent reduceri datorita unui "
 "contract specific sau a unui acord cu un client. Din acest meniu, puteti "
 "crea tipuri suplimentare de facturare pentru a grabi facturarea."
 
@@ -864,7 +866,7 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr "Linie fioaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -886,7 +888,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociata."
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
@@ -904,7 +906,7 @@ msgstr "Catre"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
 msgid "Create Invoice"
-msgstr ""
+msgstr "Creati Factura"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
@@ -920,22 +922,22 @@ msgstr "Data reala a fiecarei activitati va fi afisata pe factura"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Customer Pricelist"
-msgstr ""
+msgstr "Lista de preturi Client"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr "Foi de pontaj de facturat"
+msgstr "Fise de pontaj de facturat"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date1:0
 msgid "Start of period"
-msgstr "Începutul perioadei"
+msgstr "Inceputul perioadei"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
 msgid "Daily Timesheet by Account"
-msgstr "Foi de pontaj zilnice dupa cont"
+msgstr "Fise de pontaj Zilnice dupa Cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
@@ -946,11 +948,6 @@ msgstr "Foi de pontaj zilnice dupa cont"
 msgid "Product"
 msgstr "Produs"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Nefacturare linii cu rata facturarii"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -993,23 +990,24 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily Timesheets of this month"
-msgstr ""
+msgstr "Fise de pontaj Zilnice din luna aceasta"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
-msgstr "Nu au fost gasite inregistrari pentru raport!"
+msgstr "Nu au fost gasite Inregistrari pentru Raport!"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
 msgid "Keep empty if this contract is not limited to a total fixed price."
 msgstr ""
+"Lasati necompletat daca acest contract nu este limitat unui pret total fix."
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr "Foi de pontaj dupa factura"
+msgstr "Fisa de pontaj dupa factura"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -1047,7 +1045,7 @@ msgstr "Nume"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr "Foaia de pontaj zilnica dupa cont"
+msgstr "Fisa de pontaj zilnica dupa cont"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,sale_price:0
@@ -1057,7 +1055,7 @@ msgstr "Pret de vanzare"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr "Foi de pontaj pe zi"
+msgstr "Fise de pontaj pe zi"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -1071,18 +1069,18 @@ msgstr "Aprilie"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoicing Data"
-msgstr "Date facturare"
+msgstr "Date pentru facturare"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr "Discount in procente"
+msgstr "Reducere in procente"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
 #, python-format
 msgid "Invoice is already linked to some of the analytic line(s)!"
-msgstr ""
+msgstr "Factura este deja legata la unele linii analitice!"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -1092,7 +1090,7 @@ msgstr "Tipuri de facurare"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr "Foi de pontaj per cont"
+msgstr "Fise de pontaj per cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,name:0
@@ -1108,7 +1106,7 @@ msgstr "Unitati"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by user in this year"
-msgstr ""
+msgstr "Fise de pontaj dupa utilizator in acest an"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
@@ -1118,17 +1116,17 @@ msgstr "Tip de facturare"
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr "Linii analitice de facturare"
+msgstr "Linii Analitice de Facturat"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines in this month"
-msgstr ""
+msgstr "Linii Fise de pontaj in luna aceasta"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoicing Statistics"
-msgstr ""
+msgstr "Statistica Facturare"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
@@ -1158,7 +1156,7 @@ msgstr "An"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines during last 7 days"
-msgstr ""
+msgstr "Linii fise de pontaj in ultimele 7 zile"
 
 #~ msgid "Visible name"
 #~ msgstr "Nume vizibil"
@@ -1176,6 +1174,9 @@ msgstr ""
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura finala pentru contul analitic"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Conturi de facturat"
+
 #~ msgid "Balance product"
 #~ msgstr "Sold produs"
 
@@ -1237,6 +1238,9 @@ msgstr ""
 #~ msgid "Balance product needed"
 #~ msgstr "Este nevoie de soldul produsului"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Nefacturare linii cu rata facturarii"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "Factura in liniile analitice"
 
@@ -1253,3 +1257,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Costul fiecărei activităti efectuate va fi tipărit pe factura. Probabil că "
 #~ "nu doriti să bifati această optiune."
+
+#~ msgid "Do you want to display work details on the invoice ?"
+#~ msgstr "Doriti sa afisati detaliile activitatii in factura ?"
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index b21307487e8..4aafe4e30da 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Счёт аналитики"
 msgid "Deadline"
 msgstr "Срок"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Счета к выставлению"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Расходы для выставления счетов"
@@ -928,11 +922,6 @@ msgstr "Дневной табель по счетам"
 msgid "Product"
 msgstr "Продукция"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1201,3 +1190,6 @@ msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Состояние"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Счета к выставлению"
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 26648b352c7..18f10cbaa31 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr "Proizvod"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index c0d37975eb9..6886337fbd2 100644
--- a/addons/hr_timesheet_invoice/i18n/sq.po
+++ b/addons/hr_timesheet_invoice/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index fea269e314b..bc3b739b2fd 100644
--- a/addons/hr_timesheet_invoice/i18n/sr@latin.po
+++ b/addons/hr_timesheet_invoice/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 845563c32e1..4363f9356a2 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgstr ""
 msgid "Product"
 msgstr "Product"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index 88bf366af02..8f11f9e1fe3 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 1a864d78bc6..61b06d4e524 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Analiz Hesabı"
 msgid "Deadline"
 msgstr "Son Teslim Tarihi"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Faturalanacak Maliyetler"
@@ -928,11 +922,6 @@ msgstr "Hesaba Göre Günlük Giriş Çıkış"
 msgid "Product"
 msgstr "Ürün"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index 824e4dbc17c..fc0efab1058 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "Аналітичний рахунок"
 msgid "Deadline"
 msgstr "Кінцевий термін"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Кошти для інвойсування"
@@ -928,11 +922,6 @@ msgstr "Щоденний табель за рахунками"
 msgid "Product"
 msgstr "Товар"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index 2eb159f1b8e..2f996cd4cc3 100644
--- a/addons/hr_timesheet_invoice/i18n/vi.po
+++ b/addons/hr_timesheet_invoice/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 4d3d61b3bdc..27d1cbd6809 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr "辅助核算项"
 msgid "Deadline"
 msgstr "截止日期"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "开发票"
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr "用户或者账簿名称"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "成本发票"
@@ -928,11 +922,6 @@ msgstr "辅助核算项每日计工单"
 msgid "Product"
 msgstr "产品"
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "未开票明细和开票税率"
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
@@ -1256,6 +1245,9 @@ msgstr "7天内的计工单"
 #~ msgid "Invoice analytic lines"
 #~ msgstr "发票辅助核算明细"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "未开票明细和开票税率"
+
 #, python-format
 #~ msgid "Balance product needed"
 #~ msgstr "需要结余产品"
@@ -1267,6 +1259,9 @@ msgstr "7天内的计工单"
 #~ msgid "Reactivate Account"
 #~ msgstr "重新激活"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "开发票"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "辅助核算项的最终发票"
 
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index c21cce96add..e959870c490 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -928,11 +922,6 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index be090dfcdbb..3462f6603c5 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,26 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <filter icon="terp-go-year" string="This Year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet lines in this year"/>
-                      <filter icon="terp-go-month" string="This Month"
-                          name="month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Timesheet lines in this month"/>
-                    <filter icon="terp-go-week"
-                              string="    7 Days    "
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                              help="Timesheet lines during last 7 days"/>
-                      <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection">
-                          <filter icon="terp-personal"
+                      <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
-                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="user_id" widget="selection"/>
                       <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="product_id"/>
+                      <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -162,13 +150,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
+                        <field name="name" string="Timesheet by users"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -298,14 +283,11 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -370,14 +352,11 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -408,7 +387,7 @@
         src_model="res.users"/>
 
         <act_window
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}"
             id="act_account_analytic_account_2_report_timehsheet_account"
             name="Timesheets"
             res_model="hr.analytic.timesheet"
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c196beae880..89d8fa1857e 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,13 +114,11 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
+                        <field name="name" string="Analytic Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="product_id"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="month"/>
                    </group>
                </search>
             </field>
@@ -135,10 +133,10 @@
         </record>
 
         <act_window
-        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-        context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
+        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False), ('journal_id.type', '=', 'general')]"
+        context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
         id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
-        name="Lines to Invoice"
+        name="Timesheet Lines to Invoice"
         res_model="account.analytic.line"
         src_model="account.analytic.account"/>
 
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 99ac6edc675..56c18c82b7a 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
@@ -38,7 +38,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="hr_timesheet.menu_hr_timesheet_reports" icon="STOCK_PRINT"/>
+        	parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
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 663fc9b58de..4c8915c558c 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
@@ -14,6 +14,7 @@
                 </header>
                 <notebook>
                     <page string="Billing Data">
+                       <group>
                        <group string="Do you want to show details of work in invoice?">
                            <field name="date"/>
                            <field name="time"/>
@@ -23,6 +24,11 @@
                        <group  string="Force to use a specific product">
                            <field name="product"/>
                        </group>
+                       <group colspan="4">
+                          <button special="cancel" string="Cancel" icon='gtk-cancel' colspan="1"/>
+                          <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
+                       </group>
+                       </group>
                     </page>
                 </notebook>
             </form>
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 74530b81859..2b165334739 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -2,30 +2,18 @@
 <openerp>
     <data>
 
-        <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
-            <field name="name">Timesheets</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_timesheet_sheet.sheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
-        </record>
-        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.sheet.graph</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
+            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
-                    <field name="date_from"/>
-                    <field name="user_id"/>
-                    <field name="department_id" invisible="1"/>
+                <graph orientation="horizontal" string="Available Attendance" type="bar">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time"/>
-                    <field name="total_timesheet" widget="float_time"/>
-                    <field name="state"/>
-                </tree>
+                    <field name="total_attendance" operator="+"/>
+                </graph>
             </field>
         </record>
+
         <record id="action_week_attendance_graph" model="ir.actions.act_window">
             <field name="name">My Total Attendances By Week</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
@@ -34,6 +22,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_timesheet_sheet.view_hr_timesheet_sheet_graph"/>
         </record>
+
         <record id="board_hr_week_attendace_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.sheet.form</field>
             <field name="model">board.board</field>
@@ -45,5 +34,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 3f42c5d19a3..e66694223d2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -14,7 +14,7 @@
         </record>
 
         <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
+            <field name="name">My Current Timesheet</field>
             <field eval="1" name="sequence"/>
             <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
             <field name="icon">STOCK_JUSTIFY_FILL</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cb658f46704..835b447592f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-       <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
-         <field name="name">hr.timesheet.sheet.graph</field>
-         <field name="model">hr_timesheet_sheet.sheet</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Timesheets" type="bar">
-                 <field name="name"/>
-                 <field name="total_attendance" operator="+"/>
-                 <field name="total_timesheet" operator="+"/>
-             </graph>
-         </field>
-        </record>
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -71,9 +59,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <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_form_readonly_hidden" string="Timesheet Period"/>
+                    <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
                     <h2>
                         From <field name="date_from"/>
                         to <field name="date_to"/>
@@ -111,7 +99,7 @@
                             <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">
                                     <field invisible="1" name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice" widget="selection"/>
@@ -167,11 +155,12 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
-                        <field name="date_from"/>
                         <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -238,7 +227,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="date" position="after">
+                <field name="user_id" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>
@@ -254,8 +243,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
-                <field name="action" position="after">
-                    <field name="sheet_id" />
+                <field name="employee_id" position="after">
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -341,17 +330,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.sheet.graph</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Attendance" type="bar">
-                    <field name="name"/>
-                    <field name="total_attendance" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 18026822a78..8d1493e11a4 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -185,6 +185,11 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"يفتح سجل الدوام الخاص بي  سجل دوامك بحيث يمكنك حجز نشاطاتك في النظام. من نفس "
+"الشكل، يمكنك تسجيل الحضور الخاص بك (تسجيل الدخول / خارج)، ووصف ساعات العمل "
+"يتم على مشاريع مختلفة. في نهاية المدة المحددة في الشركة، ويؤكد سجل الدوام من "
+"قبل المستخدم، ويمكن التحقق من صحتها من قبل مديره. إذا لزم الأمر، كما هو محدد "
+"في هذا المشروع، يمكنك إنشاء الفواتير بناء على سجل الدوام."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -236,7 +241,7 @@ msgstr "حساب تحليلي"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "# عدد"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -253,7 +258,6 @@ msgstr " شهر "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -341,7 +345,7 @@ msgstr "إجمالي الوقت"
 #: 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 "خطوط سجل الدوام"
+msgstr "خطوط الجدول الزمني"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -667,7 +671,7 @@ msgstr "يناير"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr "يسجل الموظف الدخول وسجيل الخروج."
+msgstr "يسجل الموظف الدخول وتسجيل الخروج."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -751,8 +755,8 @@ msgstr "يوم"
 #: 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 Timesheet"
-msgstr "سجل الدوام الخاص بي"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -820,6 +824,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * واستخدم الحالة \"مشروع\" عندما يقوم المستخدم بترميز سجل دوام جديد وغير "
+"مؤكد.\n"
+"* يتم استخدام الحالة \"مؤكد\" للتأكد من سجل الدوام من قبل المستخدم.\n"
+"* يتم استخدام الحالة \"تم\" عندما يتم قبول سجل الدوام للمستخدمين من قبل "
+"المدير له / لها."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -1079,9 +1088,55 @@ msgstr "يومية"
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "لايستطيع حذف السجلات التي تحتوي على مدخلات الحضور المرمزة !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "سجل الدوام الخاص بي"
+
 #~ msgid "No employee defined"
 #~ msgstr "لم يعرف الموظف"
 
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "لا يمكنك تكرير سجل الدوام !"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module helps you to easily encode and validate timesheet and "
+#~ "attendances\n"
+#~ "within the same view. The upper part of the view is for attendances and\n"
+#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
+#~ "\n"
+#~ "Other tabs contains statistics views to help you analyse your\n"
+#~ "time or the time of your team:\n"
+#~ "* Time spent by day (with attendances)\n"
+#~ "* Time spent by project\n"
+#~ "\n"
+#~ "This module also implements a complete timesheet validation process:\n"
+#~ "* Draft sheet\n"
+#~ "* Confirmation at the end of the period by the employee\n"
+#~ "* Validation by the project manager\n"
+#~ "\n"
+#~ "The validation can be configured in the company:\n"
+#~ "* Period size (day, week, month, year)\n"
+#~ "* Maximal difference between timesheet and attendances\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "هذه الوحدة تساعدك على تشفير بسهولة والتحقق من صحة سجل الدوام والحضور\n"
+#~ "ضمن وجهة النظر نفسها. الجزء العلوي من وجهة النظر هو الحضور و\n"
+#~ "المسار (في التوقيع / تسجيل الخروج) أحداث. الجزء السفلي هو لسجل الدوام.\n"
+#~ "\n"
+#~ "علامات تبويب أخرى تحتوي على إحصاءات وجهات النظر التي تساعدك على تحليل الخاصة "
+#~ "بك\n"
+#~ "مرة أو مرة في فريقك:\n"
+#~ "* الوقت الذي يقضيه اليوم (مع الحضور)\n"
+#~ "* الوقت الذي يقضيه مشروع\n"
+#~ "\n"
+#~ "هذه الوحدة أيضا بتنفيذ التحقق من صحة سجل الدوام  الكامل العملية:\n"
+#~ "* سجل المشروع\n"
+#~ "* تأكيد في نهاية الفترة من قبل الموظف\n"
+#~ "* التحقق من الصحة من قبل مدير المشروع\n"
+#~ "\n"
+#~ "يمكن تكوين المصادقة في الشركة:\n"
+#~ "* حجم الفترة (يوم في الاسبوع والشهر والسنة)\n"
+#~ "*اقصى اختلاف بين سجل الدوام والحضور\n"
+#~ "    "
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 3bd21af71dd..4c1cc6c1936 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr " Месец "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,8 +741,8 @@ msgstr "Ден"
 #: 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 Timesheet"
-msgstr "Моят график"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1042,5 +1041,8 @@ msgstr "Журнал"
 #~ msgid " Year "
 #~ msgstr " Година "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моят график"
+
 #~ msgid "By Day"
 #~ msgstr "По ден"
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index c5279ac5a1b..5503e49ded1 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-14 04:57+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 3ffa30ecfea..10197f69bd5 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -264,7 +264,6 @@ msgstr " Mes "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -769,8 +768,8 @@ msgstr "Dia"
 #: 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 Timesheet"
-msgstr "El meu full d'assistència"
+msgid "My Current Timesheet"
+msgstr "El meu full de serveis actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1088,9 +1087,6 @@ msgstr "Diari"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Full de serveis esborrany"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "El meu full de serveis actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Full de serveis validat"
 
@@ -1342,3 +1338,6 @@ msgstr "Diari"
 #~ msgstr ""
 #~ "No podeu crear un full d'assistència per a un treballador que no té cap "
 #~ "usuari definit !"
+
+#~ msgid "My Timesheet"
+#~ msgstr "El meu full d'assistència"
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 8d230847655..31600d54baf 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr "Den"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index d0b571595c5..d09cb027165 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,7 +742,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index adb4f796112..b7cbc2db114 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -267,7 +267,6 @@ msgstr " Monat "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -783,7 +782,7 @@ msgstr "Tag"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr "Meine Zeiterfassung"
 
 #. module: hr_timesheet_sheet
@@ -1107,9 +1106,6 @@ msgstr "Journal"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Entwurf Zeiterfassung Tabelle"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Meine Zeiterfassung"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Bestätigte Zeiterfassung"
 
@@ -1300,6 +1296,9 @@ msgstr "Journal"
 #~ msgid " Year "
 #~ msgstr " Jahr "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Meine Zeiterfassung"
+
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "Sie können Zeiterfassung nicht duplizieren!"
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 8fd0aab42ca..21aeac74b18 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -258,7 +258,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -748,8 +747,8 @@ msgstr "Ημέρα"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1060,9 +1059,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Πρόχειρο Φύλλο Xρόνου Eργασίας"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Επικυρωμένο Φύλλο Xρόνου Eργασίας"
 
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index e2df8d0b5d6..9a93be55c6c 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -128,7 +128,7 @@ msgstr "Basado en la hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Agrupar por día o fecha"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
@@ -144,7 +144,7 @@ msgstr "Validar"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprobada"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -221,7 +221,7 @@ msgstr "Hoja de servicios por día"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proyecto / cuenta analítica"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -265,7 +265,6 @@ msgstr " Mes "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -363,7 +362,7 @@ msgstr "Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Agrupar por mes o fecha"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -504,7 +503,7 @@ msgstr "Fichar/salir"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Esperando aprobación"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -530,7 +529,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -695,7 +694,7 @@ msgstr "Compañías"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -769,8 +768,8 @@ msgstr "Día"
 #: 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 Timesheet"
-msgstr "Mi hoja de asistencia"
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -821,7 +820,7 @@ msgstr "Abrir hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Agrupar por año de la fecha"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -913,7 +912,7 @@ msgstr "Mueve entradas de tarea a la línea de hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Asistencias totales"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -941,7 +940,7 @@ msgstr "Febrero"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1087,9 +1086,6 @@ msgstr "Diario"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Hoja de servicios validada"
 
@@ -1284,6 +1280,9 @@ msgstr "Diario"
 #~ "¡ No puede crear una hoja de asistencia para un empleado que no tiene ningún "
 #~ "usuario definido !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi hoja de asistencia"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index 821ddb62d71..9b2b9af6a88 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -744,8 +743,8 @@ msgstr "Día"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1053,9 +1052,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Define entrada hoja de servicios del empleado"
 
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index ad12c16c44a..65153383a9f 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-17 15:21+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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-02-18 04:58+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -267,7 +267,6 @@ msgstr " Mes "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -784,8 +783,8 @@ msgstr "Día"
 #: 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 Timesheet"
-msgstr "Mi hoja de asistencia"
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1082,6 +1081,9 @@ msgstr "Total"
 msgid "Journal"
 msgstr "Diario"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi hoja de asistencia"
+
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisar final del día que la comprobación del día está completa"
 
@@ -1109,9 +1111,6 @@ msgstr "Diario"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Hoja de servicios validada"
 
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index edbbe3915a3..9b02e085e3e 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,8 +741,8 @@ msgstr "Päev"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Minu käesolev tööajaleht"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1044,9 +1043,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Tööajalehe lehe mustand"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Minu käesolev tööajaleht"
-
 #~ msgid "Confirm timesheet sheet"
 #~ msgstr "Kinnita tööajalehe leht"
 
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 07c87b5c25f..ca28f3d498f 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -57,7 +57,7 @@ msgstr "Osasto"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Kuluvan vuoden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -85,12 +85,12 @@ msgstr "Maaliskuu"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#kulut"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Edellisen kuukauden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -127,13 +127,13 @@ msgstr "Perustuu tuntilistaan"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Ryhmittele viikonpäivän mukaan"
 
 #. 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 ""
+msgstr "Et voi muuttaa vientiä vahvistetussa tuntilistassa"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -143,7 +143,7 @@ msgstr "Vahvista"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Hyväksytty"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -162,6 +162,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, työntekijälle pitää ensin "
+"määritellä analyyttinen päiväkirja!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -202,7 +204,7 @@ msgstr " Kuukausi-1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Oman osaston tuntilista"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -212,7 +214,7 @@ msgstr "Tuntilista päivämäärän mukaan"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekti / Analyyttinen tili"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -256,7 +258,6 @@ msgstr " Kuukausi "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -354,7 +355,7 @@ msgstr "Tunnit"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Rymittele päivämäärän kuukauden mukaan"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -391,7 +392,7 @@ msgstr "Työskentele tehtävälle"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäinen"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -448,6 +449,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Luodaksesi tuntilistan tälle käyttäjälle, sinun pitää ensin linkittää "
+"työntekijä tuotteeseen, kuten 'konsultti'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -458,7 +461,7 @@ msgstr "Avaa nykyisen tuntilistasi"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Et voi kopioida tuntilistaa!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -484,6 +487,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Luodaksesi tuntilistan tälle käyttäjälle, sinun pitää ensin linkittää "
+"työntekijä tuotteeseen!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -493,7 +498,7 @@ msgstr "Kirjaudu sisään/ulos"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Odottaa hyväksyntää"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -516,7 +521,7 @@ msgstr "Sinun pitää valita nykyinen päivä joka on tuntilistalla !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Merkintä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -634,6 +639,8 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"2 tuntilistaa eivät voi olla päällekkäisiä!\n"
+"Ole hyvä ja käytä menuvalintaa 'oma tuntilista' välttääksesi tämän ongelman."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -655,6 +662,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"Tuntilistaa ei voida tarksitaa koska sisään ja uloskirjausten lukumäärä ei "
+"ole yhtäsuuri!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -674,7 +683,7 @@ msgstr "Yritykset"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "yhteenveto"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -682,6 +691,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"2 tuntilistaa eivät voi olla päällekkäisiä!\n"
+"Ole hyvä ja käytä menuvalintaa 'oma nykyinen tuntilista' välttääksesi tämän "
+"ongelman."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -692,7 +704,7 @@ msgstr "Tarkastamattomat tuntilistat"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
-msgstr ""
+msgstr "Et voi poistaa tuntilistaa jolla on läsnäolotapahtumia!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -703,7 +715,7 @@ msgstr "Määrä"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Et voi poistaa tuntilistaa joka on jo vahvistettu!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -714,7 +726,7 @@ msgstr "Yleinen tili"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Jakso johon tuntilistat vahvistetaan."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -748,7 +760,7 @@ msgstr "Päivä"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr "Oma tuntilista"
 
 #. module: hr_timesheet_sheet
@@ -764,7 +776,7 @@ msgstr "Tila on 'luonnos'."
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Et voi muuttaa vientiä vahvistetussa/valmiissa tuntilistassa!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -784,7 +796,7 @@ msgstr "Laskuta työtä"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Kuluvan kuukauden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -800,7 +812,7 @@ msgstr "Avaa tuntilista"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Ryhmittele vuoden päivän mukaan"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -833,7 +845,7 @@ msgstr "Hae tuntilistaa"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Vahvistetut tuntilistat"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -886,7 +898,7 @@ msgstr "Siirtää tehtävänsyötön tuntilistan riville"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Läsnäolo yhteensä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -914,7 +926,7 @@ msgstr "Helmikuu"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Yrityksen nimen pitää olla uniikki!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -955,17 +967,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, sinun pitää kytkeä työntekijä "
+"analyyttiseen päiväkirjaan kuten 'tuntilista'!"
 
 #. 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 ""
+msgstr "Et voi kirjautua sisään/ulos muulle kuin kuluvalle päivälle"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Lähetetty esimiehelle"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -985,6 +999,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, sinun täytyy yhdistää se "
+"käyttäjätunnukseen!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1060,9 +1076,6 @@ msgstr "Loki"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Vedosta tuntilistan taulukko"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Oma tuntilista"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Määrittää työntekijän tuntilistan kohteen"
 
@@ -1234,6 +1247,9 @@ msgstr "Loki"
 #~ msgid " Year "
 #~ msgstr " Vuosi "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Oma tuntilista"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 6210ffbbb49..511f417c225 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -44,7 +44,7 @@ msgstr "Regrouper par..."
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 msgid "Total Attendance"
-msgstr "Total des présences"
+msgstr "Total des pointages"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -56,7 +56,7 @@ msgstr "Département"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Feuille de temps de cette année"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -90,7 +90,7 @@ msgstr "Coût"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Feuille de temps du mois dernier"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -127,13 +127,14 @@ msgstr "Basé sur la feuille de temps"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grouper par jour"
 
 #. 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 ""
+"Vous ne pouvez pas modifier une entrée dans une feuille de temps confirmée !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -143,7 +144,7 @@ msgstr "Valider"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Approuvé"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -162,6 +163,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Pour créer une feuille de temps pour cet employé, vous devez assigner un "
+"journal analytique à l'employé !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -189,13 +192,14 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
-"Ma Feuille de temps ouvre une feuille de temps de façon à vous permettre de "
+"Ma feuille de temps ouvre une feuille de temps de façon à vous permettre de "
 "saisir vos activités dans le système. Sur le même formulaire, vous pouvez "
 "enregistrer vos présences (entrées/sorties) et décrire les heures de travail "
-"effectuées sur les différents projets. A la fin de la période définie par la "
-"société, la feuille de temps est confirmée par l'utilisateur et peut être "
-"validée par son responsable. Si nécessaire, et comme défini pour chaque "
-"projet, vous pouvez générer les factures en fonction des feuilles de temps."
+"effectuées et les imputer sur les différents projets.\r\n"
+"A la fin de la période définie par la société, la feuille de temps est "
+"confirmée par l'utilisateur et peut être validée par son responsable. Si "
+"nécessaire, et comme défini pour chaque projet, vous pouvez générer les "
+"factures en fonction des feuilles de temps."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -210,17 +214,17 @@ msgstr " Mois -1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Les feuilles de temps de mon département"
 
 #. 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 "Feuilles de Présence par Jour"
+msgstr "Feuilles de temps par jour"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projet /Compte analytique"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -264,7 +268,6 @@ msgstr " Mois "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -291,7 +294,7 @@ msgstr "Confirmer"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Lignes des feuilles de présence"
+msgstr "Lignes des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -362,7 +365,7 @@ msgstr "Heures"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Regrouper par mois"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -401,7 +404,7 @@ msgstr "Travaille sur une tâche"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Quotidien"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -414,7 +417,7 @@ msgstr "Quantité"
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Total des feuilles de présence"
+msgstr "Total des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -458,6 +461,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez lier le "
+"salarié à un produit (par exemple : consultant) !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -468,7 +473,7 @@ msgstr "Ceci ouvrira votre feuille de temps actuelle"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Vous ne pouvez pas dupliquer une feuille de temps !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -494,6 +499,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez lier le "
+"salarié à un produit !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -503,7 +510,7 @@ msgstr "Pointer l'entrée / la sortie"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "En attente d'approbation"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -529,7 +536,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -601,7 +608,7 @@ msgstr ""
 #: 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 "Feuilles de présence par période"
+msgstr "Feuilles de temps par période"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -613,7 +620,7 @@ msgstr "Utilisateur"
 #. 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 "Feuilles de Présence par Compte"
+msgstr "Feuilles de temps par compte"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -654,6 +661,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Vous ne pouvez pas avoir 2 feuilles de temps qui se chevauchent (date de fin "
+"de la 1ère postérieure à la date de début de la seconde par exemple)!\n"
+"Vous devez utiliser le menu «Mes feuilles de temps» pour éviter ce problème."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -678,6 +688,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"La feuille de temps ne peut pas être validée car elle ne contient pas un "
+"nombre égal de pointages 'Entrée' et de de pointages 'Sortie'!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -697,7 +709,7 @@ msgstr "Sociétés"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -705,17 +717,22 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Vous ne pouvez pas avoir 2 feuilles de temps qui se chevauchent (date de fin "
+"de la 1ère postérieure à la date de début de la seconde par exemple)!\n"
+"Vous devez utiliser le menu «Mes feuilles de temps» pour éviter ce problème."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Feuilles de temps non validés"
+msgstr "Feuilles de temps non validées"
 
 #. 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 ""
+"Vous ne pouvez pas supprimer une feuille de temps  qui contient des "
+"pointages !"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -727,6 +744,7 @@ msgstr "Quantité"
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
 msgstr ""
+"Vous ne pouvez pas supprimer une feuille de temps qui est déjà confirmée !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -737,7 +755,7 @@ msgstr "Compte général"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Période pour laquelle vous pouvez valider vos feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -750,9 +768,9 @@ 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 ""
-"Différence autorisée entre les heures de pointage en entrée/sortie et le "
-"calcul de la feuille de temps pour une feuille. Mettez \"0\" si vous ne "
-"souhaitez aucun contrôle."
+"Différence autorisée entre les heures de présence (pointage en "
+"entrée/sortie) et les temps saisis et imputés pour une feuille. Mettez \"0\" "
+"si vous ne souhaitez aucun contrôle."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -772,8 +790,8 @@ msgstr "Jour"
 #: 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 Timesheet"
-msgstr "Ma feuille de temps"
+msgid "My Current Timesheet"
+msgstr "Ma Feuille de Présence actuelle"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -789,6 +807,8 @@ msgstr "L'état est 'Brouillon'"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Les relevés confirmés/terminés d'une feuille de temps ne peuvent plus être "
+"modifiés !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -808,12 +828,12 @@ msgstr "Facturé sur le réalisé"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Feuilles de temps de ce mois"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Feuille de présence par compte"
+msgstr "Feuille de temps par compte"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
@@ -824,7 +844,7 @@ msgstr "Ouvrir les feuilles de temps"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Regrouper par année"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -863,7 +883,7 @@ msgstr "Rechercher dans les feuilles de temps"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Feuilles de temps confirmées"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -916,7 +936,7 @@ msgstr "Reporte la saisie de la tâche sur une ligne de la feuille de temps"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total des présences"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -944,7 +964,7 @@ msgstr "Février"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -985,17 +1005,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez affecter le "
+"salarié à un journal analytique, comme 'Timesheet'!"
 
 #. 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 ""
+msgstr "Vous ne pouvez pas pointer pour un autre jour qu'aujourd'hui"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Soumettre au responsable"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1015,6 +1037,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez le lier à un "
+"utilisateur !"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1076,9 +1100,6 @@ msgstr "Journal"
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Définir l'écriture de la feuille de temps de l'employé"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Ma Feuille de Présence actuelle"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Feuille de temps validée"
 
@@ -1258,6 +1279,9 @@ msgstr "Journal"
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Impossible de supprimer une feuille qui a des saisies de présence !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Ma feuille de temps"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module helps you to easily encode and validate timesheet and "
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index e54f7c0c1b5..e69b5c85f89 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr "Dan"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 70ba5d24f82..ae27ef19b88 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -272,7 +272,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -761,7 +760,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index aeddf35ef58..070b7bb4401 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -264,7 +264,6 @@ msgstr " Hónap "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -770,8 +769,8 @@ msgstr "Nap"
 #: 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 Timesheet"
-msgstr "Munkaidő-kimutatásom"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1108,6 +1107,9 @@ msgstr "Napló"
 #~ "Nem lehet két egymást átfedő munkaidő-kimutatása!\n"
 #~ "Kérem, használja a Munkaidő-kimutatásom menüpontot a probléma elkerüléséhez."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Munkaidő-kimutatásom"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create a timesheet for an employee that does not have any user "
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 35890fecea9..aefcdd8fc70 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 92aea2b7eca..fd3bdd7c87b 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -256,7 +256,6 @@ msgstr " Mese "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -753,8 +752,8 @@ msgstr "Giorno"
 #: 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 Timesheet"
-msgstr "Il mio Timesheet"
+msgid "My Current Timesheet"
+msgstr "I Miei Orari di Lavoro attuali"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1047,9 +1046,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Bozza foglio ore"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "I Miei Orari di Lavoro attuali"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Convalida il foglio lavoro"
 
@@ -1248,6 +1244,9 @@ msgstr ""
 #~ msgid " Year "
 #~ msgstr " Anno "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Il mio Timesheet"
+
 #, python-format
 #~ msgid "You can not sign in from an other date than today"
 #~ msgstr "Non è possibile registrare una entrata in un giorno diverso da oggi"
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index 0a4c608c839..4e14d2c2bc0 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -257,7 +257,6 @@ msgstr " 月 "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -753,8 +752,8 @@ msgstr "日"
 #: 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 Timesheet"
-msgstr "私の勤務表"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1039,4 +1038,7 @@ msgstr "合計"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr "仕訳"
+msgstr "仕訳帳"
+
+#~ msgid "My Timesheet"
+#~ msgstr "私の勤務表"
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index 4e96b0ebaeb..8b89348700c 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,8 +742,8 @@ msgstr ""
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "내 현재 일정"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1143,9 +1142,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "일정표 초안"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "내 현재 일정"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "직원의 일정 엔트리 정의"
 
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 8421a3588b7..d8453de4948 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,8 +741,8 @@ msgstr "Diena"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mano dabartinis darbo laiko žiniaraštis"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1030,9 +1029,6 @@ msgstr ""
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Mano darbo laiko žiniaraščiai laukiantys patvirtinimo"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mano dabartinis darbo laiko žiniaraštis"
-
 #~ msgid "Project Timesheet"
 #~ msgstr "Projekto darbo laiko žiniaraštis"
 
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index e5255a83e58..83668529a3e 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,7 +742,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 9b6acf24294..0a5ff7bc896 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -277,7 +277,6 @@ msgstr " Сар "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -776,8 +775,8 @@ msgstr "Өдөр"
 #: 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 Timesheet"
-msgstr "Өөрийн цагийн хуудас"
+msgid "My Current Timesheet"
+msgstr "Өөрийн одоогийн цаг бүртгэл"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1098,9 +1097,6 @@ msgstr "Журнал"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Цаг бүртгэлийн ноорог хүснэгт"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Өөрийн одоогийн цаг бүртгэл"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Ажилтны цаг бүртгэлийн мөрийг тодорхойлно"
 
@@ -1274,6 +1270,9 @@ msgstr "Журнал"
 #~ msgid " Year "
 #~ msgstr " Жил "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Өөрийн цагийн хуудас"
+
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which are already confirmed !"
 #~ msgstr "Хэдийн батлагдсан цаг бүртгэлийг устгаж болохгүй."
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index 3478162f409..fa515565ab9 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -32,7 +32,7 @@ msgstr "Service"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "Geen medewerker gedefinieerd voor uw gebruiker!"
+msgstr "Geen werknemer gedefinieerd voor uw gebruiker!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -238,7 +238,7 @@ msgstr "Waarschuwing !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr "Invullen urenstaat door medewerker"
+msgstr "Invullen urenstaat door werknemer"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -266,7 +266,6 @@ msgstr " Maand "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -314,7 +313,7 @@ msgstr "Status is 'bevestigd'."
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Medewerker"
+msgstr "Werknemer"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -521,7 +520,7 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
-"De urenstaatregel toont de gewerkte tijd door een medewerker aan een "
+"De urenstaatregel toont de gewerkte tijd door een werknemer aan een "
 "specifieke dienst."
 
 #. module: hr_timesheet_sheet
@@ -543,8 +542,8 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
-"Dit overzicht doet analyse op urenstaten van personeel in het systeem. Het "
-"geeft u een volledig overzicht van de invoer van uw medewerkers. U kunt "
+"Dit overzicht doet analyse op urenstaten van werknemers in het systeem. Het "
+"geeft u een volledig overzicht van de invoer van uw werknemers. U kunt "
 "groeperen en zoeken op specifieke selectiecriteria."
 
 #. module: hr_timesheet_sheet
@@ -645,7 +644,7 @@ msgstr "U kunt niet wijzigen in een bevestigde urenstaat !"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "My totale aanwezigheid op week"
+msgstr "Mijn totale aanwezigheid per week"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -681,7 +680,7 @@ msgid ""
 "sign ins and sign outs!"
 msgstr ""
 "Deze urenstaat kan niet worden gecontroleerd, omdat deze geen gelijke "
-"hoeveelheid aan- en uitmeldingen heeft!"
+"hoeveelheid inklok- en uitklokkingen heeft!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -691,7 +690,7 @@ msgstr "Januari"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr "De medewerker klokt in en klokt uit."
+msgstr "De werknemer klokt in en klokt uit."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -780,8 +779,8 @@ msgstr "Dag"
 #: 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 Timesheet"
-msgstr "Mijn urenverantwoording"
+msgid "My Current Timesheet"
+msgstr "Mijn huidige urenstaat"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -901,7 +900,7 @@ msgstr "Omschrijving"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr "De medewerker bevestigt periodiek zijn eigen urenstaten."
+msgstr "De werknemer bevestigt periodiek zijn eigen urenstaten."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -959,7 +958,7 @@ msgstr "De naam van het bedrijf moet uniek zijn!"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr "Medewerkers"
+msgstr "Werknemers"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -979,7 +978,7 @@ msgstr "Bevestiging"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "Facturatiesnelheid"
+msgstr "Factuur tarief"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -1030,7 +1029,7 @@ msgid ""
 "user!"
 msgstr ""
 "Om een urenstaat te kunnen aanmaken voor een werknemer, dient u een "
-"werknemer aan een gebruiker te koppelen!"
+"werknemer aan een gebruiker toe te wijzen!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1140,9 +1139,6 @@ msgstr "Dagboek"
 #~ msgid "You must select a Current date wich is in the timesheet dates !"
 #~ msgstr "U dient een Huidige datum te kiezen die binnen de urenstaat valt!"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mijn huidige urenstaat"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Definieërt invullen van urenstaten"
 
@@ -1293,6 +1289,9 @@ msgstr "Dagboek"
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "U kunt een urenstaat niet dupliceren !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mijn urenverantwoording"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index a527e0a9d35..9b0341e192a 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 4c05699f725..055380692ef 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -194,7 +194,7 @@ msgstr "Suma różnic"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Miesiąc-1 "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -209,7 +209,7 @@ msgstr "Karta czasu pracy wg dni"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Konto projektu / analityczne"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -253,7 +253,6 @@ msgstr " Miesiąc "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -351,7 +350,7 @@ msgstr "Godziny"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupuj według miesiąca"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -423,7 +422,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -744,8 +743,8 @@ msgstr "Dzień"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Moja bieżąca karta czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1055,9 +1054,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Projekt zestawień kart czasu pracy"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Moja bieżąca karta czasu pracy"
-
 #~ msgid "Defines the task work entry into timesheet line"
 #~ msgstr "Definiuje pracę zadania do pozycji karty czasu pracy"
 
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index f8bfcce58a6..6d75d35fccd 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -26,13 +26,13 @@ msgstr "Folha"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. 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 "Nenhum funcionário definifo para o seu utilizador !"
+msgstr "Nenhum funcionário definido para o seu utilizador !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -56,12 +56,12 @@ msgstr "Departamento"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Folha de horas no ano atual"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Tarefas da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -84,12 +84,12 @@ msgstr "Março"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#Cost"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Folha de horas do último mês"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -106,12 +106,12 @@ msgstr "Empresa"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Horário"
+msgstr "Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr "Definir como esboço"
+msgstr "Definir como Rascunho"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
@@ -121,18 +121,18 @@ msgstr "Data para"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Baseado na Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grupo por dia da data"
 
 #. 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 ""
+msgstr "Não pode modificar uma entrada numa folha de horas confirmada!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -142,7 +142,7 @@ msgstr "Validar"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprovado"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -152,7 +152,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr "Custo total"
+msgstr "Custo Total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
@@ -161,6 +161,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir o "
+"funcionário a um diário analítico!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -175,6 +177,7 @@ msgstr "Recusar"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Não pode inserir uma data de atendimento fora da folha de horas atual!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -186,6 +189,12 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"A Folha de Horas abre os horários de maneira a que se possa reservar as "
+"atividades no sistema. Da mesma forma, pode registar o comparecimento (Sign "
+"In/Out) e descrever as horas de trabalho feitas em diferentes projetos. No "
+"final do período definido na empresa, a folha de horas é confirmada pelo "
+"utilizador e pode ser validada pelo responsável . Se necessário, conforme "
+"definido no projeto, pode gerar as faturas com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -195,22 +204,22 @@ msgstr "Diferença total"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mês-1 "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Folha de horas por 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 "Horário por dia"
+msgstr "Folha de Horas por dia"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projeto / Conta Analítica"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -226,18 +235,18 @@ msgstr "Aviso !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Entrada na Folha de Horas dos Funcionários"
 
 #. 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 "Conta da Contabilidade Analítica"
+msgstr "Conta Analítica"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Nbr"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -254,11 +263,10 @@ msgstr " Mês "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Horários"
+msgstr "Folhas de Horas"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -281,12 +289,12 @@ msgstr "Confirmar"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Linhas do horário"
+msgstr "Linhas da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivamente."
+msgstr "Erro! Não pode criar empresas recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
@@ -302,7 +310,7 @@ msgstr "O estado é 'confirmado'."
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Empregado"
+msgstr "Funcionário"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -313,7 +321,7 @@ msgstr "Novo"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "Total de Atendimentos por Semana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -336,13 +344,13 @@ msgstr "Erro !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr "Tempo total"
+msgstr "Tempo 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 "Linhas de horário"
+msgstr "Linhas da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -352,24 +360,25 @@ msgstr "Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupo por mês da data"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr "Erro: Entrada (Saída) deve ser seguida de Saída (Entrada)"
+msgstr ""
+"Erro: Sign In (resp. Sign Out) deve ser seguida de Sign Out(resp. Sign In)"
 
 #. 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 "Acção inválida !"
+msgstr "Ação Inválida!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr "O gestor de projeto valida as folhas"
+msgstr "O gestor de projeto valida as folhas de horas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -384,17 +393,17 @@ msgstr "Configuração"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Tarefa de Trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Diariamente"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Quantity"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -402,27 +411,27 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Horário total"
+msgstr "Folha de Horas total"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Atendimento disponível"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr "Entrar"
+msgstr "Sign In"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "#Total Timesheet"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -446,17 +455,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve ligar o "
+"funcionário a um artigo, como 'consultor'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Isto vai abrir a Folha de Horas Atual"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Não pode duplicar uma folha de horas!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -468,12 +479,12 @@ msgstr "Mês"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "#Total Diff"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Em rascunho"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
@@ -482,16 +493,18 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve ligar o "
+"funcionário a um artigo!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Sign In/Out"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Aprovação em espera"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -504,16 +517,20 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"A linha da folha de horas representa o tempo gasto pelo Funcionário num "
+"determinado serviço prestado."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
+"É necessário que selecione a data atual que está nas datas da folha de horas "
+"!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -523,26 +540,30 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Este relatório faz análises sobre as folhas de horas criadas pelos recursos "
+"humanos no sistema. Ele permite que se tenha uma visão completa das entradas "
+"feitas pelos Funcionários. Pode agrupá-los por critérios de seleção "
+"específicos graças à ferramenta de busca."
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Draft"
-msgstr "Esboço"
+msgstr "Rascunho"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Diferença permitida na folha de horas(Horas)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "A fatura é criada com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Rascunho da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -567,19 +588,19 @@ msgstr "Junho"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr "Estado actual"
+msgstr "Estado atual"
 
 #. 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 "Não pode modificar um movimento em um horário confirmado !"
+msgstr "Não pode modificar um movimento numa folha de horas confirmada !"
 
 #. 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 ""
+msgstr "Folha de Horas por Período"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -591,7 +612,7 @@ msgstr "Utilizador"
 #. 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 "Horário por conta"
+msgstr "Folha de Horas por conta"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -606,23 +627,23 @@ msgstr "Novembro"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Avançados..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Série da Folha de Horas"
 
 #. 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 "Não pode modificar um movimento em um horário confirmado !"
+msgstr "Não pode modificar um movimento numa folha de horas confirmada !"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Total de Presenças por Semana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -631,6 +652,8 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Não pode ter 2 folhas de horas que se sobrepõem!\n"
+"Deve usar 'A Minha Folha de Horas' no menu para evitar este problema."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -644,6 +667,9 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
+"Verifique a folha de horas por um período específico. Também pode codificar "
+"o tempo gasto num projeto (ou seja, uma conta analítica) gerando custos na "
+"conta analítica em causa."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
@@ -652,6 +678,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"A folha de horas não pode ser validada como ele não contém um número igual "
+"de sign ins e sign outs!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -661,7 +689,7 @@ msgstr "Janeiro"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "O funcionário signs in e signs out."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -671,7 +699,7 @@ msgstr "Empresas"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Sumário"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -679,17 +707,21 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Não pode ter 2 folhas de horas que se sobrepõem!\n"
+"Por favor, use no menu 'As Minhas Folhas de Horas Atuais 'para evitar este "
+"problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Horários não validados"
+msgstr "Folhas de Horas não validadas"
 
 #. 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 ""
+"Não pode excluir uma folha de horas que tenha entradas de atendimento!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -700,23 +732,23 @@ msgstr "Quantidade"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Não pode eliminar uma folha de horas que já tenha sido confirmada!"
 
 #. 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 "Conta geral"
+msgstr "Conta Geral"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Periodicidade para validar as suas folhas de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Search Account"
-msgstr ""
+msgstr "Pesquisar Conta"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -724,6 +756,8 @@ 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 ""
+"Diferença permitida em horas entre o sign in/out e o cálculo da folha de "
+"horas para uma folha. Ajustar para 0 se não quiser nenhum controlo."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -743,8 +777,8 @@ msgstr "Dia"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Meu horário actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -760,6 +794,7 @@ msgstr "O estado é 'rascunho'."
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Não pode modificar uma entrada num folha de horas Confirmada / Concluída!."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -774,28 +809,28 @@ msgstr "Validado"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr "Factura de Trabalho"
+msgstr "Fatura de Trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Folha de horas do mês atual"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Horário por contas"
+msgstr "Folha de Horas por contas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Abrir Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Grupo por ano da data"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -812,41 +847,47 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * O estado 'Rascunho' é usado quando um utilizador está a registar uma "
+"folha de horas nova e não confimada                 \n"
+"* O estado 'Confirmado' é utilizado para confirmar a folha de horas pelo "
+"utilizador.                 \n"
+"* O estado 'Concluído' é utilizado quando a folha de horas do utilizador é "
+"aceite pelo seu/sua superior."
 
 #. 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 ""
+msgstr "Análise da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Pesquisar Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Folhas de horas confirmadas"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha Horário"
+msgstr "Linha da Folha de Horas"
 
 #. 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 "Produto"
+msgstr "Artigo"
 
 #. 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 "Presenças"
+msgstr "Pontualidade"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
@@ -856,7 +897,7 @@ msgstr "Descrição"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "O Funcionário periodicamente confirma a sua própria folha de horas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -866,7 +907,7 @@ msgstr "Maio"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Define as tarefas do sumário de trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -876,18 +917,18 @@ msgstr "Sair"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Movimentos de entrada da tarefa na linha da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total de Atendimentos"
 
 #. 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 ""
+msgstr "Análise da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -899,7 +940,7 @@ msgstr "Diferença"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr "Ausente"
+msgstr "Falta"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -909,17 +950,17 @@ msgstr "Fevereiro"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr "Empregados"
+msgstr "Funcionários"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informação do tempo gasto num serviço"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -934,7 +975,7 @@ msgstr "Confirmação"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "Taxa da factura"
+msgstr "Taxa da Fatura"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -950,17 +991,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir o "
+"funcionário a um diário analítico, como a 'Folha de Horas'!"
 
 #. 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 ""
+msgstr "Não pode signin / signout duma data diferente da de hoje"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Submetido ao Gestor"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -970,7 +1013,7 @@ msgstr "Conta da Contabilidade analítica"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr "Tipo de fatura"
+msgstr "Tipo de Faturação"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
@@ -980,11 +1023,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir um "
+"utilizador!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "#Total Attendance"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -995,12 +1040,12 @@ msgstr "Custo"
 #: field:hr_timesheet_sheet.sheet,date_current:0
 #: field:timesheet.report,date_current:0
 msgid "Current date"
-msgstr "Data actual"
+msgstr "Data atual"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Folha de Horas dos Recursos Humanos"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1034,9 +1079,6 @@ msgstr "Diário"
 #~ msgid "Timeshet range"
 #~ msgstr "Escala do horário"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Meu horário actual"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
@@ -1050,9 +1092,6 @@ msgstr "Diário"
 #~ msgid "Project Timesheet"
 #~ msgstr "Horário do projecto"
 
-#~ msgid "No employee defined"
-#~ msgstr "Nenhum empregado definido"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura de vista"
 
@@ -1109,14 +1148,6 @@ msgstr "Diário"
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisão do fim de dia verificado o dia esta completo"
 
-#, python-format
-#~ msgid ""
-#~ "You can not have 2 timesheets that overlaps !\n"
-#~ "Please use the menu 'My Current Timesheet' to avoid this problem."
-#~ msgstr ""
-#~ "Não pode ter 2 horários que coincidam !\n"
-#~ "Por favor use o menu 'Meu Horario Actual' para evitar este problema."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da acção."
 
@@ -1130,10 +1161,6 @@ msgstr "Diário"
 #~ msgstr ""
 #~ "Precisa seleccionar uma data Actual que esteja nas datas do horário !"
 
-#, python-format
-#~ msgid "You can not sign in from an other date than today"
-#~ msgstr "Não pode registrar-se a partir de outra data que não hoje"
-
 #~ msgid "Phone call encoding"
 #~ msgstr "Chamada Telefónica codificada"
 
@@ -1233,13 +1260,93 @@ msgstr "Diário"
 #~ msgid "My Department's Timesheet to Validate"
 #~ msgstr "Horário do Meu Departamento para Validar"
 
+#~ msgid " Year "
+#~ msgstr " Ano "
+
+#, python-format
+#~ msgid ""
+#~ "You can not have 2 timesheets that overlaps !\n"
+#~ "Please use the menu 'My Current Timesheet' to avoid this problem."
+#~ msgstr ""
+#~ "Não pode ter 2 Folhas de horas que se sobrepõem! \n"
+#~ "Por favor, use 'My Current Timesheet' no menu para evitar este problema."
+
+#, python-format
+#~ msgid "You can not sign in from an other date than today"
+#~ msgstr "Não pode registar-se a partir de outra data tem que ser a de hoje"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module helps you to easily encode and validate timesheet and "
+#~ "attendances\n"
+#~ "within the same view. The upper part of the view is for attendances and\n"
+#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
+#~ "\n"
+#~ "Other tabs contains statistics views to help you analyse your\n"
+#~ "time or the time of your team:\n"
+#~ "* Time spent by day (with attendances)\n"
+#~ "* Time spent by project\n"
+#~ "\n"
+#~ "This module also implements a complete timesheet validation process:\n"
+#~ "* Draft sheet\n"
+#~ "* Confirmation at the end of the period by the employee\n"
+#~ "* Validation by the project manager\n"
+#~ "\n"
+#~ "The validation can be configured in the company:\n"
+#~ "* Period size (day, week, month, year)\n"
+#~ "* Maximal difference between timesheet and attendances\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo ajuda facilmente a codificar e validar folhas de horas e "
+#~ "atendimentos\n"
+#~ "dentro da mesma opinião. A parte superior do ponto de vista é para "
+#~ "atendimentos e\n"
+#~ "procura (sign in/sign out) de eventos. A parte inferior é para a folha de "
+#~ "horas.\n"
+#~ "\n"
+#~ "Outras guias contém estatísticas vista para ajudá-lo a analisar o seu\n"
+#~ "tempo ou o tempo da sua equipa:\n"
+#~ "* Tempo gasto por dia (com atendimentos)\n"
+#~ "* Tempo gasto no projecto\n"
+#~ "\n"
+#~ "Este módulo também implementa a folha de horas completa para validação do "
+#~ "processo:\n"
+#~ "* Folha de Rascunho\n"
+#~ "* Confirmação, no final do período pelo funcionário\n"
+#~ "* Validação pelo gestor do projecto\n"
+#~ "\n"
+#~ "A validação pode ser configurada na empresa:\n"
+#~ "* Tamanho Período (dia, semana, mês, ano)\n"
+#~ "* Diferença máxima entre as folhas de horas e os atendimentos\n"
+#~ "    "
+
+#, python-format
+#~ msgid "You cannot duplicate a timesheet !"
+#~ msgstr "Não pode duplicar uma folha de Horas !"
+
+#~ msgid "No employee defined"
+#~ msgstr "Nenhum Funcionário definido"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create a timesheet for an employee that does not have any user "
 #~ "defined !"
 #~ msgstr ""
-#~ "Não se pode criar uma folha para um empregado que não tenha um utilizador "
+#~ "Não se pode criar uma folha para um Funcionário que não tenha um utilizador "
 #~ "associado!"
 
-#~ msgid " Year "
-#~ msgstr " Ano "
+#~ msgid "My Timesheet"
+#~ msgstr "A Minha Folha de Horas"
+
+#, python-format
+#~ msgid ""
+#~ "The timesheet cannot be validated as it does not contain equal no. of sign "
+#~ "ins and sign outs!"
+#~ msgstr ""
+#~ "A Folha de Horas não pode ser validada visto que o número de entradas e "
+#~ "saídas não coincide"
+
+#, python-format
+#~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+#~ msgstr "?!?!?!?!?!?!?!?!?!?Não é possível eliminar Folha(s) que têm  !"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index c8835ffd0b4..3fba221abfd 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr " Mês "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -746,7 +745,7 @@ msgstr "Dia"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index dd4585a4d71..4fa54be0f76 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -38,13 +38,13 @@ msgstr "Nici un angajat nu este definit pentru utilizatorul dumneavoastra !"
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. 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 "Prezenta totală"
+msgstr "Total Prezenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -56,12 +56,12 @@ msgstr "Departament"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Fise de pontaj in anul curent"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr "Activitate foaie de pontaj"
+msgstr "Fisa de pontaj activitate"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -74,7 +74,7 @@ msgstr "Astazi"
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
-"Va rugam sa verificati ca diferenta totala a foii sa fie mai mica de %.2f !"
+"Va rugam sa verificati ca diferenta totala a fisei sa fie mai mica de %.2f !"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -89,14 +89,14 @@ msgstr "#Cost"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Fisele de pontaj din ultima luna"
 
 #. 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 "Companie"
+msgstr "Compania"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -106,12 +106,12 @@ msgstr "Companie"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Foaie de pontaj"
+msgstr "Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr "Setare pe Ciorna"
+msgstr "Setati ca ciorna"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
@@ -121,28 +121,28 @@ msgstr "Data pana la"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr "Bazat pe foaia de pontaj"
+msgstr "Bazat pe fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grupati dupa ziua datei"
 
 #. 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 ""
+msgstr "Nu puteti modifica o inregistrare dintr-o fisa de pontaj confirmata!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr "Validare"
+msgstr "Validati"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprobat(a)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -161,12 +161,14 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa atribuiti "
+"angajatul unui jurnal analitic!"
 
 #. 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 "Refuz"
+msgstr "Refuzati"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -175,7 +177,7 @@ msgstr "Refuz"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Nu puteti introduce o data a prezentei care sa depaseasca datele foii de "
+"Nu puteti introduce o data a prezentei care sa depaseasca datele fisei de "
 "pontaj curente!"
 
 #. module: hr_timesheet_sheet
@@ -188,18 +190,18 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
-"'Foaia mea de pontaj' deschide foile dumneavoastra de pontaj astfel incat "
+"'Fisa mea de pontaj' deschide fisele dumneavoastra de pontaj astfel incat "
 "puteti sa va inscrieti activitatile in sistem. Din acelasi formular, puteti "
 "sa va inregistrati prezenta (Intrare/Iesire) si sa descrieti orele de lucru "
-"la diferite proiecte. La sfarsitul perioadei definite in companie, foaia de "
+"la diferite proiecte. La sfarsitul perioadei definite in companie, fisa de "
 "pontaj este confirmata de catre utilizator si poate fi validata de catre "
 "managerul sau. Daca este necesar, asa cum este definit in proiect, puteti "
-"genera facturi bazate pe foaia de pontaj."
+"genera facturi bazate pe fisa de pontaj."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "Total Diferenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -209,17 +211,17 @@ msgstr " Luna-1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Fisele de pontaj ale Departamentului meu"
 
 #. 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 ""
+msgstr "Fise de pontaj dupa Zi"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proiect / Cont Analitic"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -230,12 +232,12 @@ msgstr "Validare"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
 #, python-format
 msgid "Warning !"
-msgstr "Avertisment !"
+msgstr "Avertizare !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr "Inregistrare foaie de pontaj angajat"
+msgstr "Inregistrarea fisei de pontaj a angajatului"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -263,17 +265,16 @@ msgstr " Luna "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. 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 "Confirmat"
+msgstr "Confirmat(a)"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
@@ -290,7 +291,7 @@ msgstr "Confirmati"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Linii foaie de pontaj"
+msgstr "Linii fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -317,12 +318,12 @@ msgstr "Angajat"
 #: selection:hr_timesheet_sheet.sheet,state:0
 #: selection:timesheet.report,state:0
 msgid "New"
-msgstr "Nou"
+msgstr "Nou(a)"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr "Prezentele mele totale pe Saptamana"
+msgstr "Prezentele mele Totale dupa Saptamana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -345,13 +346,13 @@ msgstr "Eroare !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr "Timpul Total"
+msgstr "Total Ore"
 
 #. 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 "Linii foaie de pontaj"
+msgstr "Linii Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -361,7 +362,7 @@ msgstr "Ore"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupeaza dupa luna datei"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -375,12 +376,12 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "Invalid action !"
-msgstr "Actiune invalida !"
+msgstr "Actiune nevalida !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr "Managerul de proiect valideaza foile de pontaj."
+msgstr "Managerul de proiect valideaza fisele de pontaj."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -400,7 +401,7 @@ msgstr "Lucrul la activitate"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Zilnic"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -413,7 +414,7 @@ msgstr "#Cantitate"
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Total foaie de pontaj"
+msgstr "Total fise de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -428,13 +429,12 @@ msgstr "Intrare"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr "#Total Foaie de pontaj"
+msgstr "#Total Fise de pontaj"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
-"hr.timesheet.current.open (resurse umane.foaie de pontaj.curenta.deschide)"
+msgstr "ru.deschide.fisa de pontaj.curenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -458,17 +458,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa il conectati "
+"la un produs, precum 'Consultant'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr "Va deschie foaia dumneavoastra de pontaj curenta"
+msgstr "Va deschie fisa dumneavoastra de pontaj curenta"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Nu puteti copia o fisa de pontaj!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -494,6 +496,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa conectati "
+"angajatul la un produs!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -503,7 +507,7 @@ msgstr "Intrare/Iesire"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Asteapta aprobare"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -516,19 +520,20 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
-"Linia foii de pontaj reprezinta timpul petrecut de catre angajat la un "
+"Linia fisei de pontaj reprezinta timpul petrecut de catre angajat la un "
 "anumit serviciu furnizat."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
-"Trebuie sa selectati o data curenta care sa existe in datele foii de pontaj !"
+"Trebuie sa selectati o data curenta care sa existe in datele fisei de pontaj "
+"!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -538,7 +543,7 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
-"Acest raport efectueaza analiza foilor de pontaj create de catre resursele "
+"Acest raport efectueaza analiza fiselor de pontaj create de catre resursele "
 "umane in sistem. Va permite sa aveti o privire de ansamblu completa asupra "
 "tuturor inregistrarilor efectuate de catre angajatii dumneavoastra. Le "
 "puteti grupa dupa criterii specifice de selectie multumita uneltei de "
@@ -552,17 +557,17 @@ msgstr "Ciorna"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr "Diferenta permisa a foii de pontaj (ore)"
+msgstr "Diferenta permisa a fisei de pontaj (Ore)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr "Factura este creata pe baza foii de pontaj."
+msgstr "Factura este creata pe baza fisei de pontaj."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr "Foaie de pontaj ciorna"
+msgstr "Fisa de pontaj Ciorna"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -594,13 +599,13 @@ msgstr "Status curent"
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
-"Nu puteti modifica o inregistrare dintr-o foaie de pontaj confirmata !"
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj confirmata !"
 
 #. 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 "Foaie de pontaj dupa Perioada"
+msgstr "Fise de pontaj dupa Perioada"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -612,7 +617,7 @@ msgstr "Utilizator"
 #. 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 "Foaie de pontaj dupa Cont"
+msgstr "Fisa de pontaj dupa Cont"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -627,24 +632,23 @@ msgstr "Noiembrie"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr "Limite foaie de pontaj"
+msgstr "Limita fisei de pontaj"
 
 #. 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 ""
-"Nu puteti modifica o inregistrare intr-o foaie de pontaj confirmata !"
+msgstr "Nu puteti modifica o inregistrare intr-o fisa de pontaj confirmata !"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "Prezenta mea totala pe Saptamana"
+msgstr "Prezenta mea totala dupa Saptamana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -653,6 +657,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Nu puteti avea 2 fise de pontaj care se suprapun!\n"
+"Ar trebui sa folositi meniul 'Fisa mea de pontaj' pentru a evita aceasta "
+"problema."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -666,9 +673,9 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
-"Verificati foile de pontaj pentru o anumita perioada. De asemenea, puteti "
-"coda timpul petrecut la un proiect (de exemplu, un cont analitic), astfel "
-"generand costuri in contul analitic implicat."
+"Verificati fisele de pontaj pentru o anumita perioada. De asemenea, puteti "
+"inregistra timpul petrecut la un proiect (de exemplu, un cont analitic), "
+"astfel generand costuri in contul analitic implicat."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
@@ -677,6 +684,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"Fisa de pontaj nu poate fi validata deoarece nu contine un numar egal de "
+"intrari si iesiri!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -696,7 +705,7 @@ msgstr "Companii"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezumat"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -704,17 +713,21 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Nu puteti avea 2 fise de pontaj care se suprapun!\n"
+"Va rugam sa folositi meniul 'Fisa mea de pontaj curenta' pentru a evita "
+"aceasta problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "Fise de pontaj nevalidate"
 
 #. 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 ""
+"Nu puteti sterge o fisa de pontaj care contine inregistrari ale prezentei!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -725,7 +738,7 @@ msgstr "Cantitate"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Nu puteti sterge o fisa de pontaj care este deja confirmata!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -736,12 +749,12 @@ msgstr "Cont General"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Periodicitatea cu care validati fisele de pontaj."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Search Account"
-msgstr "Caută Cont"
+msgstr "Cautati Cont"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -749,8 +762,8 @@ 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 ""
-"Diferenta permisa in ore dintre intrare si iesire si calculul foii de pontaj "
-"pentru o foaie. Setati pe 0 daca nu doriti nici un control."
+"Diferenta permisa in ore dintre intrare si iesire si calculul fisei de "
+"pontaj pentru o fisa. Setati pe 0 daca nu doriti nici un control."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -770,8 +783,8 @@ msgstr "Zi"
 #: 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 Timesheet"
-msgstr "Foaia mea de pontaj"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -787,16 +800,18 @@ msgstr "Starea este 'ciorna'."
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulati"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr "Validat"
+msgstr "Validat(a)"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -806,23 +821,23 @@ msgstr "Factura pe munca"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Fise de pontaj in luna curenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Foaia de pontaj dupa Conturi"
+msgstr "Fise de pontaj dupa Conturi"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr "Deschide Foaia de pontaj"
+msgstr "Deschide Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Grupeaza dupa anul datei"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -839,11 +854,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
-" * Starea 'Ciorna' este folosita atunci cand un utilizator codeaza o foaie "
-"de pontaj noua si neconfirmata. \t\t\t\t\n"
-"* Starea 'Confirmat(a) este folosita pentru a confirma foaia de pontaj dupa "
-"utilizator. \t\t\n"
-"*Starea 'Efectuat(a) este folosita atunci cand foaia de pontaj a "
+" * Starea 'Ciorna' este folosita atunci cand un utilizator inregistreaza o "
+"fisa de pontaj noua si neconfirmata.                 \n"
+"* Starea 'Confirmat(a) este folosita pentru a confirma fisa de pontaj dupa "
+"utilizator.                 \n"
+"*Starea 'Efectuat(a) este folosita atunci cand fisa de pontaj a "
 "utilizatorilor este acceptata de catre superior."
 
 #. module: hr_timesheet_sheet
@@ -851,22 +866,22 @@ msgstr ""
 #: 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 "Analiza foii de pontaj"
+msgstr "Analiza Fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr "Cautare Foaie de pontaj"
+msgstr "Cautati Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Fise de pontaj Confirmate"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linie Foaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
@@ -889,7 +904,7 @@ msgstr "Descriere"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr "Angajatul isi confirma periodic propriile foi de pontaj."
+msgstr "Angajatul isi confirma periodic propriile fise de pontaj."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -909,18 +924,18 @@ msgstr "Iesire"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr "Muta inregistrarea activitatii in linia foii de pontaj"
+msgstr "Muta inregistrarea activitatii in linia fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total Prezente"
 
 #. 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 "Analiza foii de pontaj"
+msgstr "Analiza Fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -942,7 +957,7 @@ msgstr "Februarie"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie sa fie unic !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -952,7 +967,7 @@ msgstr "Angajati"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr "Informatii despre timpul petrecut cu un service"
+msgstr "Informatii despre timpul petrecut cu un serviciu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -983,17 +998,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa-i atribuiti "
+"angajatului un jurnal analitic, precum 'Fisa de pontaj'!"
 
 #. 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 ""
+msgstr "Nu puteti semna de intrare / iesire cu o alta data decat cea de azi"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Inmanat Managerului"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1013,6 +1030,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa ii atribuiti "
+"un utilizator!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1033,7 +1052,7 @@ msgstr "Data curenta"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr "Foaie de pontaj Resurse umane"
+msgstr "RU Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1044,7 +1063,7 @@ msgstr "An"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr "Deschis"
+msgstr "Deschideti"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1159,3 +1178,6 @@ msgstr "Jurnal"
 
 #~ msgid "By Day"
 #~ msgstr "Dupa zi"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Fisa mea de pontaj"
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index b8a4883ad08..04784e68bd4 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -260,7 +260,6 @@ msgstr " Месяц "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -757,8 +756,8 @@ msgstr "День"
 #: 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 Timesheet"
-msgstr "Моё расписание"
+msgid "My Current Timesheet"
+msgstr "Мой текущий табель"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1048,9 +1047,6 @@ msgstr ""
 #~ msgid "Timeshet range"
 #~ msgstr "Диапазон табеля"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Мой текущий табель"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
@@ -1142,3 +1138,6 @@ msgstr ""
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "Нельзя дублировать расписания !"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Моё расписание"
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index a5db24a8d83..cf5817955ef 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr "Dan"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 11013624c1c..5837c11d338 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,7 +742,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index caf71bdf4fa..612d0ee64cc 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,8 +742,8 @@ msgstr "Day"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "My Current Timesheet"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1051,9 +1050,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Draft Timesheet sheet"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "My Current Timesheet"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Validated Timesheet"
 
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 70cebb34f0f..1359be03f08 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index c2e2582e54e..c7695729d72 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,8 +741,8 @@ msgstr ""
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mevcut Giriş-Çıkış Çizelgem"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1033,9 +1032,6 @@ msgstr ""
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Giriş-Çıkışlarımı Onayla"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mevcut Giriş-Çıkış Çizelgem"
-
 #~ msgid "Phone call encoding"
 #~ msgstr "Tel. Çağrısı Kodla"
 
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 591add4799d..04af8459ab8 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,8 +741,8 @@ msgstr "День"
 #: 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 Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Мій поточний табель"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1033,9 +1032,6 @@ msgstr ""
 #~ msgid "Timeshet range"
 #~ msgstr "Тривалість робочого часу"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Мій поточний табель"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index f120b5415d9..d233e7d302d 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr " Tháng "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -743,7 +742,7 @@ msgstr "Ngày"
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index f49530fecb1..235bf419d51 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:21+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr " 月份 "
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -748,8 +747,8 @@ msgstr "天"
 #: 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 Timesheet"
-msgstr "我的计工单"
+msgid "My Current Timesheet"
+msgstr "我当前的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1051,9 +1050,6 @@ msgstr "账簿"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "时间表草稿"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "我当前的时间表"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "批准时间表"
 
@@ -1277,6 +1273,9 @@ msgstr "账簿"
 #~ "defined !"
 #~ msgstr "用户没定义员工您不能创建记工单！"
 
+#~ msgid "My Timesheet"
+#~ msgstr "我的计工单"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index b0c287b7150..e1b33791b37 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
@@ -742,7 +741,7 @@ msgstr ""
 #: 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 Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
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 447c3be6966..8b102b19f72 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -41,22 +41,8 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>							
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
-                            <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="user_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -81,7 +67,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 7c06971c7d2..fe497b6f46c 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -49,20 +49,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>								
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                                 string="Draft"
                                 domain="[('state','=','draft')]"/>
@@ -70,11 +56,11 @@
                                 string="Confirmed"
                                 domain="[('state','=','confirm')]"/>
                         <filter icon="terp-dialog-close"
-                                    string="Done"
-                                    domain="[('state','=','done')]"/>
+                                string="Done"
+                                domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="account_id"/>
-                      <field name="user_id" />
+                        <field name="user_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -87,6 +73,7 @@
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <newline/>
+                        <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 6d8c998eec7..61ebee2412b 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -8,9 +8,8 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_timesheet_sheet" position="after">
-                    <newline/>
-                    <field name="timesheet_range" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                    <field name="timesheet_max_difference" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
                 </field>
             </field>
         </record>
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 90ffc938116..18121813e7d 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Timesheet" version="7.0">
+            <form string="My Current Timesheet" version="7.0">
                <header>
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
@@ -17,7 +17,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Timesheet</field>
+        <field name="name">My Current Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -26,7 +26,7 @@
         <field name="help">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.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/html_view/i18n/es_AR.po b/addons/html_view/i18n/es_AR.po
new file mode 100644
index 00000000000..d531b6d9d93
--- /dev/null
+++ b/addons/html_view/i18n/es_AR.po
@@ -0,0 +1,49 @@
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 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-18 18:40+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Prueba html"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Ejemplo html"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Bancos"
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 416056cfe7f..0aabaa42276 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <field name="name"/>
+                <field name="name" string="Category"/>
             </search>
         </field>
     </record>
@@ -72,13 +72,11 @@
                     <button name="idea_cancel" string="Refuse" states="open" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
-                <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="category_ids"/>
                     <h2><field name="category_ids"/></h2>
                     <field name="description"/>
-                </sheet>
                 <footer>
                     <field name="message_ids" widget="ThreadView"/>
                 </footer>
@@ -110,12 +108,13 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group>
+                    <field name="name" string="Idea"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
                     <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_ids"/>
                 </group>
                 <newline/>
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 44243aa952c..8bcda79c64e 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -30,7 +30,7 @@ import logging
 import StringIO
 import traceback
 pp = pprint.PrettyPrinter(indent=4)
-
+_logger = logging.getLogger(__name__)
 
 
 
@@ -60,7 +60,6 @@ class import_framework(Thread):
         self.context = context or {}
         self.email = email_to_notify
         self.table_list = []
-        self.logger = logging.getLogger(module_name)
         self.initialize()
 
     """
@@ -165,7 +164,7 @@ class import_framework(Thread):
                 data_i is a map external field_name => value
                 and each data_i have a external id => in data_id['id']
         """
-        self.logger.info(' Importing %s into %s' % (table, model))
+        _logger.info(' Importing %s into %s' % (table, model))
         if not datas:
             return (0, 'No data found')
         mapping['id'] = 'id_new'
@@ -188,7 +187,7 @@ class import_framework(Thread):
         model_obj = self.obj.pool.get(model)
         if not model_obj:
             raise ValueError(_("%s is not a valid model name") % model)
-        self.logger.debug(_(" fields imported : ") + str(fields))
+        _logger.debug(_(" fields imported : ") + str(fields))
         (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
         for (field, field_name) in self_dependencies:
             self._import_self_dependencies(model_obj, field, datas)
@@ -431,9 +430,9 @@ class import_framework(Thread):
             'auto_delete' : True})
         email_obj.send(self.cr, self.uid, [email_id])
         if error:
-            self.logger.error(_("Import failed due to an unexpected error"))
+            _logger.error(_("Import failed due to an unexpected error"))
         else:
-            self.logger.info(_("Import finished, notification email sended"))
+            _logger.info(_("Import finished, notification email sended"))
 
     def get_email_subject(self, result, error=False):
         """
diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py
index 35103a41173..df2aa386992 100644
--- a/addons/import_sugarcrm/sugar.py
+++ b/addons/import_sugarcrm/sugar.py
@@ -33,7 +33,7 @@ import import_sugarcrm
 import logging
 
 import sys
-
+_logger = logging.getLogger(__name__)
 
 debug = False
 
@@ -119,7 +119,7 @@ def get_contact_by_email(portType, username, password, email_address=None):
                 email_list.append(list.Email_address)
         return email_list
     except Exception,e:
-        logging.getLogger('sugarcrm_soap').error('Exception: %s\n' % (tools.ustr(e)))
+        _logger.error('Exception: %s\n' % (tools.ustr(e)))
         return False
 
 def get_document_revision_search(portType, sessionid, module_id=None):
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
new file mode 100644
index 00000000000..69681df62c1
--- /dev/null
+++ b/addons/knowledge/i18n/es_AR.po
@@ -0,0 +1,33 @@
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 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-18 18:39+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Contenido colaborativo"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Conocimientos"
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 2e5e6785438..80d13e6283a 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,21 +8,21 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
-
-                        <separator string="Documents" colspan="4"/>
-                        <field name="module_document"/>
-                        <newline/>
-                        <field name="module_document_ftp"/>
-                        <newline/>
-                        <field name="module_document_webdav"/>
+                    <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>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 997036c0cec..4cdbca84c0a 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -23,8 +23,8 @@
 import re, time, random
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 """
 account.invoice object:
@@ -41,7 +41,7 @@ class account_invoice(osv.osv):
                 context=context)
         res[[i for i,x in enumerate(res) if x[0] == 'none'][0]] = ('none', 'Free Communication')
         res.append(('bba', 'BBA Structured Communication'))
-        #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'reference_type =  %s' %res ) 
+        #l_logger.warning('reference_type =  %s' %res ) 
         return res
 
     def check_bbacomm(self, val):
@@ -68,7 +68,7 @@ class account_invoice(osv.osv):
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
-#        logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'partner_id %s' % partner_id)
+#        _logger.warning('partner_id %s' % partner_id)
         reference = False
         reference_type = 'none'
         if partner_id:        
@@ -215,5 +215,5 @@ class account_invoice(osv.osv):
         ]
 
 account_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 04a51c3a6ab..8951be5dfa2 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -24,8 +24,6 @@
 from osv import fields, osv
 import time
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
 
 class res_partner(osv.osv):  
     """ add field to indicate default 'Communication Type' on customer invoices """
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index c4130f2761d..c4c6be74e4b 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -22,8 +22,8 @@
 from osv import fields, osv
 import os
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 class wizard_multi_charts_accounts(osv.osv_memory):
     """
@@ -80,8 +80,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         if context.get('lang') == lang:
                             self.pool.get(out_obj._name).write(cr, uid, out_ids[j], {in_field: value[in_id]})
                 else:
-                    logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING,
-                             'Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
+                    _logger.info('Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
         return True
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index b4f96afc700..7640dee6f56 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -9,14 +9,16 @@
             <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
             <field name="arch" type="xml">
               <data>
-                    <xpath expr="//form/group/group/separator" position="attributes">
+<!--
+                    <xpath expr="//group[@string='res_config_contents']/separator" position="attributes">
                         <attribute name="string">
                         Generate Your UK Accounting Chart from a Chart Template
                         </attribute>
                     </xpath>
-                    <xpath expr="//form/group/group/label" position="attributes">
+                    <xpath expr="//group[@string='res_config_contents']/label" position="attributes">
                         <attribute name="string">SELECT 4 DIGIT ACCOUNTS.  This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/ Financial Accounts/Generate Chart of Accounts from a Chart Template.</attribute>
                     </xpath>
+-->                    
               </data>
             </field>
         </record>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 47de833a66b..1777fd85da6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -71,13 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
@@ -183,10 +182,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_cashmove"/>
                     <field name="create_date"/>
+                    <field name="user_cashmove"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
@@ -196,7 +193,6 @@
                         <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
-
             </field>
         </record>
 
@@ -294,7 +290,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
-                    <field name="name" />
+                    <field name="name" string="Product"/>
                     <field name="category_id"/>
                     <field name="price"/>
                 </search>
@@ -350,11 +346,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
                     </group>
+                 </sheet>   
                 </form>
             </field>
         </record>
@@ -368,20 +366,8 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  " name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Box amount in current year"/>
-                    <separator orientation="vertical"/>
-
-                        <filter icon="terp-go-month" string="   Month   "
-                                name="month"
-                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Box amount in current month"/>
-                        <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Box amount in last month"/>
-                    <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 5dd25322d47..168398ae5cc 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -26,17 +26,7 @@
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="    7 Days    "
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Tasks during last 7 days"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 39413a80bed..95ce7d5619d 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -61,7 +61,6 @@ The main features are:
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_partner_view.xml',
-        'report/mail_message_report_view.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'mail_data.xml',
@@ -92,5 +91,8 @@ The main features are:
     'qweb': [
         'static/src/xml/mail.xml',
     ],
+    'demo': [
+        'mail_demo.xml',
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 9062a02c6d4..0912a3e8762 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
+"PO-Revision-Date: 2012-06-22 01:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,7 +26,7 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Supprimer définitivement les courriels après envoi"
 
 #. module: mail
 #: view:mail.message:0
@@ -68,7 +68,7 @@ msgstr "Version plein texte du message"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Corps de texte"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Reçu"
 
 #. module: mail
 #: view:mail.message:0
@@ -100,13 +100,13 @@ msgstr "Serveur courriel sortant"
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulé"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Répondre à"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
@@ -117,7 +117,7 @@ msgstr "Version texte enrichi/HTML du message"
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Suppression automatique"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
@@ -156,27 +156,27 @@ msgstr "Message du courriel"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Envoyé"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Échec"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Répondre"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Envoyer"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -192,12 +192,12 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Destinataires"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Assistant de composition de courriels"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -208,13 +208,13 @@ msgstr "ID du document associé"
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avancée"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -245,27 +245,27 @@ msgstr "Nom du Partenaire"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Recommencer"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Sortant"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Envoyer maintenant"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Partenaire associé"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -276,7 +276,7 @@ msgstr "Date"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
@@ -293,7 +293,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -328,7 +328,7 @@ msgstr " sur "
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -344,18 +344,18 @@ msgstr "Texte affiché"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Ouvrir"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Echec] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
@@ -375,7 +375,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mois de création"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -413,7 +413,7 @@ msgstr "Corps (texte)"
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Vous"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
@@ -434,6 +434,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s à écrit %s: \n"
+" Sujet: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -463,18 +466,20 @@ msgstr "Copie cachée à (BCC)"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Références du message , tel que les identifiants des messages précédents"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
@@ -490,7 +495,7 @@ msgstr "Échec de l'envoi"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Contenu du courriel"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
@@ -500,13 +505,13 @@ msgstr "Discussion par courriel"
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtres"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Pièce jointe"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
@@ -522,3 +527,12 @@ msgstr "Adresse de réponse préférée pour le message"
 
 #~ msgid "Rich-text contents"
 #~ msgstr "Contenu en texte enrichi"
+
+#~ msgid "Message type"
+#~ msgstr "Type de message"
+
+#~ msgid "Related user"
+#~ msgstr "Utilisateur associé"
+
+#~ msgid "Message headers"
+#~ msgstr "En-têtes de message"
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
new file mode 100644
index 00000000000..eafd5835b9f
--- /dev/null
+++ b/addons/mail/i18n/mn.po
@@ -0,0 +1,514 @@
+# 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-09 00:36+0000\n"
+"PO-Revision-Date: 2012-06-19 17:38+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-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Имэйл Зохиох"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "Бие"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "Зурвас хүлээн авагчид"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text Contents"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "Хүлээн авсан"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "Хэн рүү Хариулах"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "Автоматаар устгах"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "Гарчиг"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr "%(date)s-нд, "
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "Хэнээс"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "Имэйл зурвас"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr "Илгээх"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "Бүтэлгүйтсэн"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "Хариулах"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "Илгээгдсэн"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related User"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
+
+#~ msgid "Message type"
+#~ msgstr "Зурвасын төрөл"
+
+#~ msgid "Text contents"
+#~ msgstr "Текстийн агуулга"
diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml
new file mode 100644
index 00000000000..1adec42a910
--- /dev/null
+++ b/addons/mail/mail_demo.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="message_blogpost0_attachment0" model="ir.attachment">
+            <field name="name">A cool attachment</field>
+            <field name="datas">PT1Tb21lIGNvb2wgYXR0YWNobWVudD09ClByYWVzZW50IHZlbCBtYXNzYSBzZWQgbWFzc2EgY29uc2VxdWF0IGVnZXN0YXMgaW4gdHJpc3RpcXVlIG9yY2ku</field>
+            <field name="datas_fname">a_cool_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_attachment1" model="ir.attachment">
+            <field name="name">Another clean attachment</field>
+            <field name="datas">PT1Tb21lIGNsZWFuIGF0dGFjaG1lbnQ9PQpOdWxsYSB0dXJwaXMgbGVvLCByaG9uY3VzIHV0IGVnZXN0YXMgc2l0IGFtZXQsIGNvbnNlY3RldHVyIHZpdGFlIHVybmEu</field>
+            <field name="datas_fname">a_clean_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0" model="mail.message">
+            <field name="subject">Internal company announce</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. 
+            Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. 
+
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. 
+
+Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(6,0,[ref('message_blogpost0_attachment0'),ref('message_blogpost0_attachment1')])]"/>
+        </record>
+
+        <record id="message_blogpost0_comment0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment1" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Agreed !  
+Would it be possible to learn more about the author ?  (second comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
+            <field name="name">Author's full biography</field>
+            <field name="datas">PT1BYm91dCB0aGUgYXV0aG9yPT0KSW50ZWdlciBzb2RhbGVzIGRvbG9yIGV1IGVsaXQgZnJpbmdpbGxhIGJsYW5kaXQu</field>
+            <field name="datas_fname">blogpost_author_biography</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_comment2" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
+
+In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. 
+Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. 
+
+Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(4,ref('message_blogpost0_comment2_attachment0'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 67b2efc84a0..921c3b528c4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        
-       <!-- Group Kanban View  !-->
+
+        <!-- Group Kanban View  !-->
         <record model="ir.ui.view" id="view_group_kanban">
             <field name="name">mail.group.kanban</field>
             <field name="model">mail.group</field>
@@ -50,27 +50,30 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group">
-                    <group colspan="4" col="8">
-                        <group colspan="6" col="4">
-                            <separator string="General Information" colspan="4"/>
-                            <field name="name" colspan="2"/>
-                            <field name="responsible_id" colspan="2"/>
-                            <newline/>
-                            <field name="description" colspan="4"/>
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Group Image" colspan="2"/>
-                            <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Privacy Settings" colspan="2"/>
-                            <field name="public" nolabel="1"/>
-                            <label string="This group is visible by non members" colspan="2"/>
-                        </group>
-                    </group>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
-                            options='{"thread_level": 1}'/>
+                <form string="Group Form" version="7.0">
+                    <div style="padding: 8px">
+                        <div class="oe_right">
+                            <field name="photo" widget='image' on_change="onchange_photo(photo)"/>
+                        </div>
+                        <div class="oe_title">
+                            <div class="oe_edit_only">
+                                <label for="name"/> 
+                            </div>
+                            <h1><field name="name"/></h1>
+                            <div class="oe_edit_only">
+                                <label for="responsible_id"/> 
+                            </div>
+                            <field name="responsible_id" class="oe_inline"/>
+                            <div class="oe_edit_only">
+                                <label for="public"/> 
+                                <field name="public" class="oe_inline"/>
+                            </div>
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </div>
+                    </div>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="ThreadView" options='{"thread_level": 1}'/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -96,8 +99,9 @@
             <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <search string="Search groups">
-                    <field name="name"/>
+                <search string="Search Groups">
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f86ae29c80f..e45d4f07807 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -36,7 +36,7 @@ from osv import fields
 from tools.translate import _
 from openerp import SUPERUSER_ID
 
-_logger = logging.getLogger('mail')
+_logger = logging.getLogger(__name__)
 
 def format_date_tz(date, tz=None):
     if not date:
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1f7ec2297de..9159190ab29 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -26,20 +26,22 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message" version="7.0">
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="subject"/>
-                            <field name="date"/>
-                            <field name="type"/>
-                            <field name="body_text"/>
+                            <group>
+                                <field name="subject"/>
+                                <field name="date"/>
+                                <field name="type"/>
+                                <field name="body_text"/>
+                            </group>
+                            <group>
+                                <field name="user_id" string="User"/>
+                                <field name="model"/>
+                                <field name="res_id"/>
+                                <field name="parent_id"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="user_id" string="User"/>
-                            <field name="model"/>
-                            <field name="res_id"/>
-                            <field name="parent_id"/>
-                        </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -52,9 +54,11 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
-                    <field name="model"/>
+                    <field name="model" string="Message"/>
+                    <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -79,57 +83,59 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
-                    <label for="subject" class="oe_form_readonly_hidden"/>
-                    <h1><field name="subject"/></h1>
-                    <label for="user_id"/>
-                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
-                    <group col="4">
-                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                        <field name="type"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Details">
-                            <group string="Recipients">
-                                <field name="email_from"/>
-                                <field name="email_to"/>
-                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
-                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
-                            </group>
-                            <group col="4" string="Message Details">
-                                <field name="model"/>
-                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
-                                <field name="res_id"/>
-                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
-                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
-                            </group>
-                            <notebook>
-                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
-                                    <field name="body_html" widget="text_html"/>
-                                </page>
-                                <page string="Body (Plain)">
-                                    <field name="body_text" widget="text"/>
-                                </page>
-                            </notebook>
-                            <group col="5">
-                                <field name="state" colspan="2"/>
-                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
-                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                            </group>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids"/>
-                        </page>
-                        <page string="Advanced" groups="base.group_no_one">
-                            <group col="2" colspan="4">
-                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
-                                <field name="auto_delete"/>
-                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <sheet>
+                        <label for="subject" class="oe_edit_only"/>
+                        <h1><field name="subject"/></h1>
+                        <label for="user_id"/>
+                        <h2><field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/></h2>
+                        <group col="4">
+                            <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                            <field name="type"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Details">
+                                <group string="Recipients">
+                                    <field name="email_from"/>
+                                    <field name="email_to"/>
+                                    <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                    <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                    <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                                </group>
+                                <group col="4" string="Message Details">
+                                    <field name="model"/>
+                                    <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                    <field name="res_id"/>
+                                    <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                    <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+                                </group>
+                                <notebook>
+                                    <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                        <field name="body_html" widget="text_html"/>
+                                    </page>
+                                    <page string="Body (Plain)">
+                                        <field name="body_text" widget="text"/>
+                                    </page>
+                                </notebook>
+                                <group col="5">
+                                    <field name="state" colspan="2"/>
+                                    <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                    <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group col="2" colspan="4">
+                                    <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                    <field name="auto_delete"/>
+                                    <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                    <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -164,20 +170,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="email_from"/>
-                    <field name="email_to"/>
-                    <field name="subject"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 52b72127b78..7dbaea098dc 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -10,7 +10,7 @@
             <field name="name">mail.subscription.tree</field>
             <field name="model">mail.subscription</field>
             <field name="type">tree</field>
-            <field name="sequence">10</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="res_model"/>
@@ -28,7 +28,7 @@
             <field name="name">mail.notification.tree</field>
             <field name="model">mail.notification</field>
             <field name="type">tree</field>
-            <field name="sequence">10</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="user_id"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b1b6c68e4cc..e0f2bfaf455 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,9 +68,14 @@ class mail_thread(osv.osv):
             res[id] = self.message_load_ids(cr, uid, [id], context=context)
         return res
 
+    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
+        msg_obj = self.pool.get('mail.message')
+        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
+        return [('id', 'in', msg_ids)]
+
     # OpenChatter: message_ids is a dummy field that should not be used
     _columns = {
-        'message_ids': fields.function(_get_message_ids, method=True,
+        'message_ids': fields.function(_get_message_ids, method=True, fnct_search=_search_message_ids,
                         type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
     }
 
@@ -294,7 +299,7 @@ class mail_thread(osv.osv):
                 }
                 to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
 
-            partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
+            partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
             if not partner_id and thread._name == 'res.partner':
                 partner_id = thread.id
             data = {
@@ -413,7 +418,30 @@ class mail_thread(osv.osv):
         """ OpenChatter feature: return thread messages
         """
         msg_ids = self.message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
-        msgs = self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
+        msgs = self.pool.get('mail.message').read(cr, uid, msg_ids, [], context=context)
+        
+        """ Retrieve all attachments names """
+        map_id_to_name = {}
+        
+        for msg in msgs:
+            for attach_id in msg["attachment_ids"]:
+                map_id_to_name[attach_id] = '' # use empty string as a placeholder
+        
+        ids = map_id_to_name.keys()
+        names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
+        
+        # convert the list of tuples into a dictionnary
+        for name in names: 
+            map_id_to_name[name[0]] = name[1]
+        
+        # give corresponding ids and names to each message
+        for msg in msgs:
+            msg["attachments"] = []
+            
+            for attach_id in msg["attachment_ids"]:
+                msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
+        
+        """ Sort and return messages """
         msgs = sorted(msgs, key=lambda d: (-d['id']))
         return msgs
 
diff --git a/addons/mail/report/__init__.py b/addons/mail/report/__init__.py
index 7ec4e7cd2c2..c380a63e8d3 100644
--- a/addons/mail/report/__init__.py
+++ b/addons/mail/report/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_message_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail/report/mail_message_report.py b/addons/mail/report/mail_message_report.py
deleted file mode 100644
index 7955ea87909..00000000000
--- a/addons/mail/report/mail_message_report.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009-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 fields, osv
-import time
-import tools
-
-class mail_message_report(osv.osv):
-     #CSV:: access_res_log_report all,res.log.report,model_res_log_report,,1,0,0,0
-    """ Log Report """
-    _name = "mail.message.report"
-    _auto = False
-    _description = "Mail Message Report"
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'creation_date': fields.date('Creation Date', readonly=True),
-        'res_model': fields.char('Object', size=128),
-        'nbr': fields.integer('# of Entries', readonly=True)
-     }
-
-    def init(self, cr):
-        """
-            Log Report
-            @param cr: the current row, from the database cursor
-        """
-        tools.drop_view_if_exists(cr,'mail_message_report')
-        cr.execute("""
-            CREATE OR REPLACE VIEW mail_message_report AS (
-                SELECT
-                    l.id as id,
-                    1 as nbr,
-                    to_char(l.create_date, 'YYYY') as name,
-                    to_char(l.create_date, 'MM') as month,
-                    to_char(l.create_date, 'YYYY-MM-DD') as day,
-                    to_char(l.create_date, 'YYYY-MM-DD') as creation_date,
-                    l.model as res_model,
-                    date_trunc('day',l.create_date) as create_date
-                FROM
-                    mail_message l
-            )""")
-
diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml
deleted file mode 100644
index ecb26b78d1d..00000000000
--- a/addons/mail/report/mail_message_report_view.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Latest Activities -->
-        <record model="ir.actions.act_window" id="action_latest_activities_tree">
-            <field name="name">Latest Activities</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!-- Mail message report search view  -->
-        <record id="view_mail_message_report_filter" model="ir.ui.view">
-            <field name="name">mail.message.report.select</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Mail message Analysis">
-                    <group>
-                    <filter icon="terp-go-year" string="  Year  "
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Messages created in current year"/>
-                    <filter icon="terp-go-month" string="   Month   "
-                        name="month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Messages created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Messages created in last month"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
-                            <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
-            </field>
-        </record>
-
-        <!-- Mail message report Tree view  -->
-        <record id="view_mail_message_report_tree" model="ir.ui.view">
-            <field name="name">mail.message.report.tree</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            <tree string="Mail message Analysis">
-                <field name="name" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="res_model" invisible="1"/>
-                <field name="nbr" />
-                <field name="creation_date" invisible="1"/>
-             </tree>
-            </field>
-       </record>
-
-        <!-- Monthly Activity per Document -->
-        <record id="board_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Monthly Activity per Document" type="bar">
-                	<field name="res_model"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_monthly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Monthly Activity per Document</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_mail_message_report_graph"></field>
-        </record>
-
-        <!-- Weekly Global Activity -->
-        <record id="board_weekly_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.weekly.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Weekly Global Activity" type="bar">
-                	<field name="day"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_weekly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Weekly Global Activity</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_weekly_mail_message_report_graph"></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index af276f48440..0a9860dc979 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,8 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <field name="message_ids" widget="ThreadView" nolabel="1"
+                    <footer>
+                    <field name="message_ids" widget="ThreadView" 
                             options='{"thread_level": 1}'/>
+                    </footer>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 7cb98129a3c..428f53d092e 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,7 +27,7 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_form_bottom">
+                    <div class="oe_bottom">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </xpath>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 3cfd4e88f3d..011e8b27dc5 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -5,4 +5,3 @@ access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f8975d67b78..2421b28fbcb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -9,35 +9,19 @@
     background: white;
 }
 
-.openerp div.oe_mail_wall_act {
+.openerp div.oe_mail_wall_action {
     padding: 8px;
     background: #eee;
     border: 1px solid #ccc;
 }
 
-.openerp div.oe_mail_wall_act:after {
+.openerp div.oe_mail_wall_action:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-/* 2 columns view */
-.openerp div.oe_mail_wall_left {
-    float: left;
-    width: 560px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_right {
-    margin-left: 565px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_threads {
-    margin-top: 8px;
-}
-
-.openerp textarea.oe_mail_wall_action_textarea {
+.openerp .oe_mail_wall_action textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -45,24 +29,41 @@
     float: right;
 }
 
-.openerp div.oe_mail_wall_threads textarea {
+/* 2 columns view */
+.openerp div.oe_mail_wall_main {
+    float: left;
+    width: 560px;
+    margin: 8px;
+}
+
+.openerp div.oe_mail_wall_aside {
+    margin-left: 565px;
+    margin: 8px;
+}
+
+/* Threads */
+.openerp .oe_mail_wall_threads {
+    margin-top: 8px;
+}
+.openerp .oe_mail_wall_threads textarea {
     height: 40px;
     padding: 4px;
 }
 
+.openerp .oe_mail_wall_thread:first .oe_mail_msg_notification {
+    border-top: 0;
+}
+
 .openerp div.oe_mail_thread_subthread img {
     width: 28px;
     height: 28px;
 }
 
 .openerp div.oe_mail_msg_content {
+    position: relative;
     width: 486px;
 }
 
-.openerp div.oe_mail_msg_content p {
-    margin: 4px 0;
-}
-
 .openerp div.oe_mail_msg_content li{
     float: left;
     margin-right: 3px;
@@ -152,14 +153,14 @@
 /* ThreadDisplay                  */
 /* ------------------------------ */
 
-.openerp div.oe_mail_thread_act {
+.openerp div.oe_mail_thread_action {
     white-space: normal;
     padding: 8px;
     background: #eee;
-    border-top: 1px solid #ccc
+    border-top: 1px solid #ccc;
 }
 
-.openerp div.oe_mail_thread_act:after {
+.openerp div.oe_mail_thread_action:after {
     content: "";
     display: block;
     clear: both; 
@@ -173,7 +174,7 @@
     margin-left: 66px;
 }
 
-.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child {
+.openerp div.oe_mail_thread_subthread .oe_mail_thread_msg:last-child {
     margin-bottom: 8px;
 }
 
@@ -182,25 +183,24 @@
     border-bottom: 1px solid #D2D9E7;
 }
 
-.openerp li.oe_mail_thread_msg:after {
+.openerp .oe_mail_thread_msg:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.openerp li.oe_mail_thread_msg > div:after {
+.openerp .oe_mail_thread_msg > div:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
+.openerp .oe_mail_msg_notification, 
+.openerp .oe_mail_msg_comment, 
+.openerp .oe_mail_msg_email {
     padding: 8px;
-}
-
-.openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email, .openerp .oe_mail_msg_notification {
     background: white;
-    border-top: 1px solid #ccc
+    border-top: 1px solid #ccc;
 }
 
 .openerp .oe_email_icon {
@@ -212,7 +212,9 @@
     background: #eee;
 }
 
-.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after {
+.openerp .oe_mail_msg_notification:after, 
+.openerp .oe_mail_msg_comment:after, 
+.openerp .oe_mail_msg_email:after {
     content: "";
     display: block;
     clear: both; 
@@ -249,15 +251,6 @@
 /* Styling (should be openerp)    */
 /* ------------------------------ */
 
-.openerp ul.oe_mail {
-    padding: 0;
-    margin: 0;
-}
-
-.openerp li.oe_mail {
-    list-style-type: none;
-}
-
 .openerp input.oe_mail, textarea.oe_mail {
     width: 432px;
     padding: 4px;
@@ -284,20 +277,118 @@
     -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
-.openerp p.oe_mail_msg {
+.openerp div.oe_mail_msg {
     padding: 0;
     margin: 0 0 4px 0;
 }
 
-.openerp a.oe_mail_oe_intlink {
-    color: #8786b7;
-}
-
 .openerp .oe_mail_oe_bold {
     font-weight: bold;
 }
 
-/*.openerp .oe_mail_oe_space:after {*/
-    /*content: " · ";*/
-    /*margin-right: 2px;*/
-/*}*/
+/* ------------------------------ */
+/* Messages layout                */
+/* ------------------------------ */
+
+.openerp .oe_mail_msg .oe_mail_msg_title {
+    margin: 0;
+    font-size: 1.3em;
+    font-weight: bold;
+}
+.openerp .oe_mail_msg .oe_mail_msg_title a:link,
+.openerp .oe_mail_msg .oe_mail_msg_title a:visited {
+    color: #4C4C4C;
+    text-decoration: none;
+}
+
+.openerp .oe_mail_msg_subtitle {
+    margin: 0 0 .5em 0;
+}
+.openerp .oe_mail_msg_footer,
+.openerp .oe_mail_msg_subtitle {
+    color: #888;
+}
+
+.openerp .oe_mail_msg_body {
+    margin-bottom: .5em;
+    text-align: justify;
+}
+
+.openerp .oe_mail_msg_tail {
+    display: none;
+}
+
+/* Read more/less link */
+.openerp .oe_mail_msg_content .expand,
+.openerp .oe_mail_msg_content .reduce {
+    font-weight: bold;
+}
+
+/* Dropdown menu */
+.openerp .oe_mail_msg_content .oe_dropdown_toggle {
+    position: absolute;
+    top: 0px;
+    right: 3px;
+}
+.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
+    border-top: 4px solid transparent;
+}
+.openerp .oe_mail_msg_content:hover .oe_dropdown_arrow:after {
+    border-top: 4px solid #404040;
+}
+
+.openerp .oe_mail_msg_footer li:after {
+    content: " · ";
+}
+
+.openerp .oe_mail_msg_footer li:last-child:after {
+    content: "";
+}
+
+/* Attachments list */
+.openerp ul.oe_mail_msg_attachments {
+    display: none;
+    width: 100%;
+    border-top: 1px solid #CCC;
+    margin: .5em 0 0 0;
+    padding: .5em 0;
+    list-style-position: inside;
+}
+.openerp ul.oe_mail_msg_attachments li {
+    float: none;
+    margin: 0;
+    padding: 0;
+    list-style-type: square;
+}
+
+
+/* ------------------------------ */
+/* Group Form                     */
+/* ------------------------------ */
+
+div.oe_mail_group_advanced_details {
+  display: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet {
+  min-height: 0px;
+  max-height: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_sheet {
+  min-height: 0px;
+  max-height: none;
+  padding: 0px 18px;
+  max-width: 80%;
+}
+
+/* Resize group logo */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_image > img {
+  max-width: 100px;
+  max-height: 100px;
+}
+
+/* Resize group description */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
+  height: 40px;
+} 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 905e95f3aef..5633a4bdae0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,25 +1,25 @@
 openerp.mail = function(session) {
     var _t = session.web._t,
        _lt = session.web._lt;
-    
+
     var mail = session.mail = {};
 
     /**
-    * Add records to sorted_comments array
-    * @param {Array} records records from mail.message sorted by date desc
-    * @returns {Object} cs comments_structure: dict
-    *                      cs.model_to_root_ids = {model: [root_ids], }
-    *                      cs.new_root_ids = [new_root_ids]
-    *                      cs.root_ids = [root_ids]
-    *                      cs.msgs = {record.id: record,}
-    *                      cs.tree_struct = {record.id: {
-    *                          'level': record_level in hierarchy, 0 is root,
-    *                          'msg_nbr': number of childs,
-    *                          'direct_childs': [msg_ids],
-    *                          'all_childs': [msg_ids],
-    *                          'for_thread_msgs': [records],
-    *                          'ancestors': [msg_ids], } }
-    */
+     * Add records to sorted_comments array
+     * @param {Array} records records from mail.message sorted by date desc
+     * @returns {Object} cs comments_structure: dict
+     *                      cs.model_to_root_ids = {model: [root_ids], }
+     *                      cs.new_root_ids = [new_root_ids]
+     *                      cs.root_ids = [root_ids]
+     *                      cs.msgs = {record.id: record,}
+     *                      cs.tree_struct = {record.id: {
+     *                          'level': record_level in hierarchy, 0 is root,
+     *                          'msg_nbr': number of childs,
+     *                          'direct_childs': [msg_ids],
+     *                          'all_childs': [msg_ids],
+     *                          'for_thread_msgs': [records],
+     *                          'ancestors': [msg_ids], } }
+     */
     function tools_sort_comments(cs, records, parent_id) {
         var cur_iter = 0; var max_iter = 10; var modif = true;
         while ( modif && (cur_iter++) < max_iter) {
@@ -57,10 +57,6 @@ openerp.mail = function(session) {
         return cs;
     }
 
-    /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
-//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
-
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
      * messages. The [thread_level] parameter sets the thread level number:
@@ -72,7 +68,7 @@ openerp.mail = function(session) {
      * either it will fetch [limit] messages related to [res_model]:[res_id].
      */
     mail.Thread = session.web.Widget.extend({
-        template: 'Thread',
+        template: 'mail.Thread',
 
         /**
          * @param {Object} parent parent
@@ -117,15 +113,24 @@ openerp.mail = function(session) {
         },
         
         start: function() {
+            var self = this;
+            
             this._super.apply(this, arguments);
             // customize display
-            if (! this.display.show_post_comment) this.$element.find('div.oe_mail_thread_act').hide();
+            if (! this.display.show_post_comment) {
+                this.$element.find('div.oe_mail_thread_action').hide();
+            }
             // add events
             this.add_events();
-            /* display user, fetch comments */
+            
+            // display user, fetch comments
             this.display_current_user();
-            if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
-            else var display_done = this.init_comments();
+            
+            if (this.params.records) {
+                var display_done = this.display_comments_from_parameters(this.params.records);
+            } else {
+                var display_done = this.init_comments();
+            }
             return display_done
         },
         
@@ -143,7 +148,7 @@ openerp.mail = function(session) {
             });
             // event: click on 'reply' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
-                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_act:first');
+                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
                 event.preventDefault();
             });
@@ -154,9 +159,9 @@ openerp.mail = function(session) {
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
                 return false;
             });
@@ -168,14 +173,14 @@ openerp.mail = function(session) {
                 if (! msg_id) return false;
                 //console.log(msg_id);
                 var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
                 return false;
             });
             // event: click on an internal link
-            this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) {
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_internal_link', 'click', function (event) {
                 // lazy implementation: fetch data and try to redirect
                 if (! event.srcElement.dataset.resModel) return false;
                 else var res_model = event.srcElement.dataset.resModel;
@@ -193,6 +198,18 @@ openerp.mail = function(session) {
                 }
                 else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
             });
+            // event: click on 'attachment(s)' in msg
+            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
+                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
+                act_dom.toggle();
+                return false;
+            });
+            // see more
+            this.$element.on('click','a.oe_mail_msg_more', function (event) {
+                $(this).siblings('.oe_mail_msg_tail').show();
+                $(this).hide();
+                return false;
+            });
         },
         
         destroy: function () {
@@ -215,10 +232,12 @@ openerp.mail = function(session) {
             $.when(defer).then(function (records) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
+                
                 self.display_comments(records);
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                 else  self.$element.find('div.oe_mail_thread_more:last').hide();
-                });
+            });
+            
             return defer;
         },
 
@@ -233,13 +252,18 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
+            
+            //build attachments download urls and compute time-relative from dates
+            for (var k in records) {
+                records[k].timerelative = $.timeago(records[k].date);
+                if (records[k].attachments) {
+                    for (var l in records[k].attachments) {
+                        var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
+                        records[k].attachments[l].url = url;
+                    }
+                }
+            }
             this.cs = this.sort_comments_tmp(records);
-            
-            /* WIP: map matched regexp -> records to browse with name */
-            //_(records).each(function (record) {
-                //self.do_check_internal_links(record.body_text);
-            //});
-            
             _(records).each(function (record) {
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
@@ -253,7 +277,7 @@ openerp.mail = function(session) {
                     self.display_comment(record);
                     self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
                                                             'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id});
-                    self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
+                    self.$element.find('.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
                 else if (self.params.thread_level == 0) {
@@ -268,26 +292,27 @@ openerp.mail = function(session) {
          * Display a record
          */
         display_comment: function (record) {
-            if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }    
+            record.body = this.do_text_nl2br(record.body, true);
+            if (record.type == 'email') {
+                record.mini_url = ('/mail/static/src/img/email_icon.png');
+            } else { 
+                record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]);
+            }
             // body text manipulation
             record.body = this.do_clean_text(record.body);
-            record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
-            if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
+
+            // split for see more
+            var split = this.do_truncate_string(record.body, this.params.msg_more_limit);
+            record.body_head = split[0];
+            record.body_tail = split[1];
+
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
-            // render
-            $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
-                    ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-            // truncated: hide full-text, show summary, add buttons
-            if (record.tr_body) {
-                var node_body = this.$element.find('span.oe_mail_msg_body:last').append(' <a href="#" class="reduce">[ ... Show less]</a>');
-                var node_body_short = this.$element.find('span.oe_mail_msg_body_short:last').append(' <a href="#" class="expand">[ ... Show more]</a>');
-                node_body.hide();
-                node_body.find('a:last').click(function() { node_body.hide(); node_body_short.show(); return false; });
-                node_body_short.find('a:last').click(function() { node_body_short.hide(); node_body.show(); return false; });
-            }
+
+
+            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'));
         },
        
         /**
@@ -403,7 +428,7 @@ openerp.mail = function(session) {
             var regex_res = regex_login.exec(string);
             while (regex_res != null) {
                 var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
+                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
                 regex_res = regex_login.exec(string);
             }
             /* special shortcut: :name, try to find an icon if in list */
@@ -422,16 +447,32 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
         
+        /**
+         * @param {String} string to truncate
+         * @param {Number} max number of chars to display 
+         * @returns {String} truncated string
+         */
         do_truncate_string: function(string, max_length) {
-            if (string.length <= (max_length * 1.2)) return false;
-            else return string.slice(0, max_length);
+            // multiply by 1.2: prevent truncating an just too little long string
+            if (string.length <= (max_length * 1.2)) {
+                return [string, ""];
+            } else {
+                return [string.slice(0, max_length), string.slice(max_length)];
+            }
         },
         
+        /** Removes html tags, except b, em, br */
         do_clean_text: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em)\\s*&gt;', 'gi'), '<$1$2>');
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
         },
         
+        /** Replaces line bracks by html line breaks (br) */
+        do_text_nl2br: function (str, is_xhtml) {   
+            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
+        },
+        
         /**
          *
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
@@ -465,16 +506,11 @@ openerp.mail = function(session) {
         },
 
     });
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
 
-
-    /* Add ThreadView widget to registry */
-    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
-//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
-
-    /* ThreadView widget: thread of comments */
+    /** ThreadView widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
-        // QWeb template to use when rendering the object
-        template: 'RecordThread',
+        template: 'mail.RecordThread',
 
        init: function() {
             this._super.apply(this, arguments);
@@ -516,7 +552,7 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; }
+            if (! 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
@@ -541,7 +577,7 @@ openerp.mail = function(session) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
                 var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
                 $('<li><img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '"/>' +
-                  '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
+                  '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
             });
             if (self.is_subscriber) {
                 self.$element.find('button.oe_mail_button_follow').hide();
@@ -573,14 +609,11 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
     });
-    
-    
-    /* Add WallView widget to registry */
-    session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
-    
-    /* WallView widget: a wall of messages */
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+
+    /** WallView widget: a wall of messages */
     mail.WallView = session.web.Widget.extend({
-        template: 'Wall',
+        template: 'mail.Wall',
 
         /**
          * @param {Object} parent parent
@@ -630,7 +663,7 @@ openerp.mail = function(session) {
         add_event_handlers: function () {
             var self = this;
             // post a comment
-            this.$element.find('button.oe_mail_wall_button_comment').click(function () { return self.do_comment(); });
+            this.$element.find('.oe_mail_wall_action button').click(function () { return self.do_comment(); });
             // display more threads
             this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
         },
@@ -684,7 +717,7 @@ openerp.mail = function(session) {
             this.search['context'] = _.extend(this.params.context, this.search_results.context);
             this.display_show_more = true;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('div.oe_mail_wall_threads').empty();
+            this.$element.find('ul.oe_mail_wall_threads').empty();
             return this.fetch_comments(this.params.limit, 0);
         },
 
@@ -716,14 +749,14 @@ openerp.mail = function(session) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
                 var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('WallThreadContainer', {});
-                $('<div class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
+                var render_res = session.web.qweb.render('mail.WallThreadContainer', {});
+                $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
                     'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
                     );
                 self.thread_list.push(thread);
-                return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
+                return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
             });
             // update TODO
             this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
@@ -770,12 +803,14 @@ openerp.mail = function(session) {
         
         /** Action: Posts a comment */
         do_comment: function () {
-            var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea');
+            var comment_node = this.$element.find('.oe_mail_wall_action textarea');
             var body_text = comment_node.val();
             comment_node.val('');
             var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
         },
     });
+    session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a34e362960b..5ff8a996116 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="Wall" class="oe_mail_wall">
+    <div t-name="mail.Wall" class="oe_mail_wall">
         <table class="oe_view_manager_header">
             <tr class="oe_header_row">
                 <td><h2 class="oe_view_title">All Feeds</h2></td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
         </table>
-        <div class="oe_mail_wall_left">
-            <div class="oe_mail_wall_act">
+        <div class="oe_mail_wall_main">
+            <div class="oe_mail_wall_action">
                 <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
-            <div class="oe_mail_wall_threads">
-            </div>
+            <ul class="oe_mail_wall_threads">
+            </ul>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
         </div>
-        <div class="oe_mail_wall_right"></div>
+        <div class="oe_mail_wall_aside"></div>
     </div>
 
-    <t t-name="WallThreadContainer">
+    <t t-name="mail.WallThreadContainer">
     </t>
 
-    <div t-name="RecordThread" class="oe_mail_recthread">
-        <h4>History and Comments</h4>
-        <div class="oe_mail_recthread_left">
-        </div>
+    <div t-name="mail.RecordThread" class="oe_mail_recthread">
+        <div class="oe_mail_recthread_left"></div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
@@ -44,8 +42,8 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
+    <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 = '';"/>
@@ -55,78 +53,61 @@
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
         </div>
-    </ul>
+    </div>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+    <!-- default layout -->
+    <div t-name="mail.Thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
-            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_email_icon oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
-            </div>
-            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
-        </div>
-    </li>
-    
-    <t t-name="NoteDisplay">
-        <p class="oe_mail_msg">
-            <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            </t>
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
-            <ul>
-              <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-              </t>
-              <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
-              </t>
-              <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
-              </t>
-              <li>
-                <span class="oe_fade"><t t-raw="record.date"/>
-                  by <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                <span class="oe_dropdown_toggle oe_dropdown_arrow">
+                    <ul class="oe_dropdown_menu">
+                        <t t-if="thread._is_author(record.user_id[0]) &amp;&amp; display['show_delete']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></li>
+                        </t>
+                        <t t-if="!thread._is_author(record.user_id[0]) &amp;&amp; display['show_hide']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></li>
+                        </t>
+                        <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                    </ul>
                 </span>
-              </li>
-            </ul>
-        </p>
-    </t>
-    
-    <t t-name="EmailDisplay">
-        <p class="oe_mail_msg oe_mail_msg_p_email_header">
-            <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            </t>
-        </p>
-        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
-        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
-        <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-        </p>
-
-        <ul>
-          <t t-if="display['show_delete']">
-            <t t-if="thread._is_author(record.user_id[0])">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-            </t>
-          </t>
-          <t t-if="display['show_hide']">
-            <t t-if="!(thread._is_author(record.user_id[0]))">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-            </t>
-          </t>
-          <li>
-            <span class="oe_fade"><t t-raw="record.date"/></span>
-          </li>
-        </ul>
-    </t>
-
+                <div class="oe_mail_msg">
+                    <h1 t-if="record.subject &amp;&amp; record.subject != 'Reply'" class="oe_mail_msg_title">
+                        <t t-raw="record.subject"/>
+                    </h1>
+                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
+                        <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
+                    </div>
+                    <div class="oe_mail_msg_body">
+                        <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a>
+                        <t t-raw="record.body_head"/>
+                        <t t-if="record.body_tail"><a href="#" class="oe_mail_msg_more">... See more</a>
+                            <span class="oe_mail_msg_tail"><t t-raw="record.body_tail"/></span>
+                        </t>
+                    </div>
+                    <ul class="oe_mail_msg_footer">
+                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      <!-- uncomment when merging vote
+                      <li><a href="#">Like</a></li>
+                      -->
+                      <li t-if="record.attachment_ids.length > 0">
+                          <a href="#" class="oe_mail_msg_view_attachments">
+                              <t t-if="record.attachment_ids.length == 1">Attachment</t>
+                              <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                          </a>
+                      </li>
+                    </ul>
+                    <t t-if="record.attachment_ids.length > 0">
+                        <div class="oe_clear"></div>
+                        <ul class="oe_mail_msg_attachments">
+                            <t t-foreach="record.attachments" t-as="attachment">
+                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
+                            </t>
+                        </ul>
+                    </t>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c51818f13f5..83053afe614 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -8,16 +8,14 @@
             <field name="arch" type="xml">
                 <form string="Configure Marketing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4" string="Campaigns">
-                            <field name="module_marketing_campaign"/>
-                            <field name="module_marketing_campaign_crm_demo"/>
-                            <field name="module_crm_profiling"/>
-                        </group>
-                    </sheet>
+                    <group string="Campaigns">
+                        <field name="module_marketing_campaign"/>
+                        <field name="module_marketing_campaign_crm_demo"/>
+                        <field name="module_crm_profiling"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 5cd0839d800..aa8ea08217e 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -81,31 +81,31 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.search</field>
-       <field name="model">marketing.campaign</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Campaigns">
-               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="object_id" string="Resource"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.search</field>
+        <field name="model">marketing.campaign</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Campaigns">
+                <field name="name" string="Campaign"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
+                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">Campaigns</field>
@@ -155,7 +155,7 @@
                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
-                           <field name="sync_last_date" class="oe_form_inline"/>
+                           <field name="sync_last_date" class="oe_inline"/>
                            <button string="Synchronize Manually" states="running" name="synchroniz" type="object"/>
                        </div>
                        <field name="date_next_sync"/>
@@ -185,34 +185,35 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.segment.search</field>
-       <field name="model">marketing.campaign.segment</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Segments">
-               <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
-               <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="campaign_id"/>
-               <field name="object_id"/>
-               <field name="date_run"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.segment.search</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Segments">
+                <field name="name" string="Segment"/>
+                <separator orientation="vertical"/>
+                <field name="date_run"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">Segments</field>
@@ -382,43 +383,42 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.workitem.search</field>
-       <field name="model">marketing.campaign.workitem</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Marketing Campaign Activities">
-               <group>
-                <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="segment_id"/>
-                <field name="date"/>
+    <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.workitem.search</field>
+        <field name="model">marketing.campaign.workitem</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Campaign Activities">
+                <group>
+                    <field name="res_name" string="Marketing Campaign Activity"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="campaign_id"/>
+                    <field name="segment_id"/>
+                    <field name="object_id"/>
+                    <field name="partner_id"/>
+                    <field name="res_id"/>
+                </group>
                 <newline/>
-                <field name="object_id"/>
-                <field name="res_name"/>
-                <field name="res_id"/>
-                <field name="partner_id"/>
-               </group>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">Campaign Followup</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 19d1c78f896..7b3d848cc8b 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,21 +31,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                   <group>
-                    <filter icon="terp-go-year" name="year"
-                            string="Year"
-                            domain="[('year','=',time.strftime('%%Y'))]"/>
-                    <separator orientation="vertical"/>
-
-                    <filter icon="terp-go-month"
-                            string="Month" name="This Month"
-                            domain="[('month','=',time.strftime('%%m'))]"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-
-                    <filter icon="terp-go-today"
-                            string="Today"
-                            domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
@@ -66,8 +53,8 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
+                    <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 58672e9a6cc..15645294bb7 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
-                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="code"/>
-                   <field name="name"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group  expand='0' string='Group by...'>
-                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
-                       <separator orientation="vertical"/>
-                       <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
-                   </group>
+                    <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="categ_id" widget="selection" operator="child_of"/>
+                    <newline/>
+                    <group  expand='0' string='Group by...'>
+                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -94,10 +94,15 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <field name="membership" readonly="0"/>
-                        <newline/>
-                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
-                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <group>
+                            <group>
+                                <field name="membership" readonly="0"/>
+                            </group>
+                            <group>
+                                <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                                <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                            </group>
+                        </group>
                     </page>
                 </page>
             </field>
@@ -162,26 +167,24 @@
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Membership Partners">
-		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-	          		<separator orientation="vertical"/>
-		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-	          		<separator orientation="vertical"/>
-	                <field name="membership_stop" string="End Membership Date"/>
-	                <field name="membership_start" invisible="1"/>
-	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="8">
-	                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-	              		<separator orientation="vertical"/>
-	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-	                	<separator orientation="vertical"/>
-	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	            	</group>
-	           </search>
+                <search string="Membership Partners">
+                    <field name="membership_start" invisible="1"/>
+                    <field name="membership_stop" string="End Membership Date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                    <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                    <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <group expand="0" string="Group By..." colspan="10" col="8">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -235,23 +238,23 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Membership">
-                        <group colspan="2" col="2">
-                            <group colspan="4" col="3">
-                            <field name="free_member"/>
-                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
-                            <field colspan="4" name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
-                            <field colspan="4" name="membership_state"/>
+                        <group>
+                            <group>
+                                <field name="free_member"/>
+                                <field colspan="4" name="membership_state"/>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
+                            </group>
+                            <group>
+                                <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
+                                <field name="membership_start"/>
+                                <field name="membership_stop"/>
+                                <field name="membership_cancel"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="membership_start"/>
-                            <field name="membership_stop"/>
-                            <field name="membership_cancel"/>
                         </group>
                         <field name="member_lines" nolabel="1" colspan="4" readonly="1">
                             <tree string="Memberships">
                                 <field name="date"/>
-                                <field name="membership_id"/>
+                                <field name="membership_id" string="Membership"/>
                                 <field name="member_price"/>
                                 <field name="account_invoice_id"/>
                                 <field name="state"/>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 6b3f6a9eb71..51e1f2499b7 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,20 +36,11 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Events created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    "
-                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in last month"/>
+                        <field name="date_from"/>
                         <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 9dd5d1afb0e..0ac0c02540f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -21,19 +21,18 @@
         </record>
 
         <record id="open_board_manufacturing" model="ir.actions.act_window">
-            <field name="name">Production Dashboard</field>
+            <field name="name">Manufacturing</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-        <menuitem id="menus_dash_mrp" name="Manufacturing"
-            parent="base.menu_reporting_dashboard" sequence="15"/>
-        <menuitem
-            action="open_board_manufacturing" icon="terp-graph"
-            id="menu_board_manufacturing" parent="menus_dash_mrp"
-            sequence="1"/>
+        <menuitem action="open_board_manufacturing"
+                  icon="terp-graph"
+                  id="menu_board_manufacturing"
+                  parent="base.menu_reporting_dashboard"
+                  sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b2ace70fc08..9b1079dc34e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -82,9 +82,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                    <group>
-                       <field name="name"/>
-                       <field name="composition"/>
+                       <field name="name" string="Name"/>
+                       <separator orientation="vertical"/>
                        <field name="group_id"  widget="selection" />
+                       <field name="composition"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -188,10 +189,10 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group>
+                        <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="resource_type"/>
                    </group>
                    <newline/>
@@ -199,7 +200,7 @@
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    </group>
+                   </group>
                </search>
             </field>
         </record>
@@ -287,13 +288,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
+                    <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -321,61 +321,66 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
-                        <field name="product_qty" class="oe_form_inline"/>
-                        <field name="product_uom" class="oe_form_inline"/>
-                    </h1>
-                    <label for="routing_id" class="oe_form_readonly_hidden"/>
-                    <h2>
-                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                    </h2>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="code" string="Reference"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="product_uos_qty" groups="product.group_uos" />
-                            <field name="product_uos"  groups="product.group_uos"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Components">
-                            <field name="bom_lines" widget="one2many_list">
-                                <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"/>
-                                    <field name="name" invisible="1"/>
-                                    <field name="date_start"/>
-                                    <field name="date_stop"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field name="revision_ids"/>
-                        </page>
-                        <page string="Properties" groups="product.group_mrp_properties">
-                            <group col="4">
-                                <field name="position"/>
-                                <field name="active"/>
-                                <field name="sequence"/>
-                                <field name="bom_id"/>
-
-                                <field name="date_start"/>
-                                <field name="date_stop"/>
-                                <field name="product_rounding"/>
-                                <field name="product_efficiency"/>
-                            </group>
-                            <separator string="Properties"/>
-                            <field name="property_ids"/>
-                        </page>
-                    </notebook>
-                    <newline/>
+                	<sheet>
+	                    <label for="product_id" class="oe_edit_only"/>
+	                    <h1>
+	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+	                        <field name="product_qty" class="oe_inline"/>
+	                        <field name="product_uom" class="oe_inline"/>
+	                    </h1>
+	                    <label for="routing_id" class="oe_edit_only"/>
+	                    <h2>
+	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
+	                    </h2>
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="code" string="Reference"/>
+	                        </group>
+	                        <group>
+	                            <field name="type"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="product_uos_qty" groups="product.group_uos" />
+	                            <field name="product_uos"  groups="product.group_uos"/>
+	                        </group>
+	                    </group>
+	                    <notebook>
+	                        <page string="Components">
+	                            <field name="bom_lines" widget="one2many_list">
+	                                <tree string="Components" editable="bottom">
+	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+	                                    <field name="product_qty"/>
+	                                    <field name="product_uom"/>
+	                                    <field name="name" invisible="1"/>
+	                                    <field name="date_start"/>
+	                                    <field name="date_stop"/>
+	                                </tree>
+	                            </field>
+	                        </page>
+	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+	                            <field name="revision_ids"/>
+	                        </page>
+	                        <page string="Properties" groups="product.group_mrp_properties">
+	                            <group>
+                                        <group>
+                                            <field name="position"/>
+                                            <field name="bom_id"/>
+                                            <field name="sequence"/>
+                                            <field name="active"/>
+                                        </group>
+                                        <group>
+                                            <field name="date_start"/>
+                                            <field name="date_stop"/>
+                                            <field name="product_rounding"/>
+                                            <field name="product_efficiency"/>
+                                        </group>
+	                            </group>
+	                            <separator string="Properties"/>
+	                            <field name="property_ids" widget="many2many_tags" />
+	                        </page>
+	                    </notebook>
+	                    <newline/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -387,8 +392,8 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group>
-                         <field name="name"/>
-                         <field name="code" string="Reference"/>
+                         <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                         <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </group>
@@ -608,17 +613,17 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <label for="product_id" class="oe_edit_only"/>
                     <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_form_inline"/>
-                        <field name="product_qty" class="oe_form_inline"/>
-                        <field name="product_uom" class="oe_form_inline"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
+                        <field name="product_qty" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline"/>
                         <button type="action"
-                            icon="terp-accessories-archiver+" class="oe_form_inline"
+                            icon="terp-accessories-archiver+" class="oe_inline"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
                     </h1>
-                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_form_readonly_hidden"/>
+                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_edit_only"/>
                     <h2>
                         <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     </h2>
@@ -774,6 +779,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group>
+                       <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -783,15 +790,12 @@
                        <filter icon="terp-check" string="In Production" name="inprogress"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are currently in production."/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                       <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fa68d1bdcff..eef6c89f702 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -36,7 +36,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
-                    <field name="name"/>
+                    <field name="name" string="Week"/>
+                    <separator orientation="vertical"/>
                     <field name="workcenter_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 1b2aa1c2732..cbee02cb4a8 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,7 +28,7 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Master Manufacturing Order Schedule',
+        'module_stock_planning': fields.boolean('Master Production Schedule',
             help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
                 which works automatically based on minimum stock rules.
                 This installs the module stock_planning."""),
@@ -68,6 +68,13 @@ class mrp_config_settings(osv.osv_memory):
         'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
+        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+            help="""This allows you to define the following for a product:
+                    * Manufacturer
+                    * Manufacturer Product Name
+                    * Manufacturer Product Code
+                    * Product Attributes.
+                This installs the module product_manufacturer."""),        
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index be54110d641..da1243452b1 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,24 +8,27 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <group col="4" string="Manufacturing Order">
+                    <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" col="4">
+                        <group string="Logistics">
                             <field name="module_mrp_jit"/>
                             <field name="module_stock_no_autopicking"/>
                         </group>
-                        <group string="Bill Of Material" col="4">
+                        <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>
                 </form>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..5259d060414 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -123,25 +123,26 @@
             <field name="model">mrp.production.workcenter.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <search string="Search Work Orders">
-                        <group>
-                           <filter icon="terp-document-new" string="Draft"
-                               domain="[('state','=','draft')]"/>
-                           <filter icon="terp-check" string="In Progress" name="Current"
-                               domain="[('state','=','startworking')]"/>
-                           <filter icon="terp-gtk-media-pause" string="Pending"
-                               domain="[('state','=','pause')]"/>
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                               domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                               help="Production started late" />
-                           <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="workcenter_id" widget="selection"/>
-                            <field name="production_id" />
-                            <field name="state" />
-                            <field name="date_planned"/>
-                        </group>
+                <search string="Search Work Orders">
+                    <group>
+                        <field name="name" string="Work Orders"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_planned"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-check" string="In Progress" name="Current"
+                            domain="[('state','=','startworking')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending"
+                            domain="[('state','=','pause')]"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                            help="Production started late"/>
+                        <separator orientation="vertical"/>
+                        <field name="workcenter_id" widget="selection"/>
+                        <field name="production_id"/>
+                        <field name="state"/>
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 9b1b022e668..543024b6354 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,24 +47,12 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('year','=',time.strftime('%%Y'))]"
-                                help="Work orders made during current year"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('month','=',time.strftime('%%m'))]"
-                                help="Work orders made during current month"/>
-                        <filter icon="terp-go-week"
-                                string="Month -1"
-                                domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
-                                help="Work orders during last month"/>
-                      <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
                    </group>
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 95a66263593..9caee139c18 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6e40bb8fd26..10c19eb1585 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -43,11 +43,11 @@
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </header>
                <sheet string="Repairs order">
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <label for="product_id" class="oe_edit_only"/>
                     <h1>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                     </h1>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h2>
                         <field name="name"/>
                     </h2>
@@ -112,7 +112,7 @@
                                 <field name="price_subtotal"/>
                             </tree>
                         </field>
-                        <group class="oe_form_subtotal_footer">
+                        <group class="oe_subtotal_footer">
                             <field name="amount_untaxed" sum="Untaxed amount"/>
                             <field name="amount_tax"/>
                             <field name="amount_total" sum="Total amount"/>
@@ -191,16 +191,16 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group>
+                       <field name="name" string="Reair Orders"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                       <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="partner_id"/>
-                       <field name="state" />
+                       <field name="state"/>
                   </group>
                   <newline/>
                   <group expand="0" string="Group By...">
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index b598b050410..d311d6a2da4 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/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:36+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "sub products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
@@ -54,7 +54,7 @@ msgstr "部件不应该是成品本身"
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "Sub Products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -89,7 +89,7 @@ msgstr "编号必须在公司内唯一！"
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
 msgid "sub_products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index db0be0d09f4..1a185fb08f3 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,7 +49,8 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name"/>
+                    <field name="name" string="Multi Company"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
new file mode 100644
index 00000000000..4b4449b32f1
--- /dev/null
+++ b/addons/pad/i18n/sv.po
@@ -0,0 +1,58 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-12 21:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
+"X-Generator: Launchpad (build 15389)\n"
+
+#. module: pad
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: pad
+#: help:res.company,pad_url_template:0
+msgid "Template used to generate pad URL."
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: pad
+#: model:ir.model,name:pad.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: field:res.company,pad_url_template:0
+msgid "Pad URL Template"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
+msgid "Add Pad"
+msgstr ""
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
new file mode 100644
index 00000000000..eff5717af2a
--- /dev/null
+++ b/addons/pad_project/i18n/fr.po
@@ -0,0 +1,38 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-22 08:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
new file mode 100644
index 00000000000..80ab55d9edc
--- /dev/null
+++ b/addons/pad_project/i18n/mn.po
@@ -0,0 +1,39 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-18 01:15+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-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
new file mode 100644
index 00000000000..fef26a15515
--- /dev/null
+++ b/addons/pad_project/i18n/sv.po
@@ -0,0 +1,38 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-20 15:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
new file mode 100644
index 00000000000..14830e380bf
--- /dev/null
+++ b/addons/plugin/i18n/fi.po
@@ -0,0 +1,23 @@
+# Finnish 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-06-24 12:58+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr ""
diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 676540dc63a..4fc1f391fab 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -22,29 +22,21 @@
 from osv import fields
 from osv import osv
 import addons
-
 import base64
 
 class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
-        'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'description':fields.text('Description', readonly=True)
+        'plugin32': fields.char('Outlook Plug-in 32bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
+        'plugin64': fields.char('Outlook Plug-in 64bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
     }
 
-    _defaults = {
-        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
-        'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
-        'description' : """
-Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
-
-System requirements:
-    1.  MS Outlook 2005 or above.
-    2.  MS .Net Framework 3.5 or above.
-"""
-        }
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(outlook_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+        res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c4791ee153c..13c1e6f32c4 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,14 +19,18 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-                   <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
-                            <field name="name" widget="url" colspan="4"/>
-                            <field name="name2" widget="url" colspan="4"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                    <xpath expr="//separator[@string='title']" position="after" version="7.0">
+                        <group>
+                            <field name="plugin32" widget="url"/>
+                            <field name="plugin64" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
+                        <p>System requirements:</p>
+                        <ul>
+                            <li>1. MS Outlook 2005 or above.</li>
+                            <li>2. MS .Net Framework 3.5 or above.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
@@ -50,13 +54,15 @@
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" position="after">
-                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <button name="%(action_outlook_installer)d" type="action"
-                            string="Configure Outlook Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_outlook" version="7.0" position="replace">
+                    <label for="module_plugin_outlook"/>
+                    <div>
+                        <field name="module_plugin_outlook"/>
+                        <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
new file mode 100644
index 00000000000..becd086e728
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/sv.po
@@ -0,0 +1,98 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 08:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Installationshandbok"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "Titel"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Stäng"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installation och konfigureringssteg"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Filnamn"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr ""
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 7e9b5626e5b..6473758883d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -27,28 +27,22 @@ class plugin_thunderbird_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'name':fields.char('File name', size=34),
-        'pdf_name':fields.char('File name', size=64),
-        'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
-        'plugin_file':fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
-        'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
-        'description':fields.text('Description', readonly=True)
+        'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
+        'plugin_name': fields.char('File name', size=64),
+        'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."),
+        'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
     }
 
     _defaults = {
-        'thunderbird' : True,
-        'name' : 'openerp_plugin.xpi',
-        'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
-        'description' : """
-Thunderbird plugin installation:
-    1.  Save the Thunderbird plug-in.
-    2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
-    4.  Select the plug-in (the file named openerp_plugin.xpi).
-    5.  Click "Install Now".
-    6.  Restart Thunderbird.
-    7.  From the Thunderbird menubar: OpenERP -> Configuration.
-    8.  Configure your openerp server.
-"""
+        'thunderbird': True,
+        'plugin_name': 'openerp_plugin.xpi',
+        'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
     }
 
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(plugin_thunderbird_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi'
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ec9a8c72610..5ad1f824a78 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -19,18 +19,23 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
                     <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
+                        <group>
                             <field name="thunderbird" invisible="1"/>
-                            <field name="name" invisible="1"/>
-                            <field name="pdf_name" invisible="1"/>
-                            <newline/>
-                            <field name="plugin_file" filename="name" widget="url"/>
-                            <newline/>
-                            <field name="pdf_file" filename="pdf_name" widget="url"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                            <field name="plugin_name" invisible="1"/>
+                            <field name="plugin_file" filename="plugin_name" widget="url"/>
+                            <field name="pdf_file" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Thunderbird plugin installation:</p>
+                        <ul>
+                            <li>1. Save the Thunderbird plug-in.</li>
+                            <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
+                            <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
+                            <li>4. Click "Install Now".</li>
+                            <li>5. Restart Thunderbird.</li>
+                            <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li>
+                            <li>7. Configure your openerp server.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                          <attribute name="string">Install Thunderbird Plug-In</attribute>
@@ -48,19 +53,21 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
         </record>
-    
+
         <!-- Sales Configuration -->
         <record id="view_config_thunderbird_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_thunderbird" position="after">
-                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <button name="%(action_thunderbird_installer)d" type="action"
-                            string="Configure Thunderbird Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_thunderbird" version="7.0" position="replace">
+                    <label for="module_plugin_thunderbird"/>
+                    <div>
+                        <field name="module_plugin_thunderbird"/>
+                        <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index e5ade747840..c67fcd0e9fe 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,10 +27,12 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <field name="name" string="Cash Statement"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
-                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <separator orientation="vertical"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
@@ -52,11 +54,13 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" string="Cash Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index ab68e12ae41..003f2023460 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -58,7 +58,7 @@
                                     </group>
                                 </form>
                             </field>
-                            <group class="oe_form_subtotal_footer">
+                            <group class="oe_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
@@ -138,18 +138,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_order"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -651,11 +649,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="PoS Categories" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index a1631ab0203..255af0cdd30 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,23 +35,7 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month" name="This Month"
-                           domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="POS ordered created during current month"/>
-                        <filter icon="terp-go-month"
-                             string="Month -1"
-                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
@@ -59,14 +43,13 @@
                         <filter icon="terp-dolar"
                             string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index b4a2f1e6ecb..afd769692df 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -26,39 +26,21 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Point of Sale Cash Register Analysis">
-                  <group>
-                      <filter icon="terp-go-year" string="Year" name="year"
-                          domain="[('year','=',time.strftime('%%Y'))]"
-                          help="Cash Analysis created during this year"/>
-                      <separator orientation="vertical"/>
-
-                      <filter icon="terp-go-month" string="Month" name="This Month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Cash Analysis created in current month"/>
-                      <filter icon="terp-go-month"
-                           string="Month -1"
-                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Cash Analysis created in last month"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>
-                      <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                            string="Draft"
-                            domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
+                <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new"
+                        string="Draft"
+                        domain="[('state','=',('draft'))]"/>
+                    <filter icon="terp-camera_test"
                           string="Confirm"
                           domain="[('state','=',('confirm'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection">
-                        <filter icon="terp-personal"
+                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        </field>
+                    <separator orientation="vertical"/>
+                    <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 1ec4cbb0e4b..881be3be05f 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -27,7 +27,7 @@ from tools.misc import email_re
 from tools.translate import _
 
 from base.res.res_users import _lang_get
-
+_logger = logging.getLogger(__name__)
 
 
 # welcome email sent to new portal users (note that calling tools.translate._
@@ -174,7 +174,7 @@ class wizard(osv.osv_memory):
                 body = _(WELCOME_EMAIL_BODY) % data
                 res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
                 if not res:
-                    logging.getLogger('res.portal.wizard').warning(
+                    _logger.warning(
                         'Failed to send email from %s to %s', email_from, email_to)
         
         return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index b5c9d165cc6..b2ed8703421 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -21,6 +21,8 @@
 
 from osv import osv, fields
 from tools.translate import _
+import logging
+_logger = logging.getLogger(__name__)
 
 UID_ROOT = 1
 SHARED_DOCS_MENU = "Documents"
@@ -164,19 +166,19 @@ class share_wizard_portal(osv.osv_memory):
             # v6.1, the algorithm for combining them will OR the rules, hence
             # extending the visible data.
             Rules.write(cr, UID_ROOT, share_rule_ids, {'groups': [(4,target_group.id)]})
-            self._logger.debug("Linked sharing rules from temporary sharing group to group %s", target_group)
+            _logger.debug("Linked sharing rules from temporary sharing group to group %s", target_group)
 
             # Copy the access rights. This is appropriate too because
             # groups have the UNION of all permissions granted by their
             # access right lines.
             for access_line in share_group.model_access:
                 Rights.copy(cr, UID_ROOT, access_line.id, default={'group_id': target_group.id})
-            self._logger.debug("Copied access rights from temporary sharing group to group %s", target_group)
+            _logger.debug("Copied access rights from temporary sharing group to group %s", target_group)
 
         # finally, delete it after removing its users
         Groups.write(cr, UID_ROOT, [share_group_id], {'users': [(6,0,[])]})
         Groups.unlink(cr, UID_ROOT, [share_group_id])
-        self._logger.debug("Deleted temporary sharing group %s", share_group_id)
+        _logger.debug("Deleted temporary sharing group %s", share_group_id)
 
     def _finish_result_lines(self, cr, uid, wizard_data, share_group_id, context=None):
         super(share_wizard_portal,self)._finish_result_lines(cr, uid, wizard_data, share_group_id, context=context)
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 268820f92d3..fe88f61bd98 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -14,76 +14,78 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="active"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Nodes">
-                        <field name="node_ids" colspan="4" nolabel="1">
-                            <tree string="Process Nodes">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="kind"/>
-                                <field name="flow_start"/>
-                            </tree>
-                            <form string="Process Node" version="7.0">
-                                <group colspan="4" col="4">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="active"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Nodes">
+                            <field name="node_ids" colspan="4" nolabel="1">
+                                <tree string="Process Nodes">
                                     <field name="name"/>
-                                    <field name="flow_start"/>
+                                    <field name="model_id"/>
                                     <field name="kind"/>
-                                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Properties">
-                                        <group colspan="4" col="6">
-                                            <field name="model_id"/>
-                                            <field name="menu_id"/>
-                                            <field name="help_url" widget="url"/>
-                                        </group>
-                                        <separator string="Conditions" colspan="4"/>
-                                        <field name="model_states"/>
-                                        <field name="condition_ids" nolabel="1" colspan="4">
-                                            <tree string="Other Conditions" editable="top">
-                                                <field name="name"/>
+                                    <field name="flow_start"/>
+                                </tree>
+                                <form string="Process Node" version="7.0">
+                                    <group colspan="4" col="4">
+                                        <field name="name"/>
+                                        <field name="flow_start"/>
+                                        <field name="kind"/>
+                                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+    
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Properties">
+                                            <group colspan="4" col="6">
                                                 <field name="model_id"/>
-                                                <field name="model_states"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Transitions">
-                                        <group colspan="4" col="4">
-                                            <group colspan="2" col="2">
-                                                <field name="transition_in" nolabel="1" height="400">
-                                                    <tree string="Incoming Transitions">
-                                                        <field name="name"/>
-                                                        <field name="source_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                           <group colspan="2" col="2">
-                                                <field name="transition_out" nolabel="1" height="400">
-                                                    <tree string="Outgoing Transitions">
-                                                        <field name="name"/>
-                                                        <field name="target_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                        </group>
-                                    </page>
-                                    <page string="Notes">
-                                       <field name="note" nolabel="1" colspan="4"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
+                                                <field name="menu_id"/>
+                                                <field name="help_url" widget="url"/>
+                                            </group>
+                                            <separator string="Conditions" colspan="4"/>
+                                            <field name="model_states"/>
+                                            <field name="condition_ids" nolabel="1" colspan="4">
+                                                <tree string="Other Conditions" editable="top">
+                                                    <field name="name"/>
+                                                    <field name="model_id"/>
+                                                    <field name="model_states"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Transitions">
+                                            <group colspan="4" col="4">
+                                                <group colspan="2" col="2">
+                                                    <field name="transition_in" nolabel="1" height="400">
+                                                        <tree string="Incoming Transitions">
+                                                            <field name="name"/>
+                                                            <field name="source_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                               <group colspan="2" col="2">
+                                                    <field name="transition_out" nolabel="1" height="400">
+                                                        <tree string="Outgoing Transitions">
+                                                            <field name="name"/>
+                                                            <field name="target_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                            </group>
+                                        </page>
+                                        <page string="Notes">
+                                           <field name="note" nolabel="1" colspan="4"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -108,7 +110,8 @@
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Process"/>
+                        <separator orientation="vertical"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
@@ -153,47 +156,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="process_id"/>
-                    <field name="flow_start"/>
-                    <field name="kind"/>
-                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                </group>
-                <notebook>
-                    <page string="Properties">
-                        <group col="4">
-                            <field name="model_id"/>
-                            <field name="menu_id"/>
-                            <field name="help_url" widget="url"/>
-                            <field name="model_states"/>
-                        </group>
-                        <field name="condition_ids">
-                            <tree string="Other Conditions" editable="bottom">
-                                <field name="name"/>
+                <sheet layout="auto">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="process_id"/>
+                        <field name="flow_start"/>
+                        <field name="kind"/>
+                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    </group>
+                    <notebook>
+                        <page string="Properties">
+                            <group col="4">
                                 <field name="model_id"/>
+                                <field name="menu_id"/>
+                                <field name="help_url" widget="url"/>
                                 <field name="model_states"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Transitions">
-                        <field name="transition_in" nolabel="1" height="400">
-                            <tree string="Incoming Transitions">
-                                <field name="name"/>
-                                <field name="source_node_id"/>
-                            </tree>
-                        </field>
-                        <field name="transition_out" nolabel="1" height="400">
-                            <tree string="Outgoing Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                       <field name="note"/>
-                    </page>
-                </notebook>
+                            </group>
+                            <field name="condition_ids">
+                                <tree string="Other Conditions" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="model_id"/>
+                                    <field name="model_states"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Transitions">
+                            <field name="transition_in" nolabel="1" height="400">
+                                <tree string="Incoming Transitions">
+                                    <field name="name"/>
+                                    <field name="source_node_id"/>
+                                </tree>
+                            </field>
+                            <field name="transition_out" nolabel="1" height="400">
+                                <tree string="Outgoing Transitions">
+                                    <field name="name"/>
+                                    <field name="target_node_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                           <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -205,7 +210,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Node"/>
+                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
@@ -252,38 +258,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
-                <notebook>
-                    <page string="Actions">
-                        <field name="action_ids">
-                            <tree string="Actions">
-                                <field name="name"/>
-                                <field name="state"/>
-                                <field name="action"/>
-                            </tree>
-                            <form string="Actions" version="7.0">
-                                <group col="4">
-                                    <field name="name" colspan="4"/>
+                <sheet layout="auto">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="source_node_id"/>
+                        <field name="target_node_id"/>
+                    </group>
+                    <notebook>
+                        <page string="Actions">
+                            <field name="action_ids">
+                                <tree string="Actions">
+                                    <field name="name"/>
                                     <field name="state"/>
                                     <field name="action"/>
-                                </group>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Workflow Transitions">
-                        <field name="transition_ids"/>
-                    </page>
-                    <page string="Associated Groups">
-                        <field name="group_ids"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="note"/>
-                    </page>
-                </notebook>
+                                </tree>
+                                <form string="Actions" version="7.0">
+                                    <group col="4">
+                                        <field name="name" colspan="4"/>
+                                        <field name="state"/>
+                                        <field name="action"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Workflow Transitions">
+                            <field name="transition_ids"/>
+                        </page>
+                        <page string="Associated Groups">
+                            <field name="group_ids"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -295,9 +303,10 @@
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Transition"/>
+                    <separator orientation="vertical"/>
                     <field name="source_node_id"/>
-                    <field name="target_node_id" />
+                    <field name="target_node_id"/>
                 </group>
 <!--
                 <newline/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d94ac882cda..547cbb64730 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -106,17 +106,18 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group>
+                       <field name="origin" string="Procurement"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_planned"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
                        <separator orientation="vertical"/>
-                       <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
@@ -186,7 +187,8 @@
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Reordering Rules"/>
+                        <separator orientation="vertical"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -207,33 +209,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reordering Rules" version="7.0">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="Procurement Orders to Process" colspan="4" />
-                        <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            </group>
+                            <group>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                                <field name="product_uom"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Rules">
+                                <field name="product_min_qty" />
+                                <field name="product_max_qty" />
+                                <field name="qty_multiple" string="Quantity Multiple"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="procurement_id" readonly="1"/>
+                                <field name="active" />
+                            </group>
+                        </group>
+                        <group string="Procurement Orders to Process">
+                            <field name="procurement_draft_ids" nolabel="1"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index cdd7be0de1f..a2f987e3aa1 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -12,7 +12,6 @@
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="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"/>
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index c321d75611c..5a2fe1756b2 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:16+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-06-21 02:47+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-05-11 04:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -53,11 +53,11 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
-"预测数量（计算公式：在库数量 - 将要出库 + 将要入库 ）。\n"
-"针对库位来说，包含该库位及其子库位的存货数量。\n"
-"针对仓库来说，包含该仓库所有子库位，及其下级库位的存货数量。\n"
-"对于门店，包含该门店对应的仓库的所有子库位，及其下级库位的存货数量。\n"
-"其他情况下，包含存储在类型为“内部”的库位中的存货数量。"
+"预计数量（计算公式：在手数量 - 将要出库 + 将要入库 ）。\n"
+"对库位，包含该库位及其子库位的存货数量。\n"
+"对仓库，包含该仓库所有库位的存货数量。\n"
+"对门店，包含该门店仓库的存货数量。\n"
+"其它情况下，为“内部”类型库位的存货数量。"
 
 #. module: product
 #: model:product.category,name:product.cat1
@@ -92,7 +92,7 @@ msgstr "基本配置 PC 组装订单"
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr "接收"
+msgstr "入库"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -141,7 +141,7 @@ msgstr "规则名称"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr "编号"
+msgstr "相关单号"
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
@@ -166,7 +166,7 @@ msgstr "业务伙伴"
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
-msgstr "产品单位 %s 与默认单位 %s 无法转换，二者属于不同的分类。"
+msgstr "产品单位 %s 与默认单位 %s 无法转换，二者属于不同的类别！"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
@@ -211,12 +211,12 @@ msgstr "个"
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr "其他"
+msgstr "杂项"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr "作业员"
+msgstr "员工"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -268,7 +268,7 @@ msgstr "产品： "
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr "上级分类"
+msgstr "上级类别"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -276,7 +276,9 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr "按库存生产:  在仓库或等待重新供应时得到需求。按订单生产:  在采购或产品获得请求时得到需求。"
+msgstr ""
+"按库存生产:  在库存或等待重新供应时得到需求。\r\n"
+"按订单生产:  被采购或产品有需求时。"
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
@@ -291,7 +293,7 @@ msgstr "希捷 7200.8 160GB 硬盘"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13"
-msgstr "条形码"
+msgstr "条形码（EAN13）"
 
 #. module: product
 #: field:product.template,seller_id:0
@@ -312,7 +314,7 @@ msgstr "包装"
 #: view:product.product:0
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr "分类"
+msgstr "类别"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
@@ -328,7 +330,7 @@ msgstr "木材 2mm"
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr "数量1"
+msgstr "数量-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
@@ -350,17 +352,17 @@ msgstr "状态"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr "为当前产品选择一个分类"
+msgstr "为当前产品选择一个类别"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr "发出"
+msgstr "出仓"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr "参考此分类的计量单位"
+msgstr "此类别的计量单位"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -371,7 +373,7 @@ msgstr "公开价格"
 #. module: product
 #: field:product.price_list,qty5:0
 msgid "Quantity-5"
-msgstr "数量5"
+msgstr "数量-5"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
@@ -415,11 +417,11 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
-"在库数量。\n"
-"针对库位来说，包含该库位及其子库位的存货数量。\n"
-"针对仓库来说，包含该仓库所有子库位，及其下级库位的存货数量。\n"
-"对于门店，包含该门店对应的仓库的所有子库位，及其下级库位的存货数量。\n"
-"其他情况下，包含存储在类型为“内部”的库位中的存货数量。"
+"当前的产品数量。\n"
+"对库位，包含该库位和子库位的存货数量。\n"
+"对仓库，包含该仓库所有库位的存货数量。\n"
+"对门店，包含该门店仓库的所有存货数量。\n"
+"其它情况下，为“内部”类型库位的存货数量。"
 
 #. module: product
 #: view:product.pricelist:0
@@ -483,12 +485,12 @@ msgstr "业务伙伴信息"
 #. module: product
 #: field:product.price_list,qty2:0
 msgid "Quantity-2"
-msgstr "数量2"
+msgstr "数量-2"
 
 #. module: product
 #: field:product.price_list,qty3:0
 msgid "Quantity-3"
-msgstr "数量3"
+msgstr "数量-3"
 
 #. module: product
 #: view:product.product:0
@@ -498,7 +500,7 @@ msgstr "代码"
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
-msgstr "数量4"
+msgstr "数量-4"
 
 #. module: product
 #: view:res.partner:0
@@ -532,12 +534,12 @@ msgstr "金属螺栓"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr "不能修改已存在计量单位的分类“%s”"
+msgstr "不能修改已存在计量单位的类别“%s”"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "产品计量单位分类"
+msgstr "产品计量单位类别"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -557,7 +559,7 @@ msgstr "产品销售单位视图"
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr "可被采购"
+msgstr "可采购"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
@@ -576,7 +578,7 @@ msgstr "1个或多个供应商能关联到一个产品,所有信息委员产品
 msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
-msgstr "同一分组内的计量单位按照各自的比率自动发生转换."
+msgstr "同一类别内的计量单位按照各自的比率自动发生转换。"
 
 #. module: product
 #: help:product.packaging,width:0
@@ -711,11 +713,11 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
-"待收货数量。\n"
-"针对库位来说，包含该库位及其子库位的待收货数量。\n"
-"针对仓库来说，包含该仓库所有子库位，及其下级库位的待收货数量。\n"
-"对于门店，包含该门店对应的仓库的所有子库位，及其下级库位的待收货数量。\n"
-"其他情况下，包含存储在类型为“内部”的库位中的待收货数量。"
+"计划到货的产品数量。\n"
+"对库位，包含该库位及其子库位的待收货数量。\n"
+"对仓库，包含该仓库所有库位的待收货数量。\n"
+"对门店，包含该门店仓库的待收货数量。\n"
+"其它情况下，为“内部”类型库位的待收货数量。"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
@@ -799,7 +801,7 @@ msgstr "最小上浮金额"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr "子类"
+msgstr "子类别"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -877,7 +879,7 @@ msgstr "开发中"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr "计量单位分类不匹配！"
+msgstr "计量单位类别不匹配！"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -928,7 +930,7 @@ msgstr "DDR 256MB PC400"
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: product
 #: view:product.uom:0
@@ -941,7 +943,7 @@ msgid ""
 "Create and manage the units of measure you want to be used in your system. "
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
-msgstr "创建与管理系统中的计量单位信息。您可以定义统一分类下单位之间的转换比率。"
+msgstr "创建与管理系统中的计量单位信息。您可以定义同一类别下几个计量单位之间的转换比率。"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -1077,7 +1079,7 @@ msgid ""
 "your system. If several units of measure are in the same category, they can "
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
-msgstr "创建与管理系统中的计量单位分类信息。统一分类的计量单位可以互相转换，比如，“时间”分类下的计量单位包含：小时、天等等"
+msgstr "创建与管理系统中的计量单位类别信息。同一类别下的计量单位可以互相转换，比如，“时间”类别下的计量单位包含：小时、天等等"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1107,11 +1109,11 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
-"待发货数量。\n"
-"针对库位来说，包含该库位及其子库位的待发货数量。\n"
-"针对仓库来说，包含该仓库所有子库位，及其下级库位的待发货数量。\n"
-"对于门店，包含该门店对应的仓库的所有子库位，及其下级库位的待发货数量。\n"
-"其他情况下，包含存储在类型为“内部”的库位中的待发货数量。"
+"计划发货数量。\n"
+"对库位，包含该库位及其子库位的待发货数量。\n"
+"对仓库，包含该仓库所有库位的待发货数量。\n"
+"对门店，包含该门店仓库的待发货数量。\n"
+"其它情况下，为“内部”类型库位的待发货数量。"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1161,7 +1163,7 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
-"您必须定义产品信息用于您的销售或采购。产品可以是原材料、可库存商品、消耗品或服务。产品表单包含产品相关的生产物流、售价、分类、供应商等等信息。"
+"您必须定义产品信息用于您的销售或采购。产品可以是原材料、可库存商品、消耗品或服务。产品表单包含产品相关的生产物流、售价、类别、供应商等等信息。"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1419,7 +1421,7 @@ msgstr "重量"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
 
 #. module: product
 #: field:product.template,loc_rack:0
@@ -1442,7 +1444,7 @@ msgid ""
 "Here is a list of all your products classified by category. You can click a "
 "category to get the list of all products linked to this category or to a "
 "child of this category."
-msgstr "此处是所有产品的分类表。您可以单击一个分类来查看该分类下的所有产品或下级分类。"
+msgstr "此处是所有产品的类别表。您可以单击一个类别来查看该类别下的所有产品或下级类别。"
 
 #. module: product
 #: view:product.product:0
@@ -1502,7 +1504,7 @@ msgstr "产品计量单位"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误：默认计量单位和采购计量单位必须是同一类别中。"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1527,7 +1529,7 @@ msgstr "购买"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1669,7 +1671,7 @@ msgstr "保证期(月)"
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
-msgstr "指定此规则要应用到的产品分类及其下级分类，如果为空则应用于所有产品。"
+msgstr "指定此规则要应用到的产品类别及其下级类别，如果为空则应用于所有产品。"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1709,7 +1711,7 @@ msgstr "系列型号"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: product
 #: field:product.template,uos_coeff:0
@@ -1809,7 +1811,7 @@ msgstr "价格表版本生效的开始日期"
 msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
-msgstr "采购单默认使用的计量单位。必须与默认计量单位位于相同分类中。"
+msgstr "采购单默认使用的计量单位。必须与默认计量单位位于同一类别。"
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
@@ -1855,7 +1857,7 @@ msgstr "特征"
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr "可以卖出"
+msgstr "可销售"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1934,7 +1936,7 @@ msgstr "100cm 架子"
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: product
 #: report:product.pricelist:0
@@ -1957,7 +1959,7 @@ msgstr "如果您取消选定“可用”字段的话可以隐藏此计量单位
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr "计量单位分类"
+msgstr "计量单位类别"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2337,12 +2339,12 @@ msgstr "标价"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr "错误！您不能创建循环分类。"
+msgstr "错误！您不能创建循环的类别。"
 
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr "分类类型"
+msgstr "类属"
 
 #. module: product
 #: model:product.category,name:product.cat2
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 4d917230acc..4aa53511460 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,10 +8,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <newline/>
-                    <group col="2" colspan="2" groups="product.group_sale_pricelist">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <field name="property_product_pricelist"/>
+                    <group>
+                        <group name="pricelists" groups="product.group_sale_pricelist">
+                            <field name="property_product_pricelist"/>
+                        </group>
                     </group>
                 </page>
             </field>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f8a3e9ef5f9..0492881d9bd 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -74,7 +74,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Listprices Items" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field colspan="4" name="name"/></h1>
 
                     <group col="4">
@@ -112,9 +112,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
-                    <field name="name" />
-                    <field name="type"/>
+                    <field name="name" string="Products Price"/>
+                    <separator orientation="vertical"/>
                     <field name="currency_id"/>
+                    <field name="type"/>
                     <field name="active" />
                 </search>
             </field>
@@ -140,7 +141,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Price List" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name"/>
                     </h1>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c2b6663bdb0..506688e0a2b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,16 +9,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
+                   <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
-                   <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
-                   <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <separator orientation="vertical" groups="base.group_multi_company" />
@@ -69,118 +67,124 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" layout="auto" version="7.0">
-                    <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
-                    <label for="name" class="oe_form_readonly_hidden"/>
-                    <h1><field name="name"/></h1>
-                    <label for="categ_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="categ_id"/></h2>
+                    <sheet>
+                        <field name="product_image" widget="image" class="oe_avatar oe_right" />
 
-                    <notebook>
-                        <page string="Information">
-                            <group>
+                        <div class="oe_title">
+                            <div class="oe_edit_only">
+                                <label for="name" string="Product Name" /> 
+                            </div>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                            <label for="categ_id" class="oe_edit_only" />
+                            <h2><field name="categ_id" /></h2>
+                        </div>
+                        <notebook>
+                            <page string="Information">
                                 <group>
-                                    <field name="default_code"/>
-                                    <field name="ean13" placeholder="5901234123457" />
-                                    <field groups="product.group_product_variant" name="variants" />
-                                </group>
-                                <group>
-                                    <field name="sale_ok"/>
-                                    <field name="purchase_ok"/>
-                                </group>
-                                <group string="Procurement">
-                                    <field name="type"/>
-                                    <field name="procure_method"/>
-                                    <field name="supply_method"/>
-                                </group>
-                                <group string="Base Prices">
-                                    <field name="list_price"/>
-                                    <field name="cost_method"/>
-                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                    <field name="price_margin" groups="product.group_product_variant"/>
-                                    <field name="price_extra" groups="product.group_product_variant"/>
-                                </group>
-
-                                <group groups="product.group_stock_packaging" string="Weights">
-                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-
-                                <group name="status" string="Status">
-                                    <field name="state"/>
-                                    <field name="product_manager"/>
-                                </group>
-
-                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                    <field name="uom_po_id"/>
-                                </group>
-
-                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
-                                    <field name="uos_id"/>
-                                    <field name="uos_coeff"/>
-                                    <field name="mes_type"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Procurement &amp; Locations">
-                            <group>
-                                <group name="delay" string="Delays">
-                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                    <field name="warranty"/>
-                                </group>
-                                <group name="store" string="Storage Localisation">
-                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="active"/>
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                            </group>
-
-                        </page>
-                        <page string="Suppliers">
-                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                        </page>
-                        <page string="Descriptions">
-                            <separator string="Description"/>
-                            <field name="description"/>
-                            <separator string="Sale Description"/>
-                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                            <separator string="Purchase Description"/>
-                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                        </page>
-                        <page groups="product.group_stock_packaging" string="Packaging">
-                            <field name="packaging">
-                                <form string="Packaging" version="7.0">
-                                    <group col="4">
-                                        <field name="ean"/>
-                                        <field name="sequence" invisible="1"/>
-                                        <newline/>
-                                        <field name="qty"/>
-                                        <field name="ul"/>
-                                        <field name="weight_ul"/>
-                                        <separator colspan="4" string="Palletization"/>
-                                        <field name="ul_qty"/>
-                                        <field name="rows"/>
-                                        <field name="weight"/>
-                                        <separator colspan="4" string="Pallet Dimension"/>
-                                        <field name="height"/>
-                                        <field name="width"/>
-                                        <field name="length"/>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <field name="ean13" placeholder="5901234123457" />
+                                        <field groups="product.group_product_variant" name="variants" />
                                     </group>
-                                    <separator colspan="4" string="Description"/>
-                                    <field name="name"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                                    <group>
+                                        <field name="sale_ok"/>
+                                        <field name="purchase_ok"/>
+                                    </group>
+                                    <group string="Procurement">
+                                        <field name="type"/>
+                                        <field name="procure_method"/>
+                                        <field name="supply_method"/>
+                                    </group>
+                                    <group string="Prices">
+                                        <field name="list_price"/>
+                                        <field name="cost_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="price_margin" groups="product.group_product_variant"/>
+                                        <field name="price_extra" groups="product.group_product_variant"/>
+                                    </group>
+
+                                    <group groups="product.group_stock_packaging" string="Weights">
+                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+
+                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                        <field name="uom_po_id"/>
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
+
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
+
+                                </group>
+                            </page>
+                            <page string="Procurement &amp; Locations">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+
+                            </page>
+                            <page string="Suppliers">
+                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                            </page>
+                            <page string="Descriptions">
+                                <separator string="Description"/>
+                                <field name="description"/>
+                                <separator string="Sale Description"/>
+                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                                <separator string="Purchase Description"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page groups="product.group_stock_packaging" string="Packaging">
+                                <field name="packaging">
+                                    <form string="Packaging" version="7.0">
+                                        <group col="4">
+                                            <field name="ean"/>
+                                            <field name="sequence" invisible="1"/>
+                                            <newline/>
+                                            <field name="qty"/>
+                                            <field name="ul"/>
+                                            <field name="weight_ul"/>
+                                            <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_qty"/>
+                                            <field name="rows"/>
+                                            <field name="weight"/>
+                                            <separator colspan="4" string="Pallet Dimension"/>
+                                            <field name="height"/>
+                                            <field name="width"/>
+                                            <field name="length"/>
+                                        </group>
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="name"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -294,8 +298,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
+                    <field name="name" string="Product Categories"/>
+                    <separator orientation="vertical"/>
                     <field name="parent_id"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
@@ -631,9 +636,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="categ_id" class="oe_form_readonly_hidden"/>
+                    <label for="categ_id" class="oe_edit_only"/>
                     <h2><field name="categ_id"/></h2>
                     <notebook>
                         <page string="Information">
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c53fc2a28a..2c38b2e56c1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -54,7 +54,6 @@ Dashboard for project members that includes:
         "res_partner_view.xml",
         "report/project_report_view.xml",
         "board_project_view.xml",
-        'board_project_manager_view.xml',
         'report/project_cumulative.xml',
         'res_config_view.xml',
     ],
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
deleted file mode 100644
index d9340eefb3a..00000000000
--- a/addons/project/board_project_manager_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Board for project managers -->
-
-        <act_window 
-            id="act_my_project"
-            name="My projects" 
-            res_model="project.project"
-            domain="&quot;[('user_id', '=', uid)]&quot;"
-            view_mode="tree,form" 
-            view_type="form"/>
-
-        <act_window 
-            id="act_my_account"
-            name="My accounts to invoice"
-            res_model="account.analytic.account"
-            domain="&quot;[('user_id','=',uid),('state','&lt;&gt;','close')]&quot;"
-            view_mode="tree,form"
-            view_type="form"/>
-
-    </data>
-</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index df35534659d..09a7fe57bab 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,14 +2,48 @@
 <openerp>
     <data>
 
-        <!-- My task -->
+        <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
+            <field name="name">project.vs.remaining.hour.tree</field>
+            <field name="model">project.vs.hours</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+                    <field name="project"/>
+                    <field name="remaining_hours"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
+             <field name="name">project.vs.remaining.hour.graph</field>
+             <field name="model">project.vs.hours</field>
+             <field name="type">graph</field>
+             <field name="arch" type="xml">
+                 <graph string="Project vs remaining hours" type="bar">
+                     <field name="project"/>
+                     <field name="state" group="True"/>
+                     <field name="remaining_hours" operator="+"/>
+                 </graph>
+             </field>
+        </record>
+
+        <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
+            <field name="name">Remaining Hours Per Project</field>
+            <field name="res_model">project.vs.hours</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
+        </record>
+
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
             <field name="type">tree</field>
             <field eval="99" name="priority"/>
             <field name="arch" type="xml">
-                  <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
+                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="date_deadline"/>
@@ -23,50 +57,12 @@
             </field>
         </record>
 
-        <record id="view_delegated_task_tree" model="ir.ui.view">
-            <field name="name">project.task.delegated.tree</field>
-            <field name="model">project.task</field>
-            <field name="type">tree</field>
-            <field eval="99" name="priority"/>
-            <field name="arch" type="xml">
-                  <tree colors="red:date_deadline&lt;current_date" string="My Delegated Tasks">
-                    <field name="name"/>
-                    <field name="project_id"/>
-                    <field name="delegated_user_id"/>
-                    <field name="date_deadline"/>
-                    <field name="total_hours" widget="float_time"/>
-                    <field name="progress" widget="progressbar"/>
-                    <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
-                </tree>
-            </field>
-        </record>
-
-
         <record id="my_open_tasks_action" model="ir.actions.act_window">
-            <field name="name">My Open Tasks</field>
+            <field name="name">My Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-            <field name="view_id" ref="view_task_tree"/>
-        </record>
-
-        <record id="action_view_delegate_task_tree" model="ir.actions.act_window">
-            <field name="name">My Delegated Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]</field>
-            <field name="view_id" ref="view_delegated_task_tree"/>
-        </record>
-
-        <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
-            <field name="name">My Task's Deadlines</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'),('date_deadline','&lt;&gt;',False)]</field>
+            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
@@ -78,11 +74,10 @@
                 <form string="My Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
-                            <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
+                            <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                         </column>
                     </board>
                 </form>
@@ -90,7 +85,7 @@
         </record>
 
         <record id="open_board_project" model="ir.actions.act_window">
-            <field name="name">Project Dashboard</field>
+            <field name="name">Project</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -98,19 +93,10 @@
             <field name="view_id" ref="board_project_form"/>
         </record>
 
-        <menuitem
-            id="menu_project_dashboard"
-            name="Project"
-            sequence="20"
-            parent="base.menu_reporting_dashboard"
-            />
-
-        <menuitem
-            action="open_board_project"
-            icon="terp-graph"
-            id="menu_board_project"
-            parent="menu_project_dashboard"
-            sequence="1"/>
+        <menuitem id="menu_project_dashboard"
+                  sequence="35"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_project"/>
 
     </data>
 </openerp>
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 194d8f26ec4..23af8d1c547 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-11 23:07+0000\n"
+"PO-Revision-Date: 2012-06-20 17:12+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-06-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1931,7 +1931,7 @@ msgstr "タスク %s はキャンセル済です。"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr "状態を開くと目の変更"
+msgstr "開く状態に変更"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 429672d3269..ab02cc870bb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -165,14 +165,29 @@ class project(osv.osv):
             res[task.project_id.id] += 1
         return res
 
+    def _get_followers(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Functional field that computes the users that are 'following' a thread.
+        '''
+        res = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            l = set()
+            for message in project.message_ids:
+                l.add(message.user_id and message.user_id.id or False)
+            res[project.id] = list(filter(None, l))
+        return res
+
+    def _search_followers(self, cr, uid, obj, name, args, context=None):
+        project_obj = self.pool.get('project.project')
+        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
+        return [('id', 'in', project_ids)]
+
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
-        'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
@@ -197,19 +212,18 @@ class project(osv.osv):
                 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
-        'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'use_tasks': fields.boolean('Use Tasks', help="Check this field if this project is aimed at managing tasks"),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
+        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
+                        type='many2many', relation='res.users', string='Followers'),
      }
     
     def dummy(self, cr, uid, ids, context):
         return True
-       
+
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -217,10 +231,11 @@ class project(osv.osv):
     _order = "sequence"
     _defaults = {
         'active': True,
+        'type': 'contract',
+        'state': 'open',
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
-        'use_tasks': True,
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -894,28 +909,12 @@ class task(base_stage, osv.osv):
         return True
 
     def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task, then opens the wizard to send an 
-            email to the partner or the project manager.
+        """ This action closes the task 
         """
         task_id = len(ids) and ids[0] or False
         self._check_child_task(cr, uid, ids, context=context)
         if not task_id: return False
-        task = self.browse(cr, uid, task_id, context=context)
-        project = task.project_id
-        res = self.do_close(cr, uid, [task_id], context=context)
-        if project.warn_manager or project.warn_customer:
-            return {
-                'name': _('Send Email after close task'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True,
-                'context': {'active_id': task.id,
-                            'active_model': 'project.task'}
-           }
-        return res
+        return self.do_close(cr, uid, [task_id], context=context)
 
     def do_close(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_close. """
@@ -1217,16 +1216,49 @@ class project_work(osv.osv):
 
 
 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"),
+        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+    }
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        '''
+        This function is used to decide if a project needs to be automatically created or not when an analytic account is created. It returns True if it needs to be so, False otherwise.
+        '''
+        return vals.get('use_tasks')
+
+    def project_create(self, cr, uid, analytic_account_id, vals, context=None):
+        '''
+        This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
+        '''
+        project_pool = self.pool.get('project.project')
+        project_id = project_pool.search(cr, uid, [('analytic_account_id','=', analytic_account_id)])
+        if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
+            project_values = {
+                'name': vals.get('name'),
+                'analytic_account_id': analytic_account_id,
+            }
+            return project_pool.create(cr, uid, project_values, context=context)
+        return False
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
-        return super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        self.project_create(cr, uid, analytic_account_id, vals, context=context)
+        return analytic_account_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        name = vals.get('name')
+        for account in self.browse(cr, uid, ids, context=context):
+            if not name:
+                vals['name'] = account.name
+            self.project_create(cr, uid, account.id, vals, context=context)
+        return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f685f14c85b..07951280dc7 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -286,14 +286,12 @@
         
 
         <record id="project_project_9" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
         </record>
         <record id="project_project_21" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="priority">10</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Study + Prototype</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e8d2455be89..7d3f595e2c5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -10,7 +10,16 @@
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -31,26 +40,38 @@
                 </header>
                 <sheet string="Project" layout="auto">
                     <field name="analytic_account_id" invisible="1" required="0"/>
-                    <label for="name" class="oe_form_readonly_hidden" string="Project Name"/>
+                    <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
-                        <field name="name"/>
+                        <field name="name" string="Project Name"/>
                     </h1>
-                    <label for="parent_id" class="oe_form_readonly_hidden" string="Parent Project"/>
+                    <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)" select="1"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        </group><group>
-                            <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="progress_rate" widget="progressbar"/>
+                            <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="privacy_visibility"/>
+                        </group>
+                        <group>
+                            <table>
+                                <tr name="use_tasks_row">
+                                    <td><group><field name="use_tasks"/></group></td>
+                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <td/>
+                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Members">
-                            <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
+                    <notebook>
+                        <page string="Team" name="team">
+                            <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
                                     <templates>
@@ -68,55 +89,24 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page string="Administration">
+                        <page string="Other Info">
                             <group>
-                                <group name="kanban" string="Project Management">
-                                    <field name="use_tasks"/>
-                                </group>
-                                <group string="Performance">
+                                <group string="Administration">
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time" />
                                     <field name="resource_calendar_id"/>
                                 </group>
-                                <newline/>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
-                                    <field name="warn_manager"/>
+                                <group string="Miscellaneous" name="misc">
+                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="Billing" groups="account.group_account_invoice">
-                            <group col="4">
-                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
-                                <field name="warn_customer"/>
-                                <field name="currency_id" groups="base.group_multi_company" required="1"/>
-                            </group>
-                            <group col="4">
-                                <separator colspan="2" string="Mail Header"/>
-                                <separator colspan="2" string="Mail Footer"/>
-                                <field name="warn_header" nolabel="1" colspan="2"/>
-                                <field name="warn_footer" nolabel="1" colspan="2"/>
-                            </group>
-                            <group col="3">
-                                <b>
-                                    <label string="Variables you can use for headers and footer." colspan="3"/>
-                                </b>
-                                <label string="Task: %%(name)s"/>
-                                <label string="User: %%(user_id)s"/>
-                                <label string="ID: %%(task_id)s"/>
-                                <label string="Status: %%(state)s"/>
-                                <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date)s"/>
-                            </group>
-                        </page>
                         <page string="Tasks Stages">
                              <field name="type_ids"/>
                         </page>
-                        <page string="Notes">
-                            <field name="description"/>
-                        </page>
                     </notebook>
                 </sheet>
                 <footer>
@@ -133,26 +123,24 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                       <field name="complete_name" string="Project Name"/> 
+                       <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template"
-                            name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <separator orientation="vertical"/>
+                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                        <separator orientation="vertical"/>
-                       <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager">
-                            <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       </field>
+                       <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
-                         <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                    </group>
+                   <group expand="0" string="Group By...">
+                       <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -207,12 +195,14 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
-                                <a class="oe_kanban_menuaction oe_i">B</a>
-                                <ul class="oe_kanban_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 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"><field name="name"/></h3>
 
@@ -325,18 +315,20 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
+                        <!--
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
-                        <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
-                        <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
                         <button name="do_draft" string="Draft" type="object"
                                 states="cancel,done"/>
+                        -->
+                        <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                states="done,cancelled" context="{'button_reactivate':True}"/>
+                        <button name="action_close" string="Done" type="object"
+                                states="draft,open,pending"/>
+                        <button name="do_pending" string="Pending" type="object"
+                                states="open"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                states="pending,open,draft"/>
+                                states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
                                 states="draft,open,pending" />
                         <button name="stage_previous" string="Previous Stage" type="object"
@@ -346,52 +338,52 @@
                         <field name="stage_id" widget="statusbar"/>
                     </header>
                     <sheet string="Task">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id"  on_change="onchange_project(project_id)"/>
                     </h2>
                     <group>
                         <group>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="partner_id" />
-                            <field name="date_deadline" 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="effective_hours"
-                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
-                            <label for="remaining_hours" string="+ Remaining"/>
-                            <div>
-                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
-                            </div>
-                            <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"
-                                string="= Total"/>
-
-                            <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
+                            <field name="progress" widget="progressbar"
+                                groups="project.group_time_work_estimation_tasks"
+                                invisible="1"/>
                         </group>
                     </group>
                     <notebook>
-                        <page string="Information">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
-                            <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
+                        <page string="Description">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
+                            <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="name" />
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="user_id"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
-                                    <field name="user_id" />
-                                    <field name="date" />
                                 </tree>
                             </field>
+                            <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"/>
+                                </div>
+                                <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
+                            </group>
+                            <div class="oe_clear"/>
                         </page>
-                        <page string="Delegations History">
+                        <page string="Delegations History" groups="project.group_delegate_task">
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -412,10 +404,9 @@
                             <group col="4">
                                 <field name="priority"/>
                                 <field name="sequence"/>
+                                <field name="partner_id" />
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
@@ -589,19 +580,19 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <field name="name" string="Tasks"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                            help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id"/>
-                        <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -620,6 +611,22 @@
                 </search>
             </field>
         </record>
+        
+        <record id="analytic_account_inherited_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_tasks" />
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">Tasks</field>
@@ -679,11 +686,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
-                   <group>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    <group>
+                       <field name="name" string="Tasks Stages"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
-                   </group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -697,16 +704,15 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="state"/>
+                            <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="case_default"/>
+                            <field name="state" string="Related State"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
                     </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..."/>
                 </form>
             </field>
         </record>
@@ -732,11 +738,11 @@
             <field name="help">Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
@@ -748,9 +754,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    <newline/>
+                    <group string="Project Management">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index c85b1ba28e5..69daeefc758 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,26 +55,18 @@
             <field name="arch" type="xml">
                <search string="Task's Analysis">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-1" name="month1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-2" name="month2"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=2)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=2)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="project_id"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 240176f7941..a5711239f87 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -62,19 +62,9 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-                                help="Current Year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Current Month"/>
-                        <filter icon="terp-go-week"
-                                string="Month-1"
-                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Previous Month"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
                         <filter string="New"
                                 icon="terp-document-new"
@@ -84,32 +74,29 @@
                                 icon="terp-check"
                                 domain="[('state', '=' ,'open')]"
                                 help = "In progress tasks"/>
-                           <filter string="Pending"
-                                   icon="terp-gtk-media-pause"
-                                   domain="[('state','=','pending')]"
-                                   help = "Pending tasks"/>
-                          <filter string="Done"
+                        <filter string="Pending"
+                                icon="terp-gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help = "Pending tasks"/>
+                        <filter string="Done"
                                 icon="terp-dialog-close"
                                 name="done"
                                 domain="[('state','=','done')]"/>
-                       <separator orientation="vertical"/>
-                        <field name="project_id">
-                            <filter icon="terp-folder-violet"
-                                    string="My Projects"
-                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                          </field>
-
-                          <field name="user_id" widget="selection">
-                            <filter icon="terp-personal"
-                                    string="My Task"
-                                    help = "My tasks"
-                                    domain="[('user_id','=',uid)]" />
-                            <filter icon="terp-personal-"
-                                    string="Non Assigned Tasks to users"
-                                    help="Non Assigned Tasks to users"
-                                    domain="[('user_id','=',False)]"/>
-                          </field>
-                      <field name="partner_id" />
+                        <filter icon="terp-folder-violet"
+                                string="My Projects"
+                                help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                                string="My Task"
+                                help = "My tasks"
+                                domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-personal-"
+                                string="Non Assigned Tasks to users"
+                                help="Non Assigned Tasks to users"
+                                domain="[('user_id','=',False)]"/>
+                         <separator orientation="vertical"/>
+                         <field name="project_id"/>
+                         <field name="user_id" widget="selection"/>
+                         <field name="partner_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -117,12 +104,6 @@
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
@@ -156,118 +137,5 @@
 
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
 
-   <!-- Views and action for project dashboard -->
-   <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.remaining.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="remaining_hours"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.remaining.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs remaining hours" type="bar">
-                 <field name="project"/>
-                 <field name="state" group="True"/>
-                 <field name="remaining_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-        <field name="name">Remaining Hours Per Project</field>
-        <field name="res_model">project.vs.hours</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-    </record>
-
-    <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
-
-            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
-   </record>
-   <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
-   </record>
-    <!-- Views and action for project issue dashboard -->
-    <record id="view_task_by_days_tree" model="ir.ui.view">
-        <field name="name">task.by.days.tree</field>
-        <field name="model">task.by.days</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Task By Days" >
-                <field name="day"/>
-                <field name="total_task"/>
-                <field name="state" groups="base.group_no_one"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_task_by_days_graph" model="ir.ui.view">
-         <field name="name">task.by.days.graph</field>
-         <field name="model">task.by.days</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Task By Days" type="bar">
-                 <field name="day"/>
-                 <field name="state" group="True"/>
-                 <field name="project_id" group="True"/>
-                 <field name="total_task" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_task_by_days_graph" model="ir.actions.act_window">
-        <field name="name">Task By Days</field>
-        <field name="res_model">task.by.days</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('day','&lt;=',time.strftime('%Y-%m-%d')),('day','&gt;=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]</field>
-        <field name="view_id" ref="view_task_by_days_graph"/>
-    </record>
-
-    <!-- Views and action for project  dashboard -->
-   <record id="view_project_vs_planned_total_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.planned.total.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Project vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="planned_hours"/>
-                <field name="total_hours"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_planned_total_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.planned.total.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs Planned and Total Hours" type="bar">
-                 <field name="project"/>
-                 <field name="planned_hours" operator="+"/>
-                 <field name="total_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 21281110fb9..b112506e073 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class project_configuration(osv.osv_memory):
     _name = 'project.config.settings'
@@ -46,6 +47,8 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True,
+            help="""This will set the unit of measure used in projects and tasks."""),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
@@ -54,7 +57,19 @@ class project_configuration(osv.osv_memory):
             help="Allows you to compute work on tasks."),
         'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
             implied_group='project.group_time_work_estimation_tasks',
-            help="Allows you to compute Time Estimation on tasks."),                                
+            help="Allows you to compute Time Estimation on tasks."),
+        'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
+            implied_group='project.group_delegate_task',
+            help="Allows you to delegate tasks to other users."),
     }
 
+    def get_default_time_unit(self, cr, uid, fields, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return {'time_unit': user.company_id.project_time_mode_id.id}
+
+    def set_time_unit(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user.company_id.write({'project_time_mode_id': config.time_unit.id})
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index cf371a39672..28258c483ce 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -1,6 +1,5 @@
 <openerp>
     <data>
-
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">project settings</field>
             <field name="model">project.config.settings</field>
@@ -9,25 +8,29 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <separator string="Project" colspan="4"/>
-                            <field name="module_project_mrp"/>
-                            <field name="module_project_timesheet"/>
-                            <field name="module_pad"/>
-                            <field name="group_tasks_work_on_tasks"/>
-                            <field name="group_time_work_estimation_tasks"/>
-
-                            <separator string="Planning" colspan="4"/>
+                        <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>
+                        <group string="Planning">
                             <field name="module_project_long_term"/>
-
-                            <separator string="Helpdesk and Support" colspan="4"/>
+                        </group>
+                        <group string="Helpdesk and Support" name="support">
                             <field name="module_project_issue"/>
                             <field name="module_project_issue_sheet"/>
-                            <group name="support" colspan="4"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2bfe967e675..829ec6c6971 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,7 +14,7 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="ir.ui.menu" id="menu_definitions">
+    <record model="ir.ui.menu" id="base.menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
 
@@ -29,6 +29,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>		
 
+    <record id="group_delegate_task" model="res.groups">
+        <field name="name">Task Delegation</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="ir.rule" id="project_comp_rule">
         <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
@@ -36,6 +41,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule" id="project_public_members_rule">
+        <field name="name">public Members</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
+    </record>
+
     <record model="ir.rule" id="task_comp_rule">
         <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index f5324d2b6aa..7a9a734b2bd 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
deleted file mode 100644
index 1609cc04c1c..00000000000
--- a/addons/project/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,72 +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
-from tools.translate import _
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'project.task' and resource_id:
-            task_pool = self.pool.get('project.task')
-            task_data = task_pool.browse(cr, uid, resource_id, context=context)
-            partner = task_data.partner_id or task_data.project_id.partner_id
-            if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
-                raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
-            elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)):
-                raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
-
-            result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
-            val = {
-                    'name': task_data.name,
-                    'user_id': task_data.user_id.name,
-                    'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
-                    'date_start': task_data.date_start,
-                    'date': task_data.date_end,
-                    'state': task_data.state
-            }
-            header = (task_data.project_id.warn_header or '') % val
-            footer = (task_data.project_id.warn_footer or '') % val
-            description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
-            if partner :
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email})
-            result.update({
-                       'body_text': description or False,
-                       'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
-                       'subject':  _("Task '%s' Closed") % task_data.name,
-                       'model': model,
-                       'res_id': resource_id,
-                    })
-
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/i18n/mn.po b/addons/project_gtd/i18n/mn.po
new file mode 100644
index 00000000000..de0ad8288af
--- /dev/null
+++ b/addons/project_gtd/i18n/mn.po
@@ -0,0 +1,308 @@
+# 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-06-24 12:16+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress"
+msgstr "Боловсруулж байна"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr "Зөвхөн дуусах хугацаатай даалгавруудыг харуулах"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Дахин идэвхжүүлэх"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr "Даалгаврыг анхаарах ёстой хугацааны зурвасууд"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr "Хугацааны хайрцагийн жагсаалтыг харуулах дарууллын эрэмбийг өгнө"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Аялал"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "Хугацааны Хайрцаг Хоосон Боловсруулалт Амжилттай дууслаа."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending Tasks"
+msgstr "Хүлээгдэж байгаа Даалгаврууд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
+"defines a period of time in order to categorize your tasks: today, this "
+"week, this month, long term."
+msgstr ""
+"\"Ажлыг Амжуулах\" аргачлалын хугацааны хайрцагууд. Хугацааны хайрцаг нь "
+"даалгаврыг хийх ёстой хугацааны мужуудаг тодорхойлдог: өнөөдөр, энэ "
+"долооног, энэ сар, урт хугацааны."
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Урт Хугацааны"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Төслийн Хугацааны Хайрцаг Хоосон"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0 field:project.gtd.timebox,name:0
+#: view:project.task:0 field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Хугацааны муж"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Хугацааны Хайрцагийг тохируулах"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "Error !"
+msgstr "Алдаа !"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_task
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_timebox_tree
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Миний даалгаврууд"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Энэ долооног"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Хоосон Хугацааны Хайрцаг"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Tasks having no timebox assigned yet"
+msgstr "Хугацааны хайрцаг олгогдоогүй даалгаврууд"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Таних Тэмдэг"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Төслийн Хугацааны Хайрцагийг Дүүргэх"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Хугацааны Хайрцагт Нэмэх"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
+msgid "Contexts"
+msgstr "Агуулгууд"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Машин"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Context"
+msgstr "Агуулгыг Харуулах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Хугацааны Хайрцагийг Төлөвлөх"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "project.gtd.timebox"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Хугацааны Хайрцагууд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress and draft tasks"
+msgstr "Хийгдэж байгаа болон Ноорог даалгаврууд"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0 field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Агуулга"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "Үүний охин хугацааны хайрцаг алга !"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Офис"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0 field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show the context field"
+msgstr "Агуулгын талбарыг харуулах"
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr "Агуулгын жагсаалтыг харуулах дарааллыг эрэмбийг өгнө."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Deadlines"
+msgstr "Дуусгах Хугацааг Харуулах"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Хугацааны хайрцагийн тодорхойлолт"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Даалгавруудын сонголт"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Inbox"
+msgstr "Inbox"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Хугацааны хайрцагаас авах"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "Хэрэглэгч даалгаврыг анхаарах агуулгын байрлал"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Нүүр"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at the office, at home, when I take my car, etc."
+msgstr ""
+"\"Ажлыг Амжуулах\" аргачлалд тодорхойлогдсон агуулгууд. Энэ нь даалгаврыг "
+"ямар агуулгад хийгдсэн байхыг ангилах боломжийг олгодог: оффист, гэрт, "
+"машинаа авахдаа гэх мэт..."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "For reopening the tasks"
+msgstr "Даалгаврыг дахин нээхэд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Өмнөх"
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index c8e87093c0e..5b48f6b4648 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -111,26 +111,15 @@
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
+                <field name="name" string="My Tasks"/>
+                <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                <separator orientation="vertical"/>
-                <filter
-                    domain="[('timebox_id','=', False)]"
-                    help="Tasks having no timebox assigned yet" string="Inbox"/>
-                <separator orientation="vertical"/>
-                <separator name="gtdsep"/>
-                <field name="name"/>
-                <field name="context_id" widget="selection"
-                    context="{'context_show': True}">
-                    <filter string="Show Context"
-                        name="context_show"
-                        context="{'context_show': True}"
-                        domain="[]" icon="terp-camera_test"
-                        help="Show the context field"/>
-                    <filter string="Show Deadlines" context="{'deadline_visible': False}"
-                        domain="[]" help="Show only tasks having a deadline"
-                        icon="terp-gnome-cpu-frequency-applet+"/>
-                </field>
+                <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+                <group expand="0" string="Display">
+                    <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
+                    <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 495a1efe3c1..cedcd85d4fc 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -2,89 +2,7 @@
 <openerp>
     <data>
 
-        <record id="action_view_current_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',['draft','open'])]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_view_pending_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','pending')]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_project_issue_graph_state" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
-        </record>
-
-        <record id="view_project_issue_graph_stage" model="ir.ui.view">
-            <field name="name">project.issue.report.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Project Issue" type="bar">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_project_issue_graph_stage" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="view_project_issue_graph_stage"/>
-        </record>
-
-        <record id="board_project_issue_form" model="ir.ui.view">
-            <field name="name">board.project.issue.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Issues Dashboard" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
-                            <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
-                        </column>
-                        <column>
-                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
-                            <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_project_issue" model="ir.actions.act_window">
-            <field name="name">Project Issue Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_project_issue_form"/>
-        </record>
-        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
-             icon="terp-graph"
-            action="open_board_project_issue"/>
-
-    <!-- For Project Dashboard -->
-            <record model="ir.ui.view" id="project_issue_board_tree_view">
+        <record model="ir.ui.view" id="project_issue_board_tree_view">
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="type">tree</field>
@@ -105,6 +23,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
             <field name="name">My Project Issues</field>
             <field name="res_model">project.issue</field>
@@ -113,40 +32,17 @@
             <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
-         <record id="view_my_open_project_issue_graph" model="ir.ui.view">
-            <field name="name">my.open.project.issue.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="My Open Project Issue" type="bar">
-                    <field name="creation_date"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">My Open Project issues</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
-            <field name="context">{'default_user_id': uid}</field>
-           <field name="view_id" ref="view_my_open_project_issue_graph"/>
-        </record>
-       <record id="board_my_project_issue_form" model="ir.ui.view">
+
+        <record id="board_my_project_issue_form" model="ir.ui.view">
             <field name="name">board.my.project.issue.form.inherit</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues" creatable="true"/>
-                </xpath>
-                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                <xpath expr="/form/board/column/action[@string='My Tasks']" position="after">
+                    <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index 7e5122b0f42..fcd18045839 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
new file mode 100644
index 00000000000..ebc23b2380b
--- /dev/null
+++ b/addons/project_issue/i18n/mn.po
@@ -0,0 +1,978 @@
+# 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-06-24 12:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Previous Month"
+msgstr "Өмнөх сар"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Нээх дундаж хугацаа"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "Асуудлыг Нээх Ажлын Цаг"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Нээлттэй"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Нээх Огноо"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Явц (%)"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid "Warning !"
+msgstr "Анхаар !"
+
+#. module: project_issue
+#: field:project.issue,company_id:0 view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today's features"
+msgstr "Өнөөдрийн онцлог, боломж"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Нээх хүртэлх өдөр"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"Энэ асуудлыг томруулах боломжгүй.\n"
+"Энэ төсөл нь томруулж болох төслөөр тохируулагдаагүй байна!"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "Хамгийн Өндөр"
+
+#. module: project_issue
+#: help:project.issue,inactivity_days:0
+msgid "Difference in days between last action and current date"
+msgstr "Сүүлийн үйлдэл, одоогийн огнооны ялгавар өдрөөр"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_issue
+#: field:project.issue,days_since_creation:0
+msgid "Days since creation date"
+msgstr "Үүсгэснээс хойшх хоног"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: project_issue
+#: field:project.issue,task_id:0 view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Асуудал үеээр"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: project_issue
+#: field:project.issue,inactivity_days:0
+msgid "Days since last action"
+msgstr "Сүүлийн үйлдлээс хойших хоног"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0 field:project.issue,project_id:0
+#: view:project.issue.report:0 field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Миний нээлттэй асуудлууд"
+
+#. module: project_issue
+#: selection:project.issue,state:0 selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Next Stage"
+msgstr "Дараачийн үе рүү өөрчлөх"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Хаах Огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Асуудал Хөтлөгчийн Хайлт"
+
+#. module: project_issue
+#: field:project.issue,color:0
+msgid "Color Index"
+msgstr "Өнгөний Индекс"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue / Partner"
+msgstr "Асуутал / Харилцагч"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Нээх хүртэлх дундаж ажлын цаг"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Дараагийн үйлдэл"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+"Хэрэв асуудал энэ төслөөс томруулсан бол тэдгээр нь энд сонгосон төслүүдэд "
+"харагдана."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+"Энэ тайлан нь таны дэмжлэгийн үйлчилгээ болон борлуулалтын дараах "
+"үйлчилгээний чанарыг шинжлэх боломжийг олгодог. Асуудыг та насаар нь хөтлөх "
+"боломжтой. Нээх, хаахад шаардагдсан дундаж хугаца, солилцсон имэйлийн тоо, "
+"зарцуулсан дундаж цаг зэрэгийг шинжлэх боломжтой."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change Color"
+msgstr "Өнгө Өөрчлөх"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:482
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Responsible"
+msgstr "Хариуцагч"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Бага"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Статистик"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Даалгавар руу хөрвүүлэх"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Маллагаа"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Асуудлын Шинжилгээ"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,priority:0
+#: view:project.issue.report:0 field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Урьтамж"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Шинэ имэйл илгээх"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,version_id:0
+#: view:project.issue.report:0 field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Хувилбар"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Асуудлын Ангилал"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Имэйл"
+
+#. module: project_issue
+#: field:project.issue,channel_id:0 field:project.issue.report,channel_id:0
+msgid "Channel"
+msgstr "Суваг"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Хамгийн Бага"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Unassigned Issues"
+msgstr "Эзэнгүй Асуудлууд"
+
+#. module: project_issue
+#: field:project.issue,create_date:0 view:project.issue.report:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Үүсгэсэн Огноо"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Хувилбарууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "To Do Issues"
+msgstr "Хийх ёстой Асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Ноороглох"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Төслийн Асуудлын Хянах Самбар"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Дууссан"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "7-р сар"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Ангилалууд"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Үе"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "Түүхийн мэдээлэл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Төслийн асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Харилцаа болон Түүх"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Миний нээлттэй төслийн асуудлууд"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Миний төслийн асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Холбогч"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,partner_id:0
+#: view:project.issue.report:0 field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Миний асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Previous Stage"
+msgstr "Өмнө үе рүү өөрчлөх"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+"OpenERP-д төслийн асуудлуудыг програм хангамжийн төсөлд бугийг бүртгэх, "
+"борлуулалтанд борлуулалтын дараах гомдлыг бүртгэх гэх мэт байдлаар хэрэглэх "
+"боломжтой. Энэ өөрийн бүтээгдэхүүний ялгаатай хувилбаруудыг бүртгэж асуудлыг "
+"холбож ажиллах боломжтой."
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:330
+#, python-format
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Асуудлын #"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "9-р сар"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "12-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Асуудал Хөтлөлтийн Мөчир"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:408 view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Томруулах"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Онцлог хүсэх"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Шинэчилсэн огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Open Features"
+msgstr "Нээлттэй онцлог"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Өмнөх"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,categ_id:0
+#: view:project.issue.report:0 field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Ангилал"
+
+#. module: project_issue
+#: field:project.issue,user_email:0
+msgid "User Email"
+msgstr "Хэрэглэгчийн Имэйл"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Төслийн асуудлуудын тоо#"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to New"
+msgstr "Шинэ болгох"
+
+#. module: project_issue
+#: help:project.issue,channel_id:0
+msgid "Communication channel."
+msgstr "Харилцах суваг."
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Энэ бичлэгт харгалзах орох, гарах бүх э-мэйлийг илгээхийн өмнө СС талбарт "
+"эдгээр э-мэйл хаягуудыг нэмж өгнө. Э-мэйл хаягуудыг таслалаар тусгаарлана."
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact Information"
+msgstr "Холбогчийн Мэдээлэл"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0 selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Хаалттай"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "Хариулах"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Асуудал хаагдах дундаж хоног"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0 selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Төлөв"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Төслийн Асуудлууд#"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Идэвхтэй Асуудал"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "8-р сар"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Энгийн"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "Глобал CC"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "To Do"
+msgstr "Хийх"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "6-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "New Issues"
+msgstr "Шинэ асуудлууд"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Хаах өдөр"
+
+#. module: project_issue
+#: field:project.issue,active:0 field:project.issue.version,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "11-р сар"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Хайх"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "10-р сар"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues Dashboard"
+msgstr "Асуудлын Хянах Самбар"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,type_id:0
+msgid "Stages"
+msgstr "Үе"
+
+#. module: project_issue
+#: help:project.issue,days_since_creation:0
+msgid "Difference in days between creation date and current date"
+msgstr "Үүсгэсэн огноо, одоогийн огнооны ялгавар өдрөөр"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "1-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Онцлог Хөтлөлтийн Мөчир"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Эдгээр хүмүүс и-мэйл хүлээж авна"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Асуудал Үеээр"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,date:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: project_issue
+#: field:project.issue,user_id:0 view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Assigned to"
+msgstr "Хариуцагч"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Имэйлийн Хариулах Хаяг"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Харилцагчийн холбогч"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Асуудал Хөтлөх Форм"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,state:0
+#: view:project.issue.report:0 field:project.issue.report,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "Ерөнхий"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Current Features"
+msgstr "Идэвхтэй Онцлог"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "Асуудлын Хувилбар"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Хувилбарийн Дугаар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Хаах"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Нээх"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "Асуудал"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+msgid "In Progress"
+msgstr "Боловсруулж байна"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "Төслийн Асуудал"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Creation Month"
+msgstr "Үүсгэсэн сар"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Бодолт: Зарцуулсан хугацаа / Нийт хугацаа."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"Системийн буг, захиалагчийн гомдол, материалын задаргаа зэрэг асуудал энд "
+"цугларна. Төслийн асуудлыг шийдвэрлэх үеүүдийг тодорхойлж болно (шинжилгээ, "
+"хөгжүүлэлт, хийгдсэн) Имэйл үүдийн тусламжтайгаар имэйл нь асуудлыг шууд "
+"үүсгэхээр уялдаж болно. (Жишээлбэл: support@mycompany.mn)"
+
+#. module: project_issue
+#: view:board.board:0 view:project.issue:0
+msgid "Pending Issues"
+msgstr "Хүлээгдэж байгаа асуудал"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "Асуудал"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "Онцлог Хөтлөгчийн Хайлт"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,description:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Борлуулалтын баг"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "5-р сар"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "Имэйл #"
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"Хэрэг нээгдэхэд төлөв нь 'Ноорог' болно.                                  \n"
+"Хэрэв хэрэг боловсруулагдаж байгаа бол 'Нээлттэй' төлөвтэй болно.            "
+"                      \n"
+"Хэрэг хийгдсэн бол 'Хийгдсэн' төлөвтэй болно.                                "
+"  \n"
+"Хэрэв хэрэг хүлээгдэж байгаа бол 'Хүлээгдэж байгаа' төлөвтэй болно."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "2-р сар"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:70
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "Асуудал '%s' нээгдлээ."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "Онцлогийн тайлбар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Edit"
+msgstr "Засах"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "Төслийг Томруулах"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+"Хэрэг харъяалагдах Борлуулалтын Баг.                             Хариуцагч "
+"хэрэглэгч болон имэйл үүдийн имэйл хаягийг тодорхойлно."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "Сар-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:85
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "Асуудал '%s' хаагдлаа."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "4-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "Сурвалж"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "Асуудлыг хаах хүртэлх ажлын цаг"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Current Year"
+msgstr "Энэ жил"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:415
+#, python-format
+msgid "No Title"
+msgstr "Гарчиг Үгүй"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Төслийн даалгаврыг хаах хүртэл өдрийн тоо"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "Борлуулалтын Баг"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "Хаах хүртэлх дундаж ажлын цаг"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "Өндөр"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Дуусах огноо"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "Сүүлийн үйлдэл"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,name:0
+msgid "Year"
+msgstr "Он"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "Миний нээлттэй асуудлууд Үүсгэсэн Огноогоор"
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ad6e7afdbcc..976a706ac54 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -591,14 +591,9 @@ class project(osv.osv):
     _columns = {
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'reply_to' : fields.char('Reply-To Email Address', size=256),
-        'use_issues' : fields.boolean('Use Issues', help="Check this field if this project manages issues"),
         'issue_count': fields.function(_issue_count, type='integer'),
     }
 
-    _defaults = {
-        'use_issues': True,
-    }
-
     def _check_escalation(self, cr, uid, ids, context=None):
         project_obj = self.browse(cr, uid, ids[0], context=context)
         if project_obj.project_escalation_id:
@@ -611,4 +606,18 @@ class project(osv.osv):
     ]
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    
+    _columns = {
+        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
+    }
+    
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or vals.get('use_issues')
+
+account_analytic_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 4c3be9e1327..8044d149901 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,6 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b7089cac129..0cbde2a2020 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
+        <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -10,7 +10,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
-                    <field name="name"/>
+                    <field name="name" string="Issue Version"/>
+                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -75,22 +76,17 @@
                     <field name="stage_id" widget="statusbar"/>
                 </header>
                 <sheet string="Issue">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <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"/>
-                            <label for="task_id"/>
-                            <div>
-                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
-                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                    attrs="{'invisible':[('task_id','!=',False)]}" />
-                            </div>
                         </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"/>
                             <field name="priority"/>
@@ -98,7 +94,7 @@
                             <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..." />
 
                     <notebook groups="base.group_no_one">
                         <page string="Extra Info">
@@ -157,15 +153,16 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                         <separator orientation="vertical"/>
-                        <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        </field>
+                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id"/>
+                        <separator orientation="vertical"/>
                         <field name="id"/>
                     </group>
                     <newline/>
@@ -258,7 +255,6 @@
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
                                         <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
                                         <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
@@ -310,17 +306,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
-                    <separator orientation="vertical"/>
                     <group>
                         <field name="name" string="Feature description"/>
-                        <field name="user_id"/>
-                        <field name="state" groups="base.group_no_one">
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id" string="Project"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -344,9 +340,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_issues"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_issues"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                     <field name="reply_to"/>
@@ -371,5 +370,20 @@
                 </xpath>
             </field>
         </record>
+      <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.issue.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_issues" />
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 43a49abf2b8..862f52b1931 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,36 +52,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter string="Year" icon="terp-go-year" help="Current Year"
-                        name="year"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />
-                        <separator orientation="vertical" />
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
+                   <group>
+                        <field name="creation_date"/>
                         <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
                             string="New"
                             domain="[('state','=','draft')]"/>
                         <filter  icon="terp-check"
                             string="To Do"
-                            domain="[('state','=','open')]"/>                            
-                       <filter icon="terp-gtk-media-pause"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                       <filter icon="terp-dialog-close"
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
-                           <separator orientation="vertical" />
-
+                          <separator orientation="vertical" />
                           <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="user_id" widget="selection"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
@@ -119,8 +107,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
-
-                  </group>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 21e50b21e8d..ec7080708ac 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", readonly=True,
+        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 0a470205c24..1c9702e3d38 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -8,9 +8,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <group name="support" position="after">
-                    <field name="fetchmail_issue"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
+                <group name="support" position="inside">
+                    <label for="fetchmail_issue"/>
+                    <div>
+                        <field name="fetchmail_issue"/>
+                        <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
new file mode 100644
index 00000000000..77ffa6ef54b
--- /dev/null
+++ b/addons/project_long_term/i18n/mn.po
@@ -0,0 +1,529 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 13:23+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Дараагийн Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Төслийн Даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Оноогдсон Хэрэглэгчид"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Явц"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Боловсруулагдаж байгаа Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Тов"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Шатны Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Төсөл нь ялгаатай шатуудад хуваагдаж болно. Шат бүрт хэрэглэгчдийн "
+"хуваарьлалтыг хийж болно. Шатуудад даалгавруудыг онооно. Шатуудыг өмнөх, "
+"хойдох шаттай нь холбож болно. Шатуудад автомат товлолтыг хийх огнооны "
+"хяналтуудыг нэмэх боломжтой. Урт хугацааны төлөвлөлтийг байгаа хэрэглэгчид "
+"төлөвлөхдөө хэрэглэж төслийг эхлэхдээ шатуудыг бүлэг даалгаврууд руу "
+"хөрвүүлэх замаар эхлүүлнэ."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Нэг төслийг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Өмнөх Шатууд"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Х.Н (Хэмжих Нэгж) гэдэг нь үргэлжлэх хугацааг хэмжих нэгж юм."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Хэрэглэгчдийг Төлөвлөх"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Энэ нь эхлэх огноо, үргэлжлэх хугацааны дагуу товлогчоор тооцоологддог."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Дуусгах огноо"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Миний бүх төслийг тооцоолох"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Төслийн Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Холбогдох даалгавар дээр үндэслэн тооцоологдсон"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Үргэлжлэх Х.Н"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Хамгийн бага эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Нөөц"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Миний төслүүд"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Холбогдох даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Шинэ Шатууд"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Төслийн товийг зааж өгнө үү."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "шатыг энэ огнооны дараанаас хүчээр эхлүүлэх"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"төслийн эхлэх огноо эсвэл өмнөх шатын дуусах огнооны дагуу товлогчоор "
+"автоматаар энэ нь тооцоологддог."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Шатын эхлэх огноо нь дуусах огнооноос өмнө байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Эхлэх Сар"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "энэ огнооны өмнө шатыг хүчээр дуусгах"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Төсөл дахь нөөц нь товлогчоор автоматаар тооцоологдож болно."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Хүлээгдэж байгаа шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Төсөлийн Даалгавруудыг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Хяналт"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Шатуудын жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Төслийн шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Үлдсэн цаг"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Ажлын цаг"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Шатуудыг Товыг Гаргах"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Шатыг эхлэх"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Нийт цаг"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Шат"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Хэрэв шат үүсгэгдсэн бол төлөв нь 'Ноорог' болно.\n"
+" Хэрэв шат эхлэсэн бол төлөв нь 'Хийгдэж байна' болно.\n"
+" Хэрэв шат үзлэг хийгдэх хэрэгтэй бол 'Хүлээгдэж буй' төлөвтэй болно.        "
+"                          \n"
+" Хэрэв шат дууссан бол 'Хийгдсэн' төлөвтэй болно."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Даалгаврын Дэлгэрэнгүй"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Төслийн Хэрэглэгчид"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Төслийн Шат"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"Бүх төслийн эсвэл тухайлсан төслийн шатыг товыг гаргах. Дараа нь Гантт "
+"харагдацаар нээгдэнэ.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Төслийн Шатыг Тооцоолох"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Шатанд давталт зөвшөөрөгдөхгүй"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Нөөцийн Амралт, Чөлөө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Даалгавруудыг Товлох"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Анхныхаар өдрөөр"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Оноогдсон хэрэглэгчдийг албадах"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Товлох"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Харуулах Тохиргоо"
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
new file mode 100644
index 00000000000..c93e11abe4e
--- /dev/null
+++ b/addons/project_long_term/i18n/sv.po
@@ -0,0 +1,527 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-20 14:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Nästa fas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Projektets aktiviteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Ansluten användare"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Förlopp"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "I aktiva faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Schemalägg"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Fel! Du kan inte eskalera till samma projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Dag"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Fas användarfördelning"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Ett projekt kan delas in i flera olika faser. Varje fas kan du definiera "
+"användares beläggning, beskriva olika aktivieteter och länka dina faser till "
+"andra faser, datumregler för automatisk schemaläggning. Använd "
+"långtidsplanering för detaljplanera dina användares beläggning, konvertera "
+"dina faser till en serie av aktiviteter när projektarbetet verkligen kommer "
+"igång."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Beräkna ett enskilt projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Föregående fas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Enhet (mätenhet) är enheter för att beskriva varaktigheten"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Personalplanering"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Beräknas av schemaläggaren med hänsyn till startdatum och varaktighet."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Slutdatum"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Tidsfrist"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Beräkna alla mina projekt"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (kopia)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Personalplanering i projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Beräkna"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Ny"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Beräkning baserad på relaterade aktiviteter"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Varaktighetsenhet"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Tidigaste startdatum"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Resurser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Mina projekt"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Startdatum"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Relaterade aktiviteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Nya faser"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Vänlgen ange ett projekt att schemalägga."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Tvinga fasen att starta efter detta datum"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Projektaktiviteter"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Beräknas av schemaläggaren i enlighet med projektdatum eller slutdatum från "
+"föregående fas."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Fasens startdatum måste föregå slutdatum."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Startmånad"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Startdatum"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Tvinga fasen att slutföras före detta datum"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Projektresurserna kan automatiskt beräknas av schemaläggaren"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Preliminär"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Vilande faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Vilande"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Användare"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Beräkning av projektaktivieteter"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Begränsningar"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Ger ordningsföljden vid listning av faser."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Projektfaser"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Klar"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Pågående"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Återstående timmar"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Arbetstid"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Schemalägg faser"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Startfas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Totalt antal timmar"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Användare"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Fas"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Om fasen är ny är status 'Preliminär'.\n"
+" Om fasen är startad övergår status till 'Pågående'.\n"
+" Om granskning är nödvändig är status 'vilande'.\n"
+" Om fasen är genomförd, sätts status till 'Klar'"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Slutdatum"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Aktivitetsdetaljer"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Varaktighet"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Projektanvändare"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Projektfas"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"För att schemalägga faserna för alla valda projekt. Efteråt visas en "
+"ganttvy.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Beräkna projektfaser"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Inte tillåtet med upprepningar i faser"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Resursavgångar"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Schemalägg aktiviteter"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Dagar som standard"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Tvinga anslutna användare"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Schemaläggning"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Visar inställningar"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,19 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or vals.get('use_phases')
+
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1717fb950f7..419c89cb449 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
+                       <field name="user_id"/>
+                       <field name="phase_id"/>
+                       <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -97,6 +97,13 @@
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
@@ -104,21 +111,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
@@ -151,9 +152,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
                     </h2>
@@ -164,7 +165,7 @@
                         </group><group>
                             <label for="duration"/>
                             <div>
-                                <field name="duration" class="oe_form_inline"/>
+                                <field name="duration" class="oe_inline"/>
                                 <field name="product_uom"/>
                             </div>
                         </group>
@@ -213,7 +214,7 @@
                                 </group>
                             </group>
                            <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids"/>
+                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
@@ -272,18 +273,19 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
+                        <field name="name" string="Project Phases"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+                        <field name="project_id"/>
                     </group>
-                    <newline/>
+                    <newline/> 
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -375,6 +377,22 @@
         view_mode="tree,form"
         />
 
+    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_phases"/>
+                </xpath>
+            </field>
+        </record>
+
     # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
@@ -391,7 +409,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 4a66cecf9cd..85ab158e0b2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory):
         'target_project': fields.selection([
             ('all', 'Compute All My Projects'),
             ('one', 'Compute a Single Project'),
-            ], 'Schedule', required=True),
+            ], 'Action', required=True),
         'project_id': fields.many2one('project.project', 'Project')
     }
     _defaults = {
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 bf2c51e41e6..37c7256cb7c 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -10,9 +10,8 @@
                   <form string="Schedule Phases" version="7.0">
                       <header>
                           <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                       </header>
-                      <group string="Schedule Phases">
+                      <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
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 ac30a3aa6d9..3ceac7e9a9e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -10,7 +10,6 @@
                  <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/project_mailgate/i18n/sv.po b/addons/project_mailgate/i18n/sv.po
new file mode 100644
index 00000000000..a16258fafac
--- /dev/null
+++ b/addons/project_mailgate/i18n/sv.po
@@ -0,0 +1,78 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-18 23:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Historikinformation"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Aktivitet"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:90
+#, python-format
+msgid "Draft"
+msgstr "Preliminär"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:116
+#, python-format
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:110
+#, python-format
+msgid "Done"
+msgstr "Färdig"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:96
+#, python-format
+msgid "Open"
+msgstr "Öppen"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:102
+#, python-format
+msgid "Pending"
+msgstr "Väntande"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Historik"
diff --git a/addons/project_mrp/i18n/mn.po b/addons/project_mrp/i18n/mn.po
new file mode 100644
index 00000000000..bc77b4810ab
--- /dev/null
+++ b/addons/project_mrp/i18n/mn.po
@@ -0,0 +1,129 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 14:44+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_mrp
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанийн хэмжээнд үл давхцах байх ёстой!"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Бараа бүрийн хувьд үйлчилгээний төрөл болон захиалга дээр"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Татан авах даалгавар"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sale order line"
+msgstr "Борлуулалтын захиалгын мөр"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Барааны төрөл нь үйлчилгээ бол энэ нь даалгавар үүсгэдэг."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "Хэрэв барааны төрөл нь 'үйлчилгээ' бол энэ даалгавар үүсгэнэ."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Борлуулалтын Захиалгын Даалгавар"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Бараа"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: EAN код буруу"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Татан авалт"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Үйлчилгээ үзүүлэх даалгавар"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Даалгавар Захиалах"
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Даалгавар Үүсгэх"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
+msgstr ""
+"Хэрэв татан авах арга нь захиалахад хийх бөгөөд нийлүүлэх арга нь үйлдвэрлэх"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "Борлуулалтын захиалгад үйлчилгээ борлуулалх тохиолдолд"
+
+#. module: project_mrp
+#: field:project.task,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "Борлуулалтын захиалгын мөр"
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 32d2113727b..93417cf2ac8 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -29,9 +29,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
-                <field name="sale_line_id"/>
-            </xpath>
+                <field name="state" position="after">
+                    <field name="sale_line_id" string="Order Line"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/project_planning/i18n/mn.po b/addons/project_planning/i18n/mn.po
new file mode 100644
index 00000000000..c60224a518d
--- /dev/null
+++ b/addons/project_planning/i18n/mn.po
@@ -0,0 +1,587 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 14:54+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Энэ утга нь төлөвлөлт дээрх энэ даалгаврыг хийхэд үлдэж байгаа нийлбэр "
+"хугацаа өдрөөр илэрхийлж байна."
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Төлөвлөлтийн Статистик"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Төлөвлөлтийн Мөр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Хуваарилагдаагүй Нийт Хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Төлөвлөлтийн Нэр"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Миний Төслийн Төлөвлөлт"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Цагийн хуудас"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
+msgstr ""
+"Үүний глобаль системээр компаний бүх нөөц (хүн, материал)-г товлодог. "
+"OpenERP даалгавруудтыг автомат тооцоолох, шатуудыг товлох, нөөцийн "
+"хуваарилалтыг хянах, хүрэлцэх эсэхийг шалгах зэрэг боломжийг олгодог."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Нийт төлөвлөсөн даалгаварууд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Данс"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Тэмдэглэгээ"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Төлөвлөлт"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Даалгаврыг эхлэх"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Нийт төлөвлөсөн (Өдрөөр)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Зөв биш төлөвлөлт ! Нэг хариуцагчийн хувьд төлөвлөлтийн хугацаа давхцаж "
+"болохгүй. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Төлөвлөлт Дансаар"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Идэвхтэй Төлөвлөлтууд"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Шинжилгээний Данс"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Ноороглох"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Нийт Төлөвлөгдсөн"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+"Энэ утга нь төлөвлөлтөд орсон цагийн хуудсын бүх ажлын 'Эхлэх огноо' болон "
+"'Дуусах огноо'-нуудыг нийлбэр."
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Даалгавар үгүй хуваарилагдсан хугацаанууд"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Төлөвлөлтийн мөрүүд"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Шинжилгээний Санхүү"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+"Энэ утга нь 'Даалгаварт оноогдсон' нь тэмдэглэгдээгүй хуваарилагдсан "
+"хугацаануудын нийлбэр өдрөөр."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Энэ нь төлөвлөлтөнд хэмжих нэгж болж тохируулагдана."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Хүний Нөөцийн Төлөвлөлт"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Үлдсэн Даалгаврууд"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Төлөвлөлт"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "Хэнд :"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Хугацааны Кодлол"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Хуваарилагдаагүй Хугацаа"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+"Хуваарилагдсан боловч даалгавар холбогдоогүй хугацаануудын нийлбэр өдөрөөр."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Ацаглах"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Төлөвлөлтийн шинжилгээ"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Энэ төлөвлөлтөнд нэг хүн бүтэн цагаар ажиллахад хэдэн цаг ажиллах ажлын "
+"өдөрийг энд тааруулна."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Хаанаас :"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Төлөвлөлт Хэрэглэгчээр"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Төлөвлөлт Дансаар (өдрөөр)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Даалгаваргүй хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Нийт Чөлөөтэй хугацаа"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+"Хуваарилагдсан хугацааны 'Даалгавар оноогдоогүй' гэдэг нь тэмдэглэгдсэн "
+"хугацаануудын нийлбэр өдөрөөр."
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+"Ажлын өдөрөөр тооцоологдоно - (Даалгаварт хуваарилагдаагүй хугацаа + "
+"Даалгаварт хуваарилагдаагүй хугацаа + Амралт, Чөлөө)"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Тоо хэмжээ Хэмжих Нэгж"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Төлөвлөлт Дансаар"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Төлөвлөгдсөн Өдөр"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Төлөв"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Өгөгдсөн төлөвлөлтийн эхлэх, дуусах хугацааны хоорон дахь батлагдсан амралт "
+"чөлөөний хугацааны нийлбэрийн утга."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Бүх үлдсэн даалгаврууд"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Компаниуд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "UOM дээр суурилсан тоо хэмжээ"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Даалгаврууд дээрх төлөвлөгдсөн хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Төлөвлөлтийн мөрүүд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Төлөвлөлт хэрэглэгчээр (өдөрөөр)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Төлөвлөлтийн статистик"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Нээх"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Төлөвлөлт хэрэглэгчээр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Ажлын өдөрууд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Дахин идэвхжүүлэх"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Хариуцагч"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Төлөвлөлтийн статистик"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Даалгавруудын хуваарилагдсан хугацаа"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Товчоо хэрэглэгчээр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Даалгаваргүй Хугацааны Хуваарилалтын Дүн"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Амралт, чөлөө"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Даалгавруудад Хуваарилагдсан Нийт Хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_planning
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Компаний нэр үл давхцах байх ёстой !"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Үлдсэн даалгаврууд"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Төслөөрх товчоо"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Хариуцагч :"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Төлөвлөлтийн Хугацааны Нэгж"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Төлөвлөлтийн Даалгаврууд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Менежер"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr "Даалгаварт хуваарилагдсан хугаануудын нийлбэр өдөрөөр."
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Бусад"
diff --git a/addons/project_scrum/i18n/ja.po b/addons/project_scrum/i18n/ja.po
new file mode 100644
index 00000000000..052e9c07210
--- /dev/null
+++ b/addons/project_scrum/i18n/ja.po
@@ -0,0 +1,1044 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-20 17:12+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-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "_Assign"
+msgstr "割当"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr "ミーティング名"
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr "バックログ作成タスクから"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,user_id:0
+msgid "Author"
+msgstr "著者"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "What did you do since the last meeting?"
+msgstr "最終ミーティング以降、何を行いましたか？"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Month"
+msgstr "スプリント月"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (e.g. one month) during "
+"which the team implements a list of product backlogs. The sprint review is "
+"organized when the team presents its work to the customer and product owner."
+msgstr ""
+"スクラムのアジャイル方法論はソフトウェア開発プロジェクトで使用されます。この方法論では、スプリントはチームが製品バックログのリストを実装する短い期間（例え"
+"ば1ヶ月）です。チームが顧客と製品所有者にその作業を提示した時に、スプリントレビューは編成されます。"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+msgid "Create task from backlogs"
+msgstr "バックログからタスクの作成"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr "スプリント名"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+msgid "Progress"
+msgstr "進捗"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,user_id:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr "スクラムマスター"
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:83
+#, python-format
+msgid "The sprint '%s' has been opened."
+msgstr "スプリント %s は開かれました。"
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Are your sprint backlog estimate accurate ?"
+msgstr "スプリントバックログの見積は正確ですか？"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr "ふりかえり"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Send Email"
+msgstr "Eメール送信"
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "In Progress Sprints"
+msgstr "スプリント進行中"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "For changing to delegate state"
+msgstr "委任状態への変更"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#, python-format
+msgid "Product Backlog '%s' is assigned to sprint %s"
+msgstr "製品バックログ %s はスプリント %s に割り当てられます。"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr "製品のバックログを見る"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
+msgid "Merge Product Backlogs"
+msgstr "製品バックログの統合"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
+#: view:project.scrum.backlog.merge:0
+msgid "Merge Backlogs"
+msgstr "バックログの統合"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/mail_compose_message.py:54
+#: code:addons/project_scrum/wizard/project_scrum_email.py:53
+#, python-format
+msgid "Scrum Meeting : %s"
+msgstr "スクラムミーティング：%s"
+
+#. module: project_scrum
+#: view:project.task:0
+msgid "Backlog"
+msgstr "バックログ"
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Spent hours"
+msgstr "消費時間"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+"スクラムアジャイル方法論はソフトウェア開発プロジェクトで使用されます。この方法論は、チームが直面する困難さを検出するために、そのチームの日次ミーティングが"
+"スクラムマスターによって計画されます。"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Backlogs Assigned To Current Sprints"
+msgstr "バックログを現在のスプリントに割当"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "For cancelling the task"
+msgstr "タスクキャンセルのため"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
+#: view:project.scrum.product.backlog:0
+#: field:project.task,product_backlog_id:0
+msgid "Product Backlog"
+msgstr "製品バックログ"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_project
+#: field:project.scrum.backlog.merge,project_id:0
+#: field:project.scrum.meeting,project_id:0
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,project_id:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Start Task"
+msgstr "タスク開始"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:91
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
+#: code:addons/project_scrum/wizard/project_scrum_email.py:97
+#, python-format
+msgid "None"
+msgstr "None"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr "工程変更"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Links"
+msgstr "リンク"
+
+#. module: project_scrum
+#: help:project.scrum.sprint,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "タスク作業完了の合計を使用して計算されます。"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:92
+#, python-format
+msgid "Task for Today"
+msgstr "今日のタスク"
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Open Backlog"
+msgstr "バックログを開く"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Total Spent Hours"
+msgstr "合計スプリント時間"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Pending Sprints"
+msgstr "保留中スプリント"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:95
+#, python-format
+msgid "Blocking points encountered:"
+msgstr "ブロッキングポイントが発生："
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Backlogs Not Assigned To Sprints."
+msgstr "バックログがスプリントに未割当"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Planning"
+msgstr "計画"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.assign.sprint:0
+#: view:project.scrum.backlog.create.task:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: project_scrum
+#: help:project.scrum.sprint,scrum_master_id:0
+msgid "The person who is maintains the processes for the product"
+msgstr "製品のため処理を維持する人"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,expected_hours:0
+#: field:project.scrum.sprint,expected_hours:0
+msgid "Planned Hours"
+msgstr "計画時間数"
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Sprints"
+msgstr "スプリント"
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
+msgstr "タスクに変換"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Are you sure you want to merge these backlogs?"
+msgstr "本当にそれらのバックログを統合しますか？"
+
+#. module: project_scrum
+#: help:project.scrum.backlog.create.task,user_id:0
+msgid "Responsible user who can work on task"
+msgstr "タスクで作業する責任ユーザ"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr "スプリントタスクを表示"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "New"
+msgstr "新規"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meeting_ids:0
+msgid "Daily Scrum"
+msgstr "毎日のスクラム"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.create.task:0
+msgid "C_onvert"
+msgstr "変換"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Pending Backlogs"
+msgstr "保留中バックログ"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+#: view:project.scrum.product.backlog:0
+msgid "Product Backlogs"
+msgstr "製品バックログ"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "Eメール作成ウィザード"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Are there anything blocking you?"
+msgstr "何か阻害要因はありますか？"
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_scrum
+msgid "Scrum"
+msgstr "スクラム"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr "本日のタスク"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:89
+#: field:project.scrum.meeting,question_yesterday:0
+#, python-format
+msgid "Tasks since yesterday"
+msgstr "昨日からのタスク"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: selection:project.scrum.sprint,state:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
+msgid "Assign sprint to backlogs"
+msgstr "バックログにスプリントを割当"
+
+#. module: project_scrum
+#: help:project.scrum.sprint,expected_hours:0
+msgid "Estimated time to do the task."
+msgstr "タスクの実行予定時間"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,task_hours:0
+msgid "Task Hours"
+msgstr "タスク時間数"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr "プロジェクトタスクの表示"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/mail_compose_message.py:55
+#: code:addons/project_scrum/wizard/project_scrum_email.py:56
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+"こんにちは、\n"
+"スクラムミーティングを送信しています：%s スプリント %s プロジェクト %s"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Daily"
+msgstr "日次"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr "スプリントバックログ"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Delegate"
+msgstr "委任"
+
+#. module: project_scrum
+#: view:board.board:0
+msgid "My Board"
+msgstr "私のボード"
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:90
+#, python-format
+msgid "The sprint '%s' has been closed."
+msgstr "スプリント %s は閉じられました。"
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
+#: view:project.task:0
+msgid "Task Progress"
+msgstr "タスクの進捗"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr "ミーティング日"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
+#: view:project.scrum.meeting:0
+#: field:project.scrum.meeting,task_ids:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Tasks"
+msgstr "タスク"
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,sprint_id:0
+msgid "Select Sprint to assign backlog."
+msgstr "バックログ割当のためのスプリントを選択"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,progress:0
+#: help:project.scrum.sprint,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "計算式：消費時間 / 合計時間"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Month"
+msgstr "月"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Draft Backlogs"
+msgstr "ドラフトバックログ"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr "ブロックに遭遇"
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Change the state of product backlogs to open if its in draft state"
+msgstr "ドラフト状態である時、開くために製品バックログの状態を変更します。"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Total Planned Hours"
+msgstr "合計計画時間数"
+
+#. module: project_scrum
+#: help:project.project,product_owner_id:0
+#: help:project.scrum.sprint,product_owner_id:0
+msgid "The person who is responsible for the product"
+msgstr "製品責任者"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "What do you plan to do till the next meeting?"
+msgstr "次回ミーティングまでに何を行う予定ですか？"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr "スクラムのスプリント"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Product owner"
+msgstr "製品所有者"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr "レビュー"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr "スプリントのふりかえり"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project_scrum
+#: help:project.task,product_backlog_id:0
+msgid ""
+"Related product backlog that contains this task. Used in SCRUM methodology"
+msgstr "このタスクに含む関連する製品バックログ。スクラム方法論の中で使用されます。"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
+#: view:postpone.wizard:0
+#: view:project.scrum.product.backlog:0
+msgid "Postpone"
+msgstr "延期"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Type"
+msgstr "タイプの変更"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "For changing to done state"
+msgstr "完了状態への変更"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "New Sprints"
+msgstr "新規スプリント"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Optional Info"
+msgstr "オプション情報"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
+msgid "Create Tasks from Product Backlogs"
+msgstr "製品バックログからタスクの作成"
+
+#. module: project_scrum
+#: help:project.project,sprint_size:0
+msgid "Number of days allocated for sprint"
+msgstr "スプリントへの割当日数"
+
+#. module: project_scrum
+#: field:project.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr "製品所有者"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,sequence:0
+msgid "Gives the sequence order when displaying a list of product backlog."
+msgstr "製品バックログのリスト表示の際に並び順を与えます。"
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr "製品バックログ"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
+msgid "Backlogs"
+msgstr "バックログ"
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Create Task for Product Backlog"
+msgstr "製品バックログのタスクを作成"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+msgid "Scrum Meetings"
+msgstr "スクラムミーティング"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr "バックログを行うための予想時間"
+
+#. module: project_scrum
+#: help:project.scrum.backlog.merge,project_id:0
+msgid "Select project for the new product backlog"
+msgstr "新製品バックログのためのプロジェクトを選択"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Merge"
+msgstr "統合"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr "スプリントバックログを表示"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr "正確なバックログ"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
+#: view:project.scrum.backlog.create.task:0
+#: view:project.scrum.product.backlog:0
+msgid "Convert to Task"
+msgstr "タスクに変換"
+
+#. module: project_scrum
+#: help:project.scrum.sprint,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr "プロジェクト名に疑問を持つ場合、それはこのプロジェクトにリンクする分析アカウントがないことを意味します。"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
+#: view:project.scrum.product.backlog:0
+msgid "Backlog Progress"
+msgstr "バックログの進捗"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+#: view:project.scrum.product.backlog:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr "開く"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr "有効な時間数"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Information"
+msgstr "情報"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#, python-format
+msgid "Product Backlog '%s' is converted into Task %d."
+msgstr "製品バックログ %s はタスク %d に変換されます。"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Remaining Hours"
+msgstr "残り時間数"
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr "機能"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "My Backlogs"
+msgstr "私のバックログ"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "In Progress Backlogs"
+msgstr "進行中のバックログ"
+
+#. module: project_scrum
+#: view:project.task:0
+msgid "View Sprints"
+msgstr "スプリントの表示"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a development sprint and may be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+"スクラムアジャイル方法論はソフトウェア開発プロジェクトで使用されます。製品バックログは実装される機能のリストです。製品バックログは開発のスプリントの中に計"
+"画され、複数のタスクに分割されるかもしれません。製品バックログはプロジェクトの製品所有者により管理されます。"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Postpone backlog"
+msgstr "バックログの延期"
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr "バックログのタスク"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr "計画時間数"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_start:0
+msgid "Starting Date"
+msgstr "開始日"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_meeting
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Meeting"
+msgstr "スクラムメッセージ"
+
+#. module: project_scrum
+#: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
+#: view:project.scrum.sprint:0
+msgid "Burndown Chart"
+msgstr "バーンダウンチャート"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr "日次ミーティング"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Expected hours"
+msgstr "予想時間数"
+
+#. module: project_scrum
+#: field:project.project,sprint_size:0
+msgid "Sprint Days"
+msgstr "スプリント日数"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr "進捗（0-100）"
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr "スプリント情報"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,active:0
+msgid ""
+"If Active field is set to true, it will allow you to hide the product "
+"backlog without removing it."
+msgstr "アクティブ項目をTrueにセットした場合、製品バックログを削除することなく非表示にできます。"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,task_hours:0
+msgid "Estimated time of the total hours of the tasks"
+msgstr "タスクの合計時間の予想時間"
+
+#. module: project_scrum
+#: view:project.project:0
+msgid "Scrum Data"
+msgstr "スクラムデータ"
+
+#. module: project_scrum
+#: field:project.project,scrum:0
+msgid "Is a Scrum Project"
+msgstr "スクラムプロジェクト"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Edit"
+msgstr "編集"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr "タスク詳細"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_postpone_wizard
+msgid "postpone.wizard"
+msgstr "延期ウィザード"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid ""
+"This wizard merge backlogs and create one new backlog with draft state (Old "
+"backlogs Will be deleted). And it also merge old tasks from backlogs"
+msgstr ""
+"このウィザードではバックログを統合し、ドラフト状態の１つの新規バックログを作成します（古いバックログは消去されます）。そして、バックログから古いタスクを統"
+"合します。"
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Postpone Backlog"
+msgstr "バックログの延期"
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Select the project for merged backlogs"
+msgstr "バックログ統合のためのプロジェクトを選択"
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
+msgid "My Sprint"
+msgstr "私のスプリント"
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,effective_hours:0
+msgid "Spent Hours"
+msgstr "消費時間数"
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,effective_hours:0
+msgid "Computed using the sum of the time spent on every related tasks"
+msgstr "全ての関連するタスクの消費時間の合計を使用して計算"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
+msgid "Scrum Dashboard"
+msgstr "スクラムダッシュボード"
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_sprint
+msgid "Project Scrum Sprint"
+msgstr "スクラムスプリントのプロジェクト"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Feature Description"
+msgstr "機能説明"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
+#, python-format
+msgid "Please select any Project."
+msgstr "プロジェクトを選択して下さい。"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:98
+#, python-format
+msgid "Thank you,"
+msgstr "ありがとうございます。"
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.task:0
+msgid "Current Sprints"
+msgstr "現在のスプリント"
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "Assign Sprint"
+msgstr "スプリントの割当"
+
+#. module: project_scrum
+#: field:project.scrum.backlog.create.task,user_id:0
+msgid "Assign To"
+msgstr "割当先"
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Are you sure to postpone Backlog ?"
+msgstr "本当にバックログの延期をしますか？"
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "For changing to open state"
+msgstr "開く状態に変更"
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,sprint_id:0
+#: view:project.scrum.meeting:0
+#: field:project.scrum.meeting,sprint_id:0
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,sprint_id:0
+#: view:project.task:0
+#: field:project.task,sprint_id:0
+msgid "Sprint"
+msgstr "スプリント"
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
+#, python-format
+msgid "Please select at least two product Backlogs"
+msgstr "少なくとも２つの製品バックログを選択して下さい。"
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr "スプリントのレビュー"
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 2dccbb2e38b..f1a82867a6f 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -36,7 +36,13 @@ the Timesheet line entries for particular date and particular user  with the eff
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
     'init_xml': ['project_timesheet_data.xml'],
-    'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
+    'update_xml': [
+        "security/ir.model.access.csv",
+        "security/project_timesheet_security.xml",
+        "process/project_timesheet_process.xml", 
+        "report/task_report_view.xml", 
+        "project_timesheet_view.xml",
+        ],
     'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
diff --git a/addons/project_timesheet/i18n/ja.po b/addons/project_timesheet/i18n/ja.po
index c013f46c2f6..eef3fc94119 100644
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
new file mode 100644
index 00000000000..e3056d29d96
--- /dev/null
+++ b/addons/project_timesheet/i18n/mn.po
@@ -0,0 +1,449 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 16:46+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-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid ""
+"You will find here all works made on tasks that you can invoice.\n"
+"In order to invoice the time spent on a project, you must define the\n"
+"pricelist and the field 'Invoice Task Work' on the tab 'Billing' of\n"
+"the project form."
+msgstr ""
+"Нэхэмжилж болох даалгаврууд дээр хийсэн ажлыг та энд харна.\n"
+"Даалгавар дээр зарцууслан хугацааг нэхэмжлэхийн тулд үнийн хүснэгтийг "
+"тодорхойлох ёстой бөгөөд төслийн формын 'Төлбөр, тооцоо' хавтас дээр "
+"нэхэмжлэх даалгавруудыг тохируулах ёстой."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:55
+#, python-format
+msgid "No employee defined for user \"%s\". You must create one."
+msgstr ""
+"\"%s\" хэрэглэгчид ажилчин тодохойлогдоогүй байна. Тодорхойлох хэрэгтэй."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:63
+#, python-format
+msgid ""
+"No journal defined on the related employee.\n"
+"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 "Цагийн хуваарийн даалгавар"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by year of date"
+msgstr "Жилийн өдрөөр бүлэглэх"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current month"
+msgstr "Энэ сар дахь даалгаврын цаг"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_timesheet
+#: field:project.task.work,hr_analytic_timesheet_id:0
+msgid "Related Timeline Id"
+msgstr "Холбогдох Цагийн Шугамын ID"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Tasks by User"
+msgstr "Даалгавар Хэрэглэгчээр"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task_work
+msgid "Project Task Work"
+msgstr "Төслийн Даалгаврын Ажил"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+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 ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
+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 ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
+msgid "Customer Projects"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_taskwork0
+msgid "Task Work"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
+msgid "Timesheet Lines"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable Project"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
+msgid "Contracts to Renew"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by month of date"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_timesheettask0
+msgid "Complete Your Timesheet."
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current year"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Customer"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
+msgid "Task encoding"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
+msgid "Task summary is comes into the timesheet line"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task hours of last month"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_project
+msgid "Project"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+msgid "Invalid Analytic Account !"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:59
+#, python-format
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:54
+#: code:addons/project_timesheet/project_timesheet.py:58
+#: code:addons/project_timesheet/project_timesheet.py:62
+#: code:addons/project_timesheet/project_timesheet.py:69
+#, python-format
+msgid "Bad Configuration !"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
+msgid "Invoicing"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+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 ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoice Task Work"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:70
+#, python-format
+msgid ""
+"No product and product category property account defined on the related "
+"employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+
+#. 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 ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
+msgid "Fill Timesheet"
+msgstr ""
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 585b3cd6ec8..31b169d3c0f 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -50,14 +50,10 @@ class project_project(osv.osv):
         return res
 
     _columns = {
-        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
         'amount_to_invoice': fields.function(_to_invoice, string="Amount to Invoice", multi="sums"),
         'time_to_invoice': fields.function(_to_invoice, string="Time to Invoice", multi="sums"),
         'timesheet_count': fields.function(_timesheet_count, type='integer', string="Issue"),
     }
-    _defaults = {
-        'use_timesheets': True,
-    }
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
@@ -69,28 +65,6 @@ class project_project(osv.osv):
                 factor_id = data_obj.browse(cr, uid, data_id).res_id
                 res['value'].update({'to_invoice': factor_id})
         return res
-    
-    def open_timesheets(self, cr, uid, ids, context=None):
-        """ open Timesheets view """
-        project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
-        view_context = {
-            'search_default_account_id': [project.analytic_account_id.id],
-            'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
-        }
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': view_context,
-            'nodestroy': True,
-        }
 
 project_project()
 
@@ -131,7 +105,7 @@ class project_work(osv.osv):
         project_obj = self.pool.get('project.project')
         task_obj = self.pool.get('project.task')
         uom_obj = self.pool.get('product.uom')
-        
+
         vals_line = {}
         context = kwargs.get('context', {})
         if not context.get('no_analytic_entry',False):
@@ -141,7 +115,7 @@ class project_work(osv.osv):
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
             vals_line['date'] = vals['date'][:10]
-            
+
             #calculate quantity based on employee's product's uom 
             vals_line['unit_amount'] = vals['hours']
 
@@ -179,7 +153,7 @@ class project_work(osv.osv):
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
         result = {}
-        
+
         if isinstance(ids, (long, int)):
             ids = [ids,]
 
@@ -198,7 +172,7 @@ class project_work(osv.osv):
                 for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
                     if result.get(fld, False):
                         vals_line[fld] = result[fld]
-                        
+
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
@@ -208,7 +182,7 @@ class project_work(osv.osv):
 
                 if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
                     vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-                    
+
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
                     prod_id=prod_id, company_id=False,
@@ -218,7 +192,7 @@ class project_work(osv.osv):
                     vals_line['amount'] = amount_unit['value']['amount']
 
             self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
-            
+
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0a485470bc7..0acf639b507 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="project_invoice_form" model="ir.ui.view">
-            <field name="name">Inherit project form : Invoicing Data</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <field name="use_tasks" position='after'>
-                    <field name="use_timesheets"/>
-                    <field name="amount_to_invoice" invisible="True"/>
-                    <field name="time_to_invoice" invisible="True"/>
-                </field>
-                <field name="warn_customer" position="after">
-                    <group colspan="4" col="4">
-                        <separator colspan="4" string="Invoicing Data"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
-                        <field name="amount_max"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </field>
-            </field>
-        </record>
 
         <record id="view_project_kanban_inherited" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
@@ -55,10 +33,10 @@
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="project_invoice_form"/>
+            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
                 </field>
             </field>
         </record>
@@ -70,8 +48,7 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                   <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
@@ -81,9 +58,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                     <field name="account_id" position="replace">
-                    <field name="account_id" string="Analytic account/project" />
-                </field>
+                 <field name="account_id" position="replace">
+                     <field name="account_id" string="Analytic account/project"/>
+                 </field>
             </field>
          </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
@@ -116,7 +93,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_to_invoice': 1}</field>
             <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help">You will find here all works made on tasks that you can invoice.
 In order to invoice the time spent on a project, you must define the
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index b1ba9b8672e..66633fe8ad8 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -29,33 +29,20 @@
             <field name="model">report.timesheet.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks by User">
-            		<group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Task Hours in current year"/>
+                <search string="Tasks by User">
+                    <group>
+                        <field name="name" string="Date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task Hours in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>
-	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
-                	</group>
-                	<newline/>
-                	<group expand="1" string="Group By...">
-                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
-            	</search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/project_timesheet/security/project_timesheet_security.xml b/addons/project_timesheet/security/project_timesheet_security.xml
new file mode 100644
index 00000000000..ea1f0a98b4c
--- /dev/null
+++ b/addons/project_timesheet/security/project_timesheet_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record model="res.groups" id="base.group_user">
+            <field name="implied_ids" eval="[(4, ref('project.group_tasks_work_on_tasks'))]"/>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f7b5d0a3736..c76defe468f 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -2,11 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem
-            id="menu_purchase_deshboard"
-            name="Purchase"
-            parent="base.menu_reporting_dashboard" sequence="5"/>
-
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Request for Quotations</field>
             <field name="type">ir.actions.act_window</field>
@@ -16,14 +11,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="context">{'quotation_only': True}</field>
         </record>
-        <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
-        </record>
 
         <record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
             <field name="name">purchase.order.monthly.categ.tree</field>
@@ -69,19 +56,6 @@
             <field name="domain">[('state','in',('approved','except_picking','except_invoice','done'))]</field>
             <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
         </record>
-        <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
-            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-        </record>
-        <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
-                <field eval="1" name="sequence"/>
-                <field name="view_mode">graph</field>
-                <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
-                <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-        </record>
-
 
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
@@ -102,19 +76,19 @@
         </record>
 
         <record id="open_board_purchase" model="ir.actions.act_window">
-            <field name="name">Purchase Dashboard</field>
+            <field name="name">Purchases</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_purchase_form"/>
         </record>
-        <menuitem
-            action="open_board_purchase"
-            icon="terp-graph"
-            id="menu_board_purchase"
-            parent="menu_purchase_deshboard"
-            sequence="4"/>
+
+        <menuitem action="open_board_purchase"
+                  icon="terp-graph"
+                  id="menu_board_purchase"
+                  parent="base.menu_reporting_dashboard"
+                  sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index dfec215ca00..7d8c7edbbad 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -8,60 +8,60 @@ 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-12 04:54+0000\n"
+"PO-Revision-Date: 2012-06-21 23:39+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-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
-msgstr ""
+msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認しなければなりません。見積依頼（RFQ）は確認された発注オーダーになります。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "制御のための入庫製品"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
+msgstr "請求済＆支払済"
 
 #. module: purchase
 #: field:purchase.order,location_id:0 view:purchase.report:0
 #: field:purchase.report,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "宛先"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "発注オーダーを削除するためには、最初にそれをキャンセルする必要があります。"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "このドキュメントが作成された日付"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "担当"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -75,34 +75,37 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"仕入先に対して製品を購入したいが、しかし、まだ発注を確認していない場合に見積依頼を作成できます。このメニューは物流ルール（最小在庫、MTOなど）を基本とし"
+"て自動的に作成された見積要求をレビューするためにも使用されます。オーダーが確認されると、見積要求から発注オーダーに変換することができます。拡張インタフェー"
+"ス（ユーザ設定から）を使用すると、仕入先請求書を制御する方法を選択できます：オーダー基準、受領基準、または手動エンコード。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "承認済発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
 #: view:purchase.order.line:0 view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "請求対象"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "仕入先請求書を作成しますか？"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -111,29 +114,31 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"このメニューは、発注オーダーを参照、仕入先、製品などによる検索のために使用します。各発注オーダーのために、受け取った製品の追跡、そして仕入先請求書の制御が"
+"できます。"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "仕入先請求書"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "発注オーダー統計値"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "集荷リストから"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "価格リストがありません。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
@@ -143,44 +148,44 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "受領基準"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
 #: view:purchase.report:0 field:purchase.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "これは各発注オーダーのためのリード / 保証時間です。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "分類別月次発注"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "ドラフトに設定"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "請求書の例外"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "ドラフト発注価格リスト"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -188,96 +193,96 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr ""
+msgstr "仕入先から直接顧客に配達することを望む場合は住所を入れます。このケースでは、倉庫へのリンクは削除され、顧客の場所がセットされます。"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
 msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
-msgstr ""
+msgstr "この価格リストは、現在のパートナからの発注のためにデフォルトの価格リストの代わりに使用されます。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "FAX ："
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "仕入属性"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "部分集荷処理ウィザード"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "発注の承認"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "生成されたドラフト請求書に基づく"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "日順"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "分類別月間発注"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "起点"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,notes:0
 #: view:purchase.order.line:0 field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "税金"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -287,122 +292,122 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: field:purchase.order,name:0 view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 msgid "Products"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "月別合計数量と金額"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
+msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "発注オーダーに変換"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "出荷例外"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "請求書行"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr ""
+msgstr "入庫製品"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr "出て行く製品"
+msgstr "出庫製品"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "手動で修正"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "参照"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全請求書をキャンセルすべきです。"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "宛先住所の宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA ："
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "発注オーダー %s はドラフト状態に設定されています。"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "行数"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -410,97 +415,97 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: purchase
 #: field:purchase.order,validator:0 view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "先月のオーダー"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "正価"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "それは集荷は行われたことを示しています。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "内部出荷は処理済です。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
 #: view:purchase.order.line_invoice:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "受領基準"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "仕入先参照"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -508,7 +513,7 @@ msgid ""
 "A Pick list generates a supplier invoice. Depending on the Invoicing control "
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
-msgstr ""
+msgstr "集荷リストは仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -519,85 +524,87 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"発注オーダーで発注オーダー行基準として請求書制御をセットした場合、ここから、まだ仕入先請求書を受領していないもののために全ての発注オーダー行を追跡できます"
+"。仕入先請求書を受領するための準備ができたら、このメニューから行基準のドラフト仕入先請求書を生成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
 msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
-msgstr ""
+msgstr "受領分析はチェックの簡易化のため、会社のオーダー受領と仕入先の配達の実績の分析を行うことができます。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "TEL："
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "パートナが指定されていません。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "FAX："
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "合計価格"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "仕入先の作成またはインポート"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "利用可能"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "住所宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "送付先住所："
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "発注オーダーの請求書生成"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -605,12 +612,12 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:111
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
@@ -619,12 +626,14 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"発注フォームからパートナを選択する必要があります。\n"
+"製品を選択する前にひとつのパートナをセットして下さい。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:349
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この会社のために定義された発注仕訳帳がありません：%s (id:%d)"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -633,11 +642,12 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御が集荷時の時には、請求書は自動的に作成されます。請求書は会計士によって、手動で作成することもできます（請求書制御を手動にする）。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "発注オーダー確認番号"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -646,82 +656,83 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"発注分析はチェックの簡易化と会社の発注履歴と実績の分析が可能です、このメニューから交渉の実績や仕入先の配信実績などを追跡することができます。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "選択仕入先は%s によりこの製品のみを売ります。"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "参照単位"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "予約宛先"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "受領"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "行を持たない発注オーダーは確認できません。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -731,276 +742,278 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"このメニューは仕入先から受け取る請求書の制御に使用します。OpenERPは設定に応じて発注オーダーまたは受領からドラフト請求書を事前に生成します。仕入先請"
+"求書を受け取ったなら、ドラフト請求書と突き合せて検証できます。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDIの価格リスト（%s）"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "承認待ち"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "発注オーダーの自動Eメール確認"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: report:purchase.order:0 view:purchase.order:0
 #: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0 view:stock.picking:0
 msgid "Order Date"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0 view:stock.picking:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "ドラフト請求書"
 
 #. module: purchase
 #: report:purchase.order:0 report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
 msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
-msgstr ""
+msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "今月のオーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "配達日数"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "製品の受領"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "調達"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: purchase
 #: field:purchase.config.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "画像"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "承認済発注オーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "見積依頼："
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "承認待ち発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "税抜合計"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "受信済"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "オーダー製品のリスト"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "これはこの発注のために生成された集荷リストです。"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "会計士によってレビューされます。"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税金："
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "請求済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "発注オーダーの状態"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "宛先住所"
 
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "オーダー状態"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "製品分類"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "発注オーダー基準のドラフト請求書の事前作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "カレンダービュー"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "選択した単位は製品単位と同じ分類に属していません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "発注オーダー：%s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1009,46 +1022,47 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"発注オーダーは購入者により確認されるとすぐに仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "非課税金額"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "これは請求書は既に支払われたことを意味しています。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr "請求するための出て行く製品"
+msgstr "請求するための出庫製品"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "違う製品のロットを割り当てることはできません。"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "このドキュメントの作成日"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "受注と発注"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1057,54 +1071,55 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御がオーダー時である場合は、請求書は自動的に作成されます。請求書は会計士により、手動で生成することもできます（請求書制御を手動）。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Eメールテンプレート"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "手動作成請求書"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "単位の分類"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "発注の請求書制御"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "リストビューで集約する複数のオーダーを選択して下さい。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1113,94 +1128,95 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"このフォームから仕入先と彼らの連絡先を作成またはインポートするか、インポートデータウィザードからCSVの表計算より既存パートナをインポートできます。"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "生成された集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "例外"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "計算"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "内部出荷可能"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "アドレス帳"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "発注オーダーのキャンセル"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "この発注オーダーはキャンセルできません。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "入庫製品を追跡するために集荷リストが作成されます。"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr ""
+msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "ダッシュボード"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "参照は会社ごとに固有でなければいけません。"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "製品の価値"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "税金額"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "見積"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -1210,37 +1226,40 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"発注オーダー行基準：請求書制御 > 発注基準の中で各独立した行を選択して請求書を作成\n"
+"生成請求書基準：ドラフト請求書を作成し後で検証\n"
+"受領基準：受領が確認された時に請求書を作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "分類別製品"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "検証日数"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "この発注オーダー要求を生成したドキュメントの参照"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "まだ発注オーダーは承認されていません。"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1252,80 +1271,83 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"発注オーダーまたは見積要求の状態。見積はドラフト状態の発注オーダーです。そして、オーダーがユーザにより確認されると状態は確認済に切り替わります。それから、"
+"仕入先は状態を承認済に変えるためにオーダーの確認が必要です。発注オーダーが支払われそして受け取った時に状態は完了になります。請求書や製品の到着でキャンセル"
+"アクションが発生すると、状態は例外になります。"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小計"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0 view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:289
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "発注オーダー %s は確認されました。"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "発注オーダーの承認日"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "承認済"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "一般情報"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "請求外"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: purchase
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0 selection:purchase.report,state:0
 #: view:stock.picking:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "見積依頼番号"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "請求のための確認済発注オーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1333,17 +1355,17 @@ msgstr ""
 #: view:purchase.order:0 view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "仕入先は発注オーダーを承認します。"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1353,99 +1375,99 @@ msgstr ""
 #: view:purchase.report:0
 #, python-format
 msgid "Purchase Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "基となるドキュメント"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "オーダーの集約"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "発注オーダー行は請求書を作成します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "内部出荷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "TEL ："
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "月順"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "発注オーダーの検索"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法をセット"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "日付要求"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0 field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "承認日"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "仕入先確認待ち"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "ドラフト請求書基準"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "配送と請求"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:772
@@ -1453,57 +1475,57 @@ msgstr ""
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
-msgstr ""
+msgstr "選択した仕入先の最小数量は %s %s に設定されています。それ未満の発注はできません。"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: field:purchase.order,product_id:0 view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0 view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "年順"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "予想配達住所："
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "受領分析"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "発注リードタイム"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1512,103 +1534,105 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"仕入先レコードにアクセスして、仕入先との良好な関係を維持して下さい。履歴タブから仕入先との全ての相互のやりとりを追跡できます：Eメール、オーダー、ミーティ"
+"ングなど"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "配達"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "発注オーダーは完了状態です。"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "製品単位"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "それでは、よろしくお願いいたします。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "待機中"
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "単位の参照"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "予約"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "請求なしの行を含む発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "請求のための集荷"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
-msgstr ""
+msgstr "このツールは仕入先請求書の制御に使いたい方法を選択するのに役立ちます。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-msgstr ""
+msgstr "この製品のための仕入先がないケースでは、買い手はフォームを手動で埋めて、確認をします。見積依頼は発注オーダー確認済となります。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "発注分析"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,minimum_planned_date:0
 #: report:purchase.quotation:0 field:purchase.report,expected_date:0
 #: view:stock.picking:0
 msgid "Expected Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA："
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -1616,22 +1640,22 @@ msgid ""
 "If you set the Invoicing Control on a purchase order as \"Based on "
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
-msgstr ""
+msgstr "発注オーダーの請求書制御で受領基準をセットした場合、全での製品受領をここで追跡し、それらの受領のために請求書を作成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "発注制御"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1648,47 +1672,57 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" 次のことに注意して下さい： \n"
+" \n"
+" 次の条件の時にのみオーダーは集約されます： \n"
+" ・ 発注オーダーがドラフトである。\n"
+" ・ 発注オーダーが同じ仕入先に属している\n"
+" ・ 発注オーダーが同じ在庫場所で同じ価格リストである\n"
+" \n"
+" 次の条件の時に行は集約されます：\n"
+" ・ オーダー行は製品の数量と単位以外は完全に同じである \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "発注標準価格"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "発注価格リスト"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "デフォルト発注価格リストバージョン"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "請求"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1701,44 +1735,48 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" ドラフト状態は、発注オーダーがドラフト状態の時に自動的にセットされます。\n"
+"確認済状態は、発注オーダーが確認状態の時に自動的にセットされます。\n"
+"完了状態は、発注オーダーが完了としてセットされると自動的にセットされます。\n"
+"キャンセル済状態は、、ユーザが発注オーダーをキャンセルすると自動的にセットされます。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "発注オーダー %s はキャンセルされます。"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合計"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
 #: code:addons/purchase/wizard/purchase_line_invoice.py:112
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この製品のために定義された費用勘定がありません：%s（ID：%d）"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "本当にこれらのオーダーを集約しますか？"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "発注オーダーから"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1747,6 +1785,8 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"発注フォームから価格リストまたは仕入先を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
 #: model:email.template,body_text:purchase.email_template_edi_purchase
@@ -1804,21 +1844,71 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''} 様、\n"
+"\n"
+"これは発注の確認です。 ${object.company_id.name}:\n"
+"       | オーダー番号： *${object.name}*\n"
+"       | オーダー合計： *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | オーダー日： ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | オーダーの参照： ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | あなた様の参照： ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | あなた様の連絡先： ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"オーダー確認を閲覧またはダウンロードできます。次のリンクをご利用ください。\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"もし、何かございましたら、ご遠慮なくお知らせ下さい。\n"
+"\n"
+"ありがとうございます。\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "マネジャ"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1828,56 +1918,56 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "今年のオーダー"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "発注管理"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "開いている受注オーダーの選択"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "オーダー"
 
 #. module: purchase
 #: help:purchase.order,name:0
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "発注オーダーが作成される時に発注オーダーの固有番号は自動的に計算されます。"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "発注ダッシュボード"
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 72f6e6eed2c..af958dd3bab 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:27+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-20 04:05+0000\n"
+"Last-Translator: Khulan Altangerel <khulancomp@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:40+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -43,12 +43,12 @@ msgstr "Хаана"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "Худалдан авах захиалгыг устгахын тулд эхлээд цуцлах хэрэгтэй!"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "Уг баримт бичгийг үүсгэсэн огноо"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
@@ -78,7 +78,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Баталсан худалдан авах захиалга"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -110,6 +110,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Энэ цэсийг хэрэглэж худалдан авах захиалгыг түүний дугаар, нийлүүлэгч,  "
+"бараа г.м зүйсээр хайж болно. Худалдан авах захиалга бүрийн хүлээн авсан "
+"бараа болон нийлүүлэгчийн нэхэмжлэлийг хянах боломжтой."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -239,17 +242,17 @@ msgstr "Өдөр"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Үүссэн ноорог нэхэмжлэл дээр тулгуурласан."
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "Өдрийн захиалга"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Сарын худалдан авалт ангиллаар"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -259,7 +262,7 @@ msgstr "Худалдан авалт"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Ноорог төлөвт байгаа худалдан авах захиалга"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -381,6 +384,8 @@ msgstr "Агуулахын хөдөлгөөн"
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Та эхлээд уг худалдан авах захиалгатай холбоотой бүх нэхэмжлэлүүдийг цуцлана "
+"уу."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -513,6 +518,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Бараа боловсруулах жагсаалтаас нийлүүлэгчийн нэхэмжлэл үүснэ. Худалдан авах "
+"захиалгын нэхэмжлэх аргаас хамаарч нэхэмжлэл нь хүлээн авсан эсвэл захиалсан "
+"тоо ширхэгийн дагуу үүснэ."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -527,7 +535,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Худалдан авах захиалга сондгой төлөвт байна."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 09e99bfcbdd..96981db1502 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,12 +8,9 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2" groups="product.group_purchase_pricelist">
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_product_pricelist_purchase" />
-                    </group>
-                </page>
+                <field name="property_product_pricelist" position="after">
+                    <field name="property_product_pricelist_purchase" />
+                </field>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 47ff616b548..775aebfaa8f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
 
         # - determine product_qty and date_planned based on seller info
         if not date_order:
-            date_order = fields.date.context_today(cr,uid,context=context)
+            date_order = fields.date.context_today(self,cr,uid,context=context)
 
         qty = qty or 1.0
         supplierinfo = False
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fffcbc7101b..0d39f9b7388 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -70,6 +70,7 @@
           parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
+        <field name="name">Based on Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,graph</field>
@@ -77,10 +78,14 @@
         <field name="domain">[('type','=','in_invoice')]</field>
         <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
         <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.</field>
+            <field name="help">
+                Use this menu to control the invoices to be received from your supplier.
+                OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
+                Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+            </field>
     </record>
 
-     <menuitem name="Based on draft invoices"
+     <menuitem name="Based on Draft Invoices"
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -128,14 +133,14 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_hi"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_hi"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
@@ -146,7 +151,7 @@
                     <h1>
                         <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
                         <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_form_inline" readonly="1"/>
+                        <field name="name" class="oe_inline" readonly="1"/>
                     </h1>
                     <group>
                         <group>
@@ -173,10 +178,10 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer">
+                            <group class="oe_subtotal_footer">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <div class="oe_clear"/>
@@ -194,7 +199,7 @@
                                 <group string="Invoice Control">
                                     <field name="invoice_method"/>
                                     <field name="fiscal_position" widget="selection"/>
-                                    <field name="invoiced"/>
+                                    <field name="invoiced" groups="base.group_no_one"/>
                                 </group>
                                 <group groups="base.group_no_one" string="Purchase Control">
                                     <field name="validator"/>
@@ -220,27 +225,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
                     <field name="name" string="Reference"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
+                    <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -253,27 +257,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"  help="Approved purchase orders"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -308,7 +311,15 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
+            <field name="help">
+                Create a request for quotation when you want to buy products from a supplier.
+                You can also use this menu to review requests for quotation created automatically
+                (based on logistic rules, like minimum stock, MTO, etc.)
+                &lt;p&gt;
+                Once confirmed, a request for quotation becomes a purchase order.
+                In the Purchase Settings, you can select the way to control supplier invoicing:
+                based on the order, based on receptions, or manual.
+            </field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
@@ -319,7 +330,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_approved': 1}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
@@ -333,16 +344,16 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                     <sheet>
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="product_id" class="oe_form_readonly_hidden"/>
+                        <label for="product_id" class="oe_edit_only"/>
                         <group>
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
                                 <label for="product_qty"/>
                                 <div>
-                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
-                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
                                 </div>
                                 <field name="price_unit"/>
                             </group>
@@ -395,40 +406,42 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
-                    <label for="order_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="order_id" class="oe_form_inline"/>, 
-                        <field name="date_order" class="oe_form_inline"/>
-                    </h1>
-                    <label for="partner_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="partner_id"/></h2>
-
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="product_id" readonly="1"/>
-                            <label for="product_qty"/>
-                            <div>
-                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
-                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
-                            </div>
-                            <field name="price_unit"/>
-                        </group>
-                        <group>
-                            <field name="date_planned" widget="date"  readonly="1"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <field name="taxes_id" widget="many2many_tags"
-                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-                            <field name="invoiced"/>
-                        </group>
-                    </group>
-                    <separator string="Manual Invoices"/>
-                    <field name="invoice_lines"/>
-                    <separator string="Notes"/>
-                    <field name="notes"/>
-                    <separator string="Stock Moves"/>
-                    <field name="move_ids"/>
+                	<sheet>
+	                    <label for="order_id" class="oe_edit_only"/>
+	                    <h1>
+	                        <field name="order_id" class="oe_inline"/>, 
+	                        <field name="date_order" class="oe_inline"/>
+	                    </h1>
+	                    <label for="partner_id" class="oe_edit_only"/>
+	                    <h2><field name="partner_id"/></h2>
+	
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="product_id" readonly="1"/>
+	                            <label for="product_qty"/>
+	                            <div>
+	                                <field name="product_qty" readonly="1" class="oe_inline"/>
+	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
+	                            </div>
+	                            <field name="price_unit"/>
+	                        </group>
+	                        <group>
+	                            <field name="date_planned" widget="date"  readonly="1"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+	                            <field name="taxes_id" widget="many2many_tags"
+	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+	                            <field name="invoiced"/>
+	                        </group>
+	                    </group>
+	                    <separator string="Manual Invoices"/>
+	                    <field name="invoice_lines"/>
+	                    <separator string="Notes"/>
+	                    <field name="notes"/>
+	                    <separator string="Stock Moves"/>
+	                    <field name="move_ids"/>
+	            	</sheet>
                 </form>
             </field>
         </record>
@@ -441,9 +454,9 @@
                     <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
-                        <field name="partner_id"  string="Supplier"/>
+                        <field name="partner_id" string="Supplier"/>
                     </group>
-                        <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -474,14 +487,18 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Based on Purchase Order lines</field>
+            <field name="name">Based on Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
-            <field name="help">If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
+            <field name="help">
+                Here you can track all the lines of purchase orders where the invoicing is "Based on Purchase Order Lines",
+                and for which you have not received a supplier invoice yet.
+                You can generate a draft supplier invoice based on the lines from this list.
+            </field>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2837b5e7ab6..4cf91053666 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,32 +53,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group>
-                <filter icon="terp-go-year" string="Year"
-                name="year"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                help="Order in current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Order in  current month"/>
-                <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Order in last month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        name="quotes"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-gtk-jump-to-rtl"
-                        string="Orders"
-                        name="orders"
-                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <separator orientation="vertical"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
+                <group>
+                    <filter icon="terp-document-new"
+                            string="Quotations"
+                            name="quotes"
+                            domain="[('state','=','draft')]"/>
+                    <filter icon="terp-gtk-jump-to-rtl"
+                            string="Orders"
+                            name="orders"
+                            domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index d4baa2d6099..c5e72db9f1a 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -32,7 +32,7 @@ class purchase_config_settings(osv.osv_memory):
             [('manual', 'Based on Purchase Order Lines'),
              ('picking', 'Based on Receptions'),
              ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'Invoicing Method', required=True, default_model='purchase.order'),
+            ], 'Default Invoicing Control Method', required=True, default_model='purchase.order'),
         'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
@@ -40,29 +40,26 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("Manage Different Units of Measure for Products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_purchase_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
+            implied_group='purchase.group_delivery_invoice_address',
+            help="Allows you to specify different delivery and invoice addresses on a purchase order."),
         'module_purchase_analytic_plans': fields.boolean('Use Multiple Analytic Accounts on Purchases',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
         'module_warning': fields.boolean("Alerts by Products or Supplier",
-            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier. 
+            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
-            help="""This allows you to define the following for a product:
-                    * Manufacturer
-                    * Manufacturer Product Name
-                    * Manufacturer Product Code
-                    * Product Attributes.
-                This installs the module product_manufacturer."""),
+
         'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Use Purchase Requisition",
-            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products. 
-            You can configure per product if you directly do a Request for Quotation 
+        'module_purchase_requisition': fields.boolean("Manage Purchase Requisitions",
+            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
+            You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
-        'decimal_precision': fields.integer('Decimal Precision on Price'),                
+        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
     }
 
     _defaults = {
@@ -84,10 +81,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
         'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
-            help="""This allows install module purchase_analytic_plans."""),                 
+            help="""This allows install module purchase_analytic_plans."""),
         'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
 
+    def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+        """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """
+        return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c45503faa36..1afd2d04a90 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,26 +8,27 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                    <group col="4">
-                        <separator string="Invoicing" colspan="4"/>
-                        <field name="default_invoice_method"/>
-                        <field name="decimal_precision"/>
-
-                        <separator string="Purchase Order" colspan="4"/>
-                        <field name="group_purchase_pricelist"/>
-                        <field name="group_uom"/>
-                        <field name="module_purchase_double_validation"/>
-                        <field name="module_purchase_requisition"/>
-                        <field name="module_warning"/>
-                        <field name="module_purchase_analytic_plans"/>
-
-                        <separator string="Products" colspan="4"/>
-                        <field name="module_product_manufacturer"/>
-                    </group>
+                        <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>
+                                <field name="module_purchase_double_validation"/>
+                                <field name="module_purchase_requisition"/>
+                                <field name="module_warning"/>
+                                <field name="module_purchase_analytic_plans"/>
+                            </group>
+                        </group>
                     </sheet>
                 </form>
             </field>
@@ -56,7 +57,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_purchases"/>
-                    <field name="module_purchase_analytic_plans"/>
+                    <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index d3033a37a70..26a4aa14f1c 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -14,6 +14,11 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="group_delivery_invoice_address" model="res.groups">
+        <field name="name">Addresses in Purchase Orders</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3abf56c9ec4..df6ba9531f3 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,22 +65,20 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <group col="8" colspan="4">
+                        <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available"
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                         <filter icon="terp-dialog-close" name="done" string="Received"
                             domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders"
                             domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>                    
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <separator orientation="vertical"/>
@@ -100,7 +98,7 @@
         </record>
  
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Bases on incoming shipments</field>
+            <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -108,7 +106,11 @@
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
-            <field name="help">If you set the Invoicing Control on a purchase order as "Bases on incoming shipments", you can track here all the product receptions and create invoices for those receptions.</field>
+            <field name="help">
+                Here you can track all the product receptions of purchase orders where the invoicing is "Based on Incoming Shipments",
+                and for which you have not received a supplier invoice yet.
+                You can generate a supplier invoice based on those receptions.
+            </field>
        </record>
 
         <menuitem action="action_picking_tree4_picking_to_invoice"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 9bf03474e86..cff984c473f 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Double Validation Limit',required=True,
+        'limit_amount': fields.integer('Limit to Require a Second Approval',required=True,
             help="Amount after which validation of purchase is required."),
     }
 
diff --git a/addons/purchase_requisition/i18n/ja.po b/addons/purchase_requisition/i18n/ja.po
new file mode 100644
index 00000000000..ea9c2804e7a
--- /dev/null
+++ b/addons/purchase_requisition/i18n/ja.po
@@ -0,0 +1,448 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 21: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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "No Product in Tender"
+msgstr "申し出に製品がありません。"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "要求書"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "見積の作成"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "交渉での発注要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "仕入先"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "製品詳細"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "要求日"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: model:ir.module.category,name:purchase_requisition.module_category_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "発注要求書"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "発注要求書行"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "見積"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr "このボックスをチェックすると、要求書は直接の見積要求の代わりに発注要求書を生成します。"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "見積要求"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "複数の要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "製品単位"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "仕入先による承認"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "ドラフトに再設定"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Current Purchase Requisition"
+msgstr "現在の発注要求書"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "住所"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"発注要求書は見積依頼の前段階です。発注要求書では（または発注申し出）、購入が必要な製品を記録し、仕入先に見積依頼の作成のきっかけとなります。交渉の後、全仕"
+"入先の申し出をレビューし、幾つかを検証して、他をキャンセルします。"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "未割当の要求書"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "発注要求書"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr "このパートナに既に %s の発注オーダーを持っています、新しい見積を作成するためにはこの発注オーダーをキャンセルする必要があります。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "要求書の参照"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "発注する製品"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "要求書の締切"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "発注要求書の検索"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"発注要求書（排他）：発注オーダーの確認により、残りの発注オーダーをキャンセルします。\n"
+"発注要求書（複数）：複数の発注オーダーを持つことができます。発注オーダーの確認をしても、残りのオーダーはキャンセルされません。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "発注オーダーのキャンセル"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "要求書タイプ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "新規発注要求書"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "製品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "オーダー日"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "］"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "［"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "発注要求書パートナ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start"
+msgstr "開始"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "見積詳細"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "要求書のための発注"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "起点"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "調達"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "最終要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "発注要求書（排他）"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "発注オーダーの確認"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "未割当"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "発注オーダー"
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index dc13be5b1ec..9aa8265628b 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -41,10 +41,10 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <label for="name" class="oe_form_readonly_hidden"/>
+                <label for="name" class="oe_edit_only"/>
                 <h1>
-                    <field name="name" class="oe_form_inline"/>, 
-                    <field name="origin" class="oe_form_inline"/>
+                    <field name="name" class="oe_inline"/>, 
+                    <field name="origin" class="oe_inline"/>
                 </h1>
                 <group>
                     <group>
@@ -124,13 +124,13 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group>
+                    <field name="name" string="Purchase Requisition"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>
diff --git a/addons/report_designer/i18n/ja.po b/addons/report_designer/i18n/ja.po
new file mode 100644
index 00000000000..786dc32fc5d
--- /dev/null
+++ b/addons/report_designer/i18n/ja.po
@@ -0,0 +1,103 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-06-15 22: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-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
+msgid "Reporting Tools Configuration"
+msgstr "レポートツールの設定"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "クエリビルダー"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "設定"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr ""
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "OpenOfficeレポートデザイナ"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "レポートツール"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid ""
+"OpenERP's built-in reporting abilities can be improved even further with "
+"some of the following applications"
+msgstr "OpenERPの組み込みレポートの能力は次のアプリケーションの幾つかの機能をさらに改良します。"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "レポートツールの設定"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr "幾つかのオブジェクト上に任意の統計レポートを作成できます。それはエンドユーザのためのSQLクエリービルダーとブラウザです。"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid ""
+"Adds wizards to Import/Export .SXW report which you can modify in "
+"OpenOffice.Once you have modified it you can upload the report using the "
+"same wizard."
+msgstr ""
+".SXWレポートのインポート / "
+"エクスポートするためのウィザードを追加します。これはOpenOfficeの変更を行うことができます。これを変更した後、同じウィザードを使ってレポートをアッ"
+"プロードできます。"
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"レポートツールを選択するためのインストーラ\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "設定の進行状況"
diff --git a/addons/report_intrastat/i18n/ja.po b/addons/report_intrastat/i18n/ja.po
new file mode 100644
index 00000000000..1012c122c8a
--- /dev/null
+++ b/addons/report_intrastat/i18n/ja.po
@@ -0,0 +1,343 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-15 23:02+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: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Cancelled Invoice"
+msgstr "キャンセル済請求書"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr "国の名前は固有であるべきです。"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr "国のコードは固有でなければなりません。"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Disc. (%)"
+msgstr "割引（%）"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Invoice"
+msgstr "仕入先請求書"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: report_intrastat
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr "エラー：デフォルトの単位と発注単位は同じ分類でなければいけません。"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Import"
+msgstr "インポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "VAT :"
+msgstr "消費税："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "PRO-FORMA"
+msgstr "プロフォーマ"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes:"
+msgstr "税金："
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: report_intrastat
+#: field:report.intrastat,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: report_intrastat
+#: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
+msgid "Invoice Intrastat"
+msgstr "州内の請求書"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Base"
+msgstr "基本"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Year"
+msgstr "今年"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat_code
+#: field:product.template,intrastat_id:0
+#: field:report.intrastat,intrastat_id:0
+#: view:report.intrastat.code:0
+msgid "Intrastat code"
+msgstr "州内コード"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Partner Ref."
+msgstr "パートナの参照"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (inclu. taxes):"
+msgstr "合計（税込）"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat
+msgid "Intrastat report"
+msgstr "州内レポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_res_country
+msgid "Country"
+msgstr "国"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "Intrastat Data"
+msgstr "州内データ"
+
+#. module: report_intrastat
+#: field:report.intrastat,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
+msgid "Intrastat"
+msgstr "州内"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Draft Invoice"
+msgstr "ドラフト請求書"
+
+#. module: report_intrastat
+#: field:report.intrastat,supply_units:0
+msgid "Supply Units"
+msgstr "供給単位"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Refund"
+msgstr "返金"
+
+#. module: report_intrastat
+#: field:report.intrastat,ref:0
+msgid "Source document"
+msgstr "元となるドキュメント"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fiscal Position Remark :"
+msgstr "会計ポジションの注釈："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat,weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_product_template
+msgid "Product Template"
+msgstr "製品テンプレート"
+
+#. module: report_intrastat
+#: field:res.country,intrastat:0
+msgid "Intrastat member"
+msgstr "州内メンバー"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tax"
+msgstr "税金"
+
+#. module: report_intrastat
+#: field:report.intrastat,code:0
+msgid "Country code"
+msgstr "国コード"
+
+#. module: report_intrastat
+#: field:report.intrastat,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: report_intrastat
+#: field:report.intrastat,currency_id:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Export"
+msgstr "エクスポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: report_intrastat
+#: field:report.intrastat,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Refund"
+msgstr "仕入先返金"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (excl. taxes):"
+msgstr "合計（税抜）："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Price"
+msgstr "価格"
+
+#. module: report_intrastat
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
+#: field:report.intrastat.code,name:0
+msgid "Intrastat Code"
+msgstr "州内コード"
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 3bb1b4db994..0df7182c8c0 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -7,120 +7,121 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-23 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-06-21 15:07+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-02-09 06:27+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Avbrutna fakturor"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Namnet på landet måste vara unikt !"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Landskoden måste vara unik !"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Rabatt (%)"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Leverantörsfaktura"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Styckpris"
 
 #. module: report_intrastat
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fel: Standardmåttenheten och inköpsmåttenheten måste tillhöra samma kategori."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr ""
+msgstr "Importera"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "Moms:"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Skatter:"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Faktura Intrastat"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -130,17 +131,17 @@ msgstr ""
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -148,115 +149,115 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Intrastatkod"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Month"
-msgstr ""
+msgstr "Denna månad"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Partner Ref."
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totalt (inkl. skatter)"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Intrastatrapport"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Skatter"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Summa"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Intrastat Data"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Värde"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Preliminär faktura"
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Enheter"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Återbetalning"
 
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -267,79 +268,79 @@ msgstr ""
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Vikt"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktmall"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Intrastatmedlem"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Skatt"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Landskod"
 
 #. module: report_intrastat
 #: field:report.intrastat,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Exportera"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Återbetalning till leverantör"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totalt (exkl. skatt)"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Intrastatkod"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -348,3 +349,13 @@ msgstr ""
 
 #~ msgid "Intrastat Reporting - Reporting"
 #~ msgstr "Intrastat Reporting - Reporting"
+
+#~ msgid ""
+#~ "\n"
+#~ "    A module that adds intrastat reports.\n"
+#~ "    This module gives the details of the goods traded between the countries "
+#~ "of European Union "
+#~ msgstr ""
+#~ "\n"
+#~ "    En modul som lägger till intrastatrapporter.\n"
+#~ "    Denna modul visar vilka varor som handlats mellan EUländer. "
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index b069fd159ee..c481296196c 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,13 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
                         <field name="intrastat_id"/>
+                        <field name="month"/>
                         <field name="type"/>
                     </group>
                 </search>
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
new file mode 100644
index 00000000000..ab5c9eb0fb6
--- /dev/null
+++ b/addons/report_webkit/i18n/ja.po
@@ -0,0 +1,558 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 00:51+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: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "WebKitテンプレート（レポートファイルが見つからない時に使用）"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr "タブロイド 29 279.4 x 431.8 mm"
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "WebKit実行可能ファイルのパス"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr "レジャー 28 431.8 x 279.4 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:223
+#, python-format
+msgid "No header defined for this Webkit report!"
+msgstr "WebKit"
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "画像タイプ（png、gif、jpeg）"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,precise_mode:0
+msgid ""
+"This mode allow more precise element                                         "
+"                    position as each object is printed on a separate HTML.   "
+"                                                         but memory and disk "
+"usage is wider"
+msgstr ""
+"このモジュールは別個のHTMLに印刷される各オブジェクトをより正確な位置づけを可能にします。しかし、メモリとディスクの使用量が大きくなります。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr "エグゼクティブ 4 7.5 x 10 inches, 190.5 x 254 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:100
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "Wkhtmltopdfへのパスが絶対パスではありません。"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Company and Page Setup"
+msgstr "会社とページの設定"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:252
+#: code:addons/report_webkit/webkit_report.py:263
+#: code:addons/report_webkit/webkit_report.py:272
+#: code:addons/report_webkit/webkit_report.py:285
+#: code:addons/report_webkit/webkit_report.py:296
+#, python-format
+msgid "Webkit render"
+msgstr "WebKit描画"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "ヘッダー"
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "画像の名前"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:94
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"会社に設定されたWkhtmltopdfへのパスが間違っています。'+\n"
+"                                '指定されたパスは実行可能でないか、間違っています。"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:167
+#, python-format
+msgid "Webkit raise an error"
+msgstr "WebKitはエラーを起こしました。"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Webkit Headers/Footers"
+msgstr "WebKitヘッダー / フッター"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "リーガル 3 8.5 x 14 inches, 215.9 x 355.6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 インチ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:82
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company "
+"form.'+\n"
+"                             'Minimal version is 0.9.9"
+msgstr ""
+"実行可能ファイルをシステムにインストールして下さい。'+\n"
+"                             ' (sudo apt-get install "
+"wkhtmltopdf)、または、ここからダウンロードして下さい：'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list そして、'+\n"
+"                             ' 会社フォームの実行可能ファイルへのパスをセットして下さい。'+\n"
+"                             '最低バージョンは 0.9.9 です。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,precise_mode:0
+msgid "Precise Mode"
+msgstr "正確さモード"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:137
+#, python-format
+msgid "Client Actions Connections"
+msgstr "顧客アクションの連結"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "利用可能画像"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "WebKitヘッダー"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "ヘッダーをレポートにリンクしました。"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:81
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr "Wkhtmltopdfライブラリパスが会社にセットされていません。"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "WebKit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "適切な用紙サイズを選択します。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr "このテンプレートはメインレポートファイルが見つからないときに使用されます。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "上部余白（mm）"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:224
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "会社設定の中にヘッダーをセットして下さい。"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "OK"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr "対応するドキュメントタイプのサイドバーの中にこのレポートのための印刷アクションを加えためには、これをチェックします。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "Webkit Header"
+msgstr "WebKitヘッダー"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "WebKitエンジンデバッガを有効化"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "画像"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "HTML使用可能"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr "それを作成した後で（技術的なビュー）内部の印刷アクションを新しくビューに追加するためには、これをチェックします。 "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "画像"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "縦向き"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "横向き"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "印刷ボタンの追加"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Footer"
+msgstr "フッター"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "下部余白（mm）"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "WebKitアクション"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "追加アクションを開く"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "右余白（mm）"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "向き"
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid ""
+"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+"Install a static version of the library if you experience missing "
+"header/footers on Linux."
+msgstr ""
+"wkhtmltopdf 実行可能ファイルへのフルパス。バージョン 0.9.9 が必須です。Linuxでヘッダー / "
+"フッターの欠落を経験するなら、ライブラリは静的なバージョンをインストールします。"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "WebKitレポートヘッダーのセット"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "用紙サイズ"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Header"
+msgstr "ヘッダー"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "CSS Style"
+msgstr "CSSスタイル"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "ヘッダーCSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Webkit Logos"
+msgstr "WebKitロゴ"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "WebKitテンプレート"
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "WebKitフッター"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "WebKitデバッグ"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "レター 2 8.5 x 11 インチ, 215.9 x 279.4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr ""
+
+#. module: report_webkit
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "印刷ボタンの追加"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "WebKitレポートテンプレートが見つかりません。"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "左余白（mm）"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "WebKitレポートフッターの設定"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index 1d60f6a873d..fed94c92d70 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="base.act_report_xml_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Security']" position="before" >
+                <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
                         <field name="webkit_header"/>
                         <field name="webkit_debug"/>
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 4d0bd6295c6..04980695f8f 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -51,7 +51,7 @@ import tools
 from tools.translate import _
 from osv.osv import except_osv
 
-logger = logging.getLogger('report_webkit')
+_logger = logging.getLogger(__name__)
 
 def mako_template(text):
     """Build a Mako template.
@@ -248,7 +248,7 @@ class WebKitParser(report_sxw):
                     htmls.append(html)
                 except Exception, e:
                     msg = exceptions.text_error_template().render()
-                    logger.error(msg)
+                    _logger.error(msg)
                     raise except_osv(_('Webkit render'), msg)
         else:
             try :
@@ -259,7 +259,7 @@ class WebKitParser(report_sxw):
                 htmls.append(html)
             except Exception, e:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
         head_mako_tpl = mako_template(header)
         try :
@@ -281,7 +281,7 @@ class WebKitParser(report_sxw):
                                             **self.parser_instance.localcontext)
             except:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
         if report_xml.webkit_debug :
             try :
@@ -292,7 +292,7 @@ class WebKitParser(report_sxw):
                                            **self.parser_instance.localcontext)
             except Exception, e:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
             return (deb, 'html')
         bin = self.get_lib(cursor, uid)
diff --git a/addons/report_webkit_sample/i18n/ja.po b/addons/report_webkit_sample/i18n/ja.po
new file mode 100644
index 00000000000..9d1d8fa1813
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/ja.po
@@ -0,0 +1,123 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-15 23:12+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: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+msgid "Refund"
+msgstr "返金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+msgid "Fax"
+msgstr "FAX"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+msgid "Tel"
+msgstr "電話"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Description"
+msgstr "説明"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+msgid "Supplier Invoice"
+msgstr "仕入先請求書"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "WebKit請求書"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Price"
+msgstr "価格"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Taxes"
+msgstr "税金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "QTY"
+msgstr "数量"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Amount"
+msgstr "金額"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Base"
+msgstr "基本"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+msgid "Supplier Refund"
+msgstr "仕入先返金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Partner Ref."
+msgstr "パートナの参照"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+msgid "VAT"
+msgstr "消費税"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+msgid "Total"
+msgstr "合計"
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
new file mode 100644
index 00000000000..52af13290d6
--- /dev/null
+++ b/addons/resource/i18n/ja.po
@@ -0,0 +1,354 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 02:00+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: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr "空の場合、これは会社の一般的な休日です。リソースがセットされている場合、休日 / 休暇はこのリソースのためだけです。"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "材料"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "リソースタイプ"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "休暇の詳細"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "休暇リソース"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Time"
+msgstr "作業時間"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "木曜"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "日曜"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "リソースの検索"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "リソース"
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Make sure the Working time has been configured with proper week days!"
+msgstr "作業時間に適切な曜日が設定されていることを確認して下さい。"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup Manager"
+msgstr "作業グループマネジャ"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "作業開始時間"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "リソースカレンダー」"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "金曜"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of Week"
+msgstr "曜日"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "作業終了時間"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "開始日"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "作業時間の検索"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "理由"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "日付"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "作業期間休暇の検索"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency Factor"
+msgstr "効率性の因子"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "閉鎖日数"
+
+#. module: resource
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "水曜"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Period"
+msgstr "作業期間"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "リソースの詳細"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr "アクティブ項目をFalse にセットすると、リソースレコードは削除することなく非表示にできます。"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "リソースカレンダー"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "作業開始時間"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
+msgid ""
+"Define working hours and time table that could be scheduled to your project "
+"members"
+msgstr "プロジェクトメンバーにスケジュールする作業時間数とタイムテーブルを定義します。"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "そのアクセスを管理するためのリソースに関連するユーザ名"
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "リソースのスケジュールを定義します。"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Starting Date of Leave"
+msgstr "休暇開始日"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "月曜"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "作業終了時間"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+"この項目は完了したタスクに対するリソースの効率を表します。例えば、リソースを彼に5つのタスクで5日の期間を単独で置いた場合、デフォルトによればその期間は1"
+"00％の負荷であることを表します。しかし、200％の効率を置く場合、彼の負荷はわずか50％になります。"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "火曜日"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "作業時間"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr "休暇リソース"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+"リソースは特定のプロジェクトフェーズに関与すべきリソースの作成と管理ができます。それらの効率レベルと週間作業時間を基本とする作業負荷を設定できます。"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "非アクティブ"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "（休暇）"
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Configuration Error!"
+msgstr "設定エラー"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "人間"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "作業詳細"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: resource
+#: code:addons/resource/resource.py:310
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "土曜"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index bf8ab3c11e9..20c1251c771 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,12 +11,13 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group>
+                       <field name="name" string="Resource"/>
+                       <separator orientation="vertical"/>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="user_id" string="User"/>
-                       <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -39,7 +40,8 @@
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <group>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Working Time"/>
+                       <separator orientation="vertical"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -55,6 +57,7 @@
                 <search string="Search Working Period Leaves">
                    <group>
                        <field name="name" string="Reason"/>
+                       <separator orientation="vertical"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>
@@ -77,12 +80,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="manager"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <field name="attendance_ids"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -220,6 +225,7 @@
             <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)"/>
@@ -234,6 +240,7 @@
                            <field name="date_to"/>
                        </group>
                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index b0d14ba2971..c989beba2d4 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Sale user dashboard -->
+        <!-- Sales dashboard -->
         <record id="action_quotation_for_sale" model="ir.actions.act_window">
             <field name="name">My Quotations</field>
             <field name="res_model">sale.order</field>
@@ -15,7 +15,6 @@
             <field name="name">turnover.by.month.tree</field>
             <field name="model">account.invoice.report</field>
             <field name="type">tree</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
             <field name="priority" eval="32"/>
             <field name="arch" type="xml">
                 <tree string="Monthly Turnover">
@@ -27,16 +26,16 @@
         <record id="view_turnover_by_month_graph" model="ir.ui.view">
             <field name="name">turnover.by.month.graph</field>
             <field name="model">account.invoice.report</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
             <field name="priority" eval="32"/>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-            <graph string="Monthly Turnover" type="bar">
-                <field name="month"/>
-                <field name="price_total" operator="+"/>
-            </graph>
+                <graph string="Monthly Turnover" type="bar">
+                    <field name="month"/>
+                    <field name="price_total" operator="+"/>
+                </graph>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_turnover_by_month">
             <field name="name">Monthly Turnover</field>
             <field name="res_model">account.invoice.report</field>
@@ -45,17 +44,6 @@
             <field name="view_id" ref="view_turnover_by_month_graph"/>
             <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
             <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
-       </record>
-       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_turnover_by_month_graph"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_turnover_by_month_tree"/>
         </record>
 
         <record id="board_sales_form" model="ir.ui.view">
@@ -75,6 +63,7 @@
                 </form>
             </field>
         </record>
+
         <record id="open_board_sales" model="ir.actions.act_window">
             <field name="name">Sales</field>
             <field name="res_model">board.board</field>
@@ -82,37 +71,12 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_form"/>
         </record>
-        
-        <menuitem id="menu_dashboard_sales" name="Sales"  sequence="20" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_sales" icon="terp-graph" groups="base.group_sale_salesman"  id="menu_board_sales" parent="menu_dashboard_sales" sequence="1"/>
 
-        <!-- Sale manager dashboard -->
-        <record id="board_sales_manager_form" model="ir.ui.view">
-            <field name="name">board.sales.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard" layout="manual" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
-                            <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
-                        </column>
-                        <column>
-                            <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
-                            <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
-                            <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-        <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Manager</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_sales_manager_form"/>
-        </record>
+        <menuitem id="menu_dashboard_sales"
+                  sequence="15"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_sales"
+                  groups="base.group_sale_salesman"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
new file mode 100644
index 00000000000..544067347e4
--- /dev/null
+++ b/addons/sale/i18n/ja.po
@@ -0,0 +1,2285 @@
+# 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-19 22:22+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-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr "勤務表を基本"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr "受注オーダー行は確認済、完了、または例外状態であり、まだ請求されていません。"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "過去90日間の販売員による販売"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "全てを一度に配達するための十分な在庫を持っていない場合、部分的な出荷を認めますか？"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "販売単位"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "現在の受注オーダーの送付先住所"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "オーダーのキャンセル"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "見積 %s は受注オーダーに変換されました。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr "見積の印刷"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "消費税"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "全ての受注オーダー行のために調達オーダーを駆動します。"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"これは請求される各受注オーダー行のリストです。受注オーダー行の単位で部分的な受注オーダーの請求ができます。配達オーダーから請求する場合、または、受注合計で"
+"請求する場合は、このリストは必要ではありません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+"確認済受注オーダーを削除するためには、先に次のものをキャンセルする必要があります。受注オーダーのキャンセルのためには、最初に関連する集荷あるいは配達オーダ"
+"ーをキャンセルせねばなりません。"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "調達オーダー"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "配達基準の請求書"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "オーダー行"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"受注オーダーは顧客からの見積とオーダーの管理と助けます。OpenERPは見積の作成から開始することを提案します。それが確認されると見積は受注オーダーに変換"
+"されます。受注オーダーはタスク、配達オーダー、製造オーダー、発注などを引き起こすようにOpenERPは製品の幾つかのタイプを取り扱うことができます。受注オ"
+"ーダーの設定を基本として、ドラフト請求書は顧客に請求したい時に、確認しなければならないように作成されます。"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"受注オーダーは請求書案（ドラフト請求書）を自動的に作成します。オーダーされたものと、配達された数量は同じでは無いかもしれません。あなたはオーダー基準または"
+"出荷数量基準のどちらで請求するのかを決める必要があります。製品がサービスである場合は、出荷数量は関連したタスクに費やされた時間を意味します。"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "デフォルト支払条件"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr "配達オーダー基準"
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr "主作業時間単位"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "状態"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "私の受注オーダー"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "注文数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "販売員による受注"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "在庫移動"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "その他情報"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr "出荷方針が集荷時に請求または配達後に請求の場合は、請求書は自動的に作成されます。"
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr "タスク作業基準"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr "見積と受注"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "受注による請求書作成"
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "価格リストの警告。"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "私の見積"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "受注管理ダッシュボード"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "梱包"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "受注オーダーから"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "店名"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+"請求方針は請求書と配達処理を同期するために使用されます。\n"
+"  ・ \"配達前の支払\"の選択は、最初に請求書を生成し、そしてこの請求書の支払後に集荷オーダーを生成します。\n"
+"  ・ "
+"\"オンデマンドで配達と請求\"は、直接集荷オーダーを作成し、そしてユーザが受注オーダーまたは受注オーダー行基準のドラフト請求書を生成するための請求書ボタ"
+"ンを手動でクリックするのを待ちます。\n"
+"  ・ \"配達後請求\"の選択は、全ての集荷リストが終了した後に受注オーダー基準のドラフト請求書を生成します。\n"
+"  ・ \"配達基準の請求\"の選択は、集荷処理の途中で請求書を作成する時に使用されます。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "顧客が定義されていません。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "例外の受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr "設定エラーです。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "条件"
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr "製品分類のためのデフォルト属性の中に収入分類のアカウントが無いか、または会計ポジションが定義されていません。"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "違う製品のロットを割り当てることはできません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "テスト状態では不正なモード"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "この受注オーダーのキャンセルはできません。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "受注オーダーの統計値"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "受注オーダーに関連した分析アカウント"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr "見積"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "現在の受注オーダーのための価格リスト"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "オーダー確認から顧客に製品の出荷がなされるまでの日数"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "見積日"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "会計ポジション"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "単位"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "パッケージ数"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "受注オーダー行は既に請求済であるためキャンセルできません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr "（利用不可）"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr "先進製品と呼ばれるサービスタイプを選択すると、それを作成し、そしてこの項目にデフォルト値としてセットする必要があります。"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr "配達後の自動請求として定義された受注オーダーを前もって作ることはできません。"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "現在の受注オーダーのための請求書住所"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "受注オーダーのオーダー月"
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "利用可能になった時に各製品を配達"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "請求済"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "配達オーダー"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "確認日"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "インコターム"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "割当パートナ"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr "受注オーダー基準"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "合計金額"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "請求書住所："
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr "行順序"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"インコタームは国際商業規則（International Commercial terms）の略で、商業取引で使用される販売条件のシリーズを表します。"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "請求書住所"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "未請求行の検索"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "見積 / オーダー"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "行数"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "受注中の請求書"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "オーダー番号"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "オーダー行"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "税抜金額"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "請求書の行"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "数量"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr "その他"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未請求かつ配達済行"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "私の受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "無効なアクションです。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "価格リスト"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "数量の数"
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr "時"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "オーダー日"
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "出荷済"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "全見積"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "行が無い受注オーダーの確認はできません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "製品分類"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "税金："
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "在庫移動"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "オーダー状態"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "本当に請求書を作成しますか？"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "月別受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "受注行はキャンセルできません。"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "安全日数"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "受注済材料の調達"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "最終請求書の作成"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "送付先住所"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr "これは受注オーダーが配達されたことを示します。この項目はスケジューラが起動された後にのみ更新されます。"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "日付"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "例外"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+"見積または受注オーダーの状態を示します。 \n"
+"請求書の検証（請求書の例外）、または集荷リスト状態（出荷例外）でキャンセル操作が発生すると、例外状態が自動的にセットされます。 \n"
+"請求書が確認され、しかしオーダー日に実行されるスケジュールを待っている時は、スケジュール待ち状態にセットされます。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "適切な価格リスト行が見つかりません："
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "履歴"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr "配達後のオーダーの請求書"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr "これは、この受注オーダーのために生成された請求書のリストです。同じ受注オーダーは何回も請求されるかもしれません（例えば、行毎に）。"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "あなたの参照"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr "オーダーや見積は連絡先の名前と住所を要求します。"
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "これは安全目的のために顧客に約束するために加える日数です。"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "参照"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "私の受注オーダー行"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "請求書作成"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "税抜合計"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "オーダー参照"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "請求書は正常に作成されました。"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "パートナ別受注"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "オーダー連絡先"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "請求書を開く"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr "受注オーダーの自動Eメール確認"
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr "この会社に定義された受注仕訳帳がありません：%s（ID：%d）"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "強制割当"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "オーダー中"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "出荷またはオーダー数量基準"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "全ての製品を一緒に配達"
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "関連する集荷"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "送付先住所："
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "最新90日間の顧客別受注"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "受注オーダーのドラフト状態"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "配達オーダーの作成"
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr "受注オーダー行の状態は %s であるため、削除できません。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr "販売単位"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "税込合計"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "集荷リストの作成"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "受注オーダーのオーダー日"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "製品分類別受注"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "見積の確認"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "請求書再作成"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "請求書の配達"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "スケジュール待ち"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "調達方法"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "集荷リスト"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "製造品へのあるいは顧客への移動のドキュメント"
+
+#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+"\n"
+"${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name "
+"or ''} 様、\n"
+"\n"
+"これは、お客様のご注文の確認です。 ${object.partner_id.name}：\n"
+"       | ご注文番号： *${object.name}*\n"
+"       | ご注文合計： *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | ご注文日： ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | ご注文の詳細： ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | お客様： ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | お客様の連絡先： ${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"次のリンクから、ご注文のご確認、ダウンロード、また、オンラインでのお支払いが可能です。\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account：\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"直接 Paypal を使ってお支払いいただくこともできます。\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"何かご質問等がございましたら、ご遠慮なくお問い合わせ下さい。\n"
+"\n"
+"\n"
+"弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "検証"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "オーダーの確認"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "調達オーダーの作成"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "請求準備のできた受注オーダー"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "受注オーダーの作成日"
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "在庫移動"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr "今月作成された受注オーダー"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"もし、オーダー時であれば、受注オーダーがタスクを作成するために確認された時、この受注オーダー行とリンクした発注オーダーまたは製造オーダーを調達するきっかけ"
+"となります。"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "前払金額"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr "配達に課金しますか？"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "出荷数量"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "受注オーダー基準の請求書"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr "このオーダーの価格リストを変更した場合（通貨であっても）、既存オーダー行の価格は更新されません。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "受注オーダーはキャンセルできませんでした。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr "単位数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "受注オーダーのオーダー年"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "調達"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "出荷例外"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr "集荷情報： "
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "請求書のグループ化"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr "請求方針"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr "請求方法のセットアップ"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "会計士によってレビューされます。"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr "単位の参照"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr "このツールは、顧客に請求するために使用する方法にしたがって、正しいモジュールのインストールとシステムを設定するのに役立ちます。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "受注オーダー行の請求書を作成"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "請求書の例外"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "調達と請求を実施"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "支払済"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr "受注分析"
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"あなたの選択した数量は %d です。\n"
+"しかし、それは選択した梱包と互換性がありません。\n"
+"これは、梱包による数量の提案です：\n"
+"EAN：%s　数量：%s　単位のタイプ：%s"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "梱包の再作成"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "属性"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "見積"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"受注オーダーの出荷方針が出荷は手動進行中の場合、販売員は請求書を手動で作成します。出荷方針が配達前に支払の場合、請求書は自動的に作成されます。"
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "受注オーダー基準、または出荷基準の請求書を生成します。"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "未配達の確認済受注オーダー行"
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr "顧客請求書"
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "受注"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"受注フォームの顧客を選択する必要があります。\n"
+"製品を選択する前に１顧客をセットして下さい。"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "元となるドキュメント"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "集荷方針"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "顧客への移動のドキュメント"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "税抜金額"
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "最初にこの受注オーダーに結び付けられた全集荷をキャンセルする必要があります。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "受注前払請求書"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "割当のキャンセル"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "月次売上高"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "請求対象"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "製品販売単位"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手動進行中"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "製品単位"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "物流"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "順番"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr "この製品のために定義された損益勘定がありません：%s（ID：%d）"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "例外を無視"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"受注オーダーの請求制御によって、請求書は配達、または受注数量基準とすることが可能です。したがって、受注オーダーは販売員によりそれが確認されるとすぐに、請求"
+"書、または配達オーダーを生成します。"
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"受注の計画量は %.2f %s。しかし %.2f %s のみ利用可能です。\n"
+"実在庫は %.2f %s です（予約を除く）。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "状態"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "顧客参照"
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "合計"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "価格"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr "製造品場所の設定によって、製造領域と顧客の間の移動は、手動または自動的な配達オーダーを通して実施されます。"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr "配達前支払"
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr "受注ダッシュボード"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr "請求対象"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "受注オーダー確認日"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "契約 / 分析アカウント"
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "事前に請求される金額"
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+"この製品と数量に一致する価格リスト行を見つけることができません。\n"
+"製品、数量、価格リストの何れかを変更する必要があります。"
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr "この集荷リストはこの受注オーダーによって生成されました。"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "合計："
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "私の受注オーダーと関係する受注オーダー行"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "店"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "確認日"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "月別受注"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "販売単位の数量"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "完了状態の受注オーダー行"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"受注オーダーが確認されると同時に調達オーダーとしてすぐに、集荷リストフォームが作成されます。これは受注オーダー部品の割り当てを表しています。受注オーダー行"
+"による１つの集荷リストは部品の入手可能性とともに展開します。"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "確認済"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr "基本とする主な方法"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "最新90日間の製品分類別受注"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "請求書行"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "受注オーダー行"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "配達リードタイム"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDIの価格リスト（%s）"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr "印刷順序"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr "今年作成された受注オーダー"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"請求書は次の何れかの理由により、この受注オーダー行のために作成されません。\n"
+"1. この受注オーダー行の状態はドラフトまたはキャンセルの何れかである。\n"
+"2. 受注オーダー行は請求されている。"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "受注オーダー行の完了"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "請求書"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"調達オーダーは、受注オーダーが確認された、または請求書が支払われた時に自動的に作成されます。それは支払と製品の製造のルールと受注オーダーのパラメータに関し"
+"て制御します。 "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "未請求"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "販売員"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "古い見積"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "非課税金額"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "前払請求書"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "受注オーダー %s はキャンセルされました。"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"・ ドラフト状態は、関連する受注オーダーがドラフト状態の時にセットされます。\n"
+"・ 確認済状態は、関連する受注オーダーが確認された時にセットされます。\n"
+"・ 例外状態は、関連する受注オーダーが例外度してセットされた時にセットされます。\n"
+"・ 完了状態は、受注オーダー行が集荷された時にセットされます。\n"
+"・ キャンセル済は、ユーザが受注オーダーに関してキャンセルした時にセットされます。"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "税金金額"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "梱包"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "請求準備ができた受注オーダー行"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr "先月作成受注オーダー"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr "Eメールテンプレート"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "受注オーダー"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr "販売店"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "前払製品"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "計算"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr "最初にこの受注オーダーに関する全ての請求書をキャンセルする必要があります。"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "進行中の受注オーダー"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "この受注オーダー要求を生成したドキュメントへの参照"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "委任の遅延"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr "オンデマンドの配達と請求"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "各受注オーダー行と各構成部品のための１つの調達オーダー"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "割当"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "日付順"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "請求する確認済受注オーダー"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "未確認状態の受注オーダー"
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "受注オーダー %s はドラフト状態にセットされています。"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "在庫から"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "価格リストがありません： "
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "配達済"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"あなたの会社の製品を再販する複数の店がある場合は、ここから作成と管理ができます。新規の見積や受注オーダーを記録する際には、店にリンク付けする必要があります"
+"。店には各特定の受注のために製品が配達される倉庫を定義します。"
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "請求書は支払済であることを示しています。"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "説明"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "前払"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "会計"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "受注オーダーの検索"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "受注オーダー依頼"
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "在庫不足です： "
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "支払条件"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"このレポートは見積と受注オーダー上の分析を実行します。分析は受注高をチェックし別のグループ基準（販売員、パートナ、製品など）により並べ替えます。まだ請求さ"
+"れていない受注の分析を実行するためにこのレポートを使います。総売上高を分析したい場合は、会計アプリケーションの中の請求書分析レポートを使用する必要がありま"
+"す。"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "見積番号"
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "集荷"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "配達基準の請求書"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4b3647a5ac2..8eb4fc85ce6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,18 +51,8 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Sales order created in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Sales order created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Sales order created in last month"/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
@@ -70,28 +60,23 @@
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
+                    <filter icon="terp-personal"
+                        string="My Sales"
+                        help="My Sales"
+                        domain="[('user_id','=',uid)]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -131,130 +116,5 @@
     <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>
 
-    <!--This views used in board_sale module -->
-    <record id="view_sales_by_partner_graph" model="ir.ui.view">
-         <field name="name">sales.by.partner.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Partner" type="bar">
-                 <field name="partner_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_by_partner" model="ir.actions.act_window">
-        <field name="name">Sales per Customer in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','=','done'),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_by_partner_graph"/>
-        <field name="context">{'search_default_Customer':1}</field>
-    </record>
-
-    <record id="view_sales_by_salesman_graph" model="ir.ui.view">
-         <field name="name">sales.by.salesman.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Salesman" type="bar">
-                 <field name="user_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_by_salesman" model="ir.actions.act_window">
-        <field name="name">Sales by Salesman in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_by_salesman_graph"/>
-        <field name="context">{'search_default_User':1}</field>
-    </record>
-
-    <record id="view_sales_product_total_price_graph" model="ir.ui.view">
-         <field name="name">sold.product.total.price.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Product Category" type="bar">
-                 <field name="categ_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Product's Category in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_product_total_price_graph"/>
-        <field name="context">{'search_default_Category':1}</field>
-    </record>
-
-    <record id="view_sales_by_month_tree" model="ir.ui.view">
-        <field name="name">view.sales.by.month.tree</field>
-        <field name="model">sale.report</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Sales By Month">
-                <field name="month" />
-                <field name="product_id" />
-                <field name="price_total" />
-                <field name="user_id" invisible="1"/>
-                <field name="partner_id" invisible="1"/>
-                <field name="product_uom" invisible="1"/>
-                <field name="categ_id" invisible="1"/>
-                <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
-                <field name="state" invisible="1"/>
-                <field name="shop_id" invisible="1"/>
-                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                <field name="day" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="date" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-    <record id="action_view_sales_by_month" model="ir.actions.act_window">
-        <field name="name">Sales by Month</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]</field>
-        <field name="context">{'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']}</field>
-        <field name="view_id" ref="view_sales_by_month_tree"/>
-    </record>
-
-     <record id="view_top_quotations_tree" model="ir.ui.view">
-            <field name="name">sale.top.quotations.tree</field>
-            <field name="model">sale.order</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Quotations">
-                    <field name="date_order"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" />
-                    <field name="amount_untaxed" />
-                    <field name="amount_total"/>
-                </tree>
-            </field>
-        </record>
-
-    <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">Quotations</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
-          <field name="view_id" ref="view_top_quotations_tree"/>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 1007107f1a0..715564150ff 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Based on Sales Orders',
+        'group_invoice_so_lines': fields.boolean('Based on Sale Orders',
             implied_group='sale.group_invoice_so_lines',
             help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
         'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
@@ -44,24 +44,24 @@ class sale_configuration(osv.osv_memory):
                 This installs the module account_analytic_analysis."""),
         'module_account_analytic_analysis': fields.boolean('Manage Customer Contracts',
             help = """Allows to define your customer contracts conditions: invoicing
-            method (fixed price, on timesheet, advance invoice), the exact pricing 
-            (650€/day for a developer), the duration (one year support contract). 
-            You will be able to follow the progress of the contract and invoice automatically. 
+            method (fixed price, on timesheet, advance invoice), the exact pricing
+            (650€/day for a developer), the duration (one year support contract).
+            You will be able to follow the progress of the contract and invoice automatically.
             It installs the account_analytic_analysis module."""),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
             'Default Method', default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('Charge Shipping Cost',
+        'module_delivery': fields.boolean('Allow Charging Shipping Costs',
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
         'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
-        'default_picking_policy' : fields.boolean("Deliver all Products at Once",
-            help = "You can set picking policy on sale order that will allow you to deliver all products at once."),
+        'default_picking_policy' : fields.boolean("Configurable Shipping Policy",
+            help = "You will be able to configure, per sale order, if you deliver all  products at once or if you deliver each product when it is available.  This may have an impact on the shipping price."),
         'group_sale_pricelist':fields.boolean("Pricelist per Customer",
             implied_group='product.group_sale_pricelist',
-            help="""Allows to manage different prices based on rules per category of customers. 
+            help="""Allows to manage different prices based on rules per category of customers.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
         'group_uom':fields.boolean("Allow Different Units of Measure",
             implied_group='product.group_uom',
@@ -74,12 +74,12 @@ class sale_configuration(osv.osv_memory):
             help="Allows you to apply some discount per sale order line."),
         'group_multiple_shops': fields.boolean("Manage Multiple Shops",
             implied_group='stock.group_locations',
-            help="This allows to configure and use multiple shops."),                
+            help="This allows to configure and use multiple shops."),
         'module_sale_layout': fields.boolean("Notes & Subtotals per Line",
             help="""Allows to format sale order lines using notes, separators, titles and subtotals.
                 This installs the module sale_layout."""),
         'module_warning': fields.boolean("Alerts by Products or Customers",
-            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer. 
+            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
             Example: Product: this product is deprecated, do not purchase more than 5.
             Supplier: don't forget to ask for an express delivery."""),
         'module_sale_margin': fields.boolean("Display Margins on Sale Orders",
@@ -95,14 +95,20 @@ class sale_configuration(osv.osv_memory):
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
                 This installs the module analytic_user_function."""),
-        'module_analytic_journal_billing_rate': fields.boolean("Billing Rates by Contract",
-            help="""Allows you to define the default invoicing rate for a specific journal on a given account.
-                This installs the module analytic_journal_billing_rate."""),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
-        'decimal_precision': fields.integer('Decimal Precision on Price'),
+        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices  like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like:  0.0231 EUR per unit."),
     }
+    def _check_decimal(self, cr, uid, ids, context=None):
+        for decimal in self.browse(cr, uid, ids, context=context):
+            if decimal.decimal_precision > 20:
+                return False
+        return True
+
+    _constraints = [
+        (_check_decimal, 'Digits must be between 0 to 20 ', ['decimal_precision']),
+    ]
 
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
@@ -185,10 +191,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
         'module_sale_analytic_plans': fields.boolean('Several Analytic Accounts on Sales',
-            help="""This allows install module sale_analytic_plans."""),                 
+            help="""This allows install module sale_analytic_plans."""),
         'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
 
+    def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None):
+        """ change group_analytic_account_for_sales following module_sale_analytic_plans """
+        return {'value': {'group_analytic_account_for_sales': module_sale_analytic_plans}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index fa8aa2baa8e..e1910b035bc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -6,47 +6,54 @@
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
-                    <separator string="Invoicing Policy" colspan="4"/>
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <newline/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                    <newline/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <newline/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    <group string="Invoicing Policy">
+                        <group>
+                            <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                            <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                        </group>
+                        <group>
+                            <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                            <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                                attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                        </group>
+                    </group>
 
-                    <separator string="Sale Order" colspan="4"/>
-                    <field name="group_sale_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="group_sale_delivery_address"/>
-                    <field name="group_discount_per_so_line"/>
-                    <field name="module_sale_margin"/>
-                    <field name="module_sale_layout"/>
-                    <field name="module_warning"/>
-                    <field name="module_sale_journal"/>
-                    <field name="group_multiple_shops"/>
-                    <field name="decimal_precision"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                    <group string="Sale Order">
+                        <group>
+                            <field name="group_uom"/>
+                            <field name="group_sale_delivery_address"/>
+                            <field name="group_sale_pricelist"/>
+                            <field name="group_multiple_shops"/>
+                            <field name="module_warning"/>
+                            <field name="decimal_precision"/>
+                        </group>
+                        <group>
+                            <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="group_discount_per_so_line"/>
+                            <field name="module_sale_margin"/>
+                            <field name="module_sale_layout"/>
+                            <field name="module_sale_journal"/>
+                        </group>
+                    </group>
 
-                    <separator string="Contracts" colspan="4"/>
-                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    <group string="Contracts">
+                        <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+                        <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    </group>
                 </group>
             </field>
         </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base.action_sale_config"/>
+            sequence="1" action="base_setup.action_sale_config"/>
 
         <record id="view_account_config" model="ir.ui.view">
             <field name="name">account settings</field>
@@ -60,7 +67,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_sales"/>
-                    <field name="module_sale_analytic_plans"/>
+                    <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ea7f6eb230e..dbdfcbc4fbd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -212,7 +212,7 @@ class sale_order(osv.osv):
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+            ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b439c7ff4f0..0238f28d4da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Shop" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
@@ -90,7 +90,6 @@
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
@@ -108,13 +107,13 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
-                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
+                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_hi" type="object"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                           attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
@@ -130,7 +129,7 @@
                     <h1>
                         <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
                         <label string="Sale Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_form_inline" readonly="1"/>
+                        <field name="name" class="oe_inline" readonly="1"/>
                     </h1>
                     <group>
                         <group>
@@ -138,48 +137,56 @@
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <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="[('parent_id','!=',False)]"/>
+                            <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>
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Order Lines">
                             <field name="order_line">
                                 <form string="Sales Order Lines" version="7.0">
-                                    <field name="product_id"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                    <field name="name" placeholder="Porduct/Service characteristics"/>
-                                    <group>
+                                    <header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                    </header>
+                                    <group col="4" colspan="4">
+                                        <group>
+                                            <field name="product_id"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name" placeholder="Product/Service characteristics"/>
+                                        </group>
                                         <group>
                                             <label for="product_uom_qty"/>
                                             <div>
                                                 <field
                                                     context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                    name="product_uom_qty" class="oe_form_inline"
+                                                    name="product_uom_qty" class="oe_inline"
                                                     on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"
+                                                <field name="product_uom" groups="product.group_uom" class="oe_inline"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
 
                                             </div>
                                             <label for="product_uos_qty"/>
                                             <div>
-                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_form_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                        </group><group>
+                                        </group>
+                                    </group>
+                                    <group>
+                                        <group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
-                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                             <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
                                         <group col="4">
@@ -189,9 +196,8 @@
                                             <field name="address_allotment_id"/>
                                         </group>
                                         <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids"/>
-                                        <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
-                                        <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                                        <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"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
@@ -201,6 +207,7 @@
                                     </group>
                                 </form>
                                 <tree string="Sales Order Lines">
+                                    <field name="sequence" />
                                     <field name="name"/>
                                     <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -211,13 +218,13 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer" colspan="2" name="sale_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="note" placeholder="Our quotation is valid for 30 days..."/>
+                            <separator string="Notes" class="oe_clear"/>
+                            <field name="note" placeholder="Add a global note on the sale order..."/>
                         </page>
                         <page string="Other Information">
                             <group>
@@ -230,30 +237,37 @@
                                 <group>
                                     <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
-                                    <field name="invoiced"/>
-                                    <field name="shipped"/>
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" widget="selection"/>
                                     <field name="fiscal_position" widget="selection"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </group>
+                                <group>
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
                             </group>
                         </page>
                         <page string="History">
                             <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
+                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
+                                    <field name="date_invoice" />
+                                    <field name="number" />
+                                    <field name="partner_id" />
+                                    <field name="user_id" />
+                                    <field name="date_due" />
+                                    <field name="amount_total" />
+                                    <field name="state" />
+                                </tree>
+                            </field>
                             <separator string="Delivery Orders"/>
                             <field name="picking_ids" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
-                                    <field name="partner_id"/>
-                                    <field name="origin"/>
-                                    <field name="date"/>
+                                    <field name="partner_id" string="Customer" />
                                     <field name="min_date"/>
-                                    <field name="backorder_id"/>
-                                    <field name="invoice_state"/>
-                                    <field name="stock_journal_id" widget="selection"/>
                                     <field name="state"/>
                                     <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
                                 </tree>
@@ -274,17 +288,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <separator orientation="vertical"/>
-                    <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
-                    <field name="user_id">
-                        <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
-                    </field>
+                    <field name="user_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -406,9 +418,10 @@
                         <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
-                    <label for="order_id" class="oe_form_readonly_hidden"/>
+                    <sheet>
+                    <label for="order_id" class="oe_edit_only"/>
                     <h1><field name="order_id"/></h1>
-                    <label for="order_partner_id" class="oe_form_readonly_hidden"/>
+                    <label for="order_partner_id" class="oe_edit_only"/>
                     <h2><field name="order_partner_id"/></h2>
                     <group>
                         <group>
@@ -416,8 +429,8 @@
                             <field name="name" groups="base.group_no_one"/>
                             <label name="product_uom_qty"/>
                             <div>
-                                <field name="product_uom_qty" readonly="1" class="oe_form_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                <field name="product_uom_qty" readonly="1" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                             </div>
                         </group><group>
                             <field name="price_unit"/>
@@ -429,6 +442,7 @@
                     </group>
                     <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                     <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -440,13 +454,12 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -466,16 +479,14 @@
                 <search string="Search Uninvoiced Lines">
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
@@ -510,7 +521,7 @@
         </record>
 
         <act_window
-            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
+            context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
             id="act_res_partner_2_sale_order"
             name="Quotations and Sales"
             groups="base.group_sale_salesman"
@@ -518,7 +529,7 @@
             src_model="res.partner"/>
 
         <act_window
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
             id="action_order_line_product_tree"
             name="Sales Order Lines"
             res_model="sale.order.line"
diff --git a/addons/sale_analytic_plans/i18n/ja.po b/addons/sale_analytic_plans/i18n/ja.po
new file mode 100644
index 00000000000..1c624b29176
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/ja.po
@@ -0,0 +1,28 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 02:10+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: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "分析分布"
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
new file mode 100644
index 00000000000..392435c317e
--- /dev/null
+++ b/addons/sale_crm/i18n/mn.po
@@ -0,0 +1,136 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-18 01:54+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-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Ангилал"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr "Борлуулалтын Үнийн санал руу хөрвүүлэгдсэн (%s)."
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Үнийн санал руу хөрвүүлэх"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Өгөгдөл хангалтгүй байна!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Захиалагчид хаяг тодорхойлогдоогүй байна!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Борлуулалт хийх"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Үүсгэх"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Миний Борлуулалтын Баг"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Борлуулалтын захиалга үүссэн дараа боломжийг хаахын тулд үүнийг тэмдэглэ."
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr "Миний боломж"
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Үнийн санал руу хөрвүүлэх"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Үйлчлүүлэгч"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Боломж: %s"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Боломжийг Хаах"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+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' боломж Үнийн санал рүү хөрвүүлэгдлээ."
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Борлуулалтын баг"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Үнийн Санал Үүсгэх"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 49e7686542c..8a5f56181c2 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <field name="state" position="before">
+                    <xpath expr="/form/header/button[@name='stage_previous']" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </field>
+                    </xpath>
                 </data>
             </field>
         </record>
@@ -35,13 +35,15 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)"/>
-                    </field>
-                </field>
+                <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
+                        domain="[('section_id.user_id','=',uid)]"
+                        help="My Sales Team(s)"/>
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id" widget="selection" string="Sales Team"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 3923336eb5b..9484b87652e 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -120,6 +120,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids and new_ids[0]
                 }
             else:
@@ -130,6 +131,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids
                 }
             return value
@@ -145,9 +147,9 @@ class crm_make_sale(osv.osv_memory):
         'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
     }
     _defaults = {
-         'shop_id': _get_shop_id,
-         'close': False,
-         'partner_id': _selectPartner,
+        'shop_id': _get_shop_id,
+        'close': False,
+        'partner_id': _selectPartner,
     }
 
 crm_make_sale()
diff --git a/addons/sale_journal/i18n/ja.po b/addons/sale_journal/i18n/ja.po
new file mode 100644
index 00000000000..3618e160e47
--- /dev/null
+++ b/addons/sale_journal/i18n/ja.po
@@ -0,0 +1,132 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 21:45+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: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr "請求タイプ"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, for invoicing the current "
+"partner."
+msgstr "この請求タイプは現在のパートナの請求のため、デフォルトで使用されます。"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "受注と発注"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr "アクティブ項目をFalseにセットした場合、請求タイプは削除することなく非表示にできます。"
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "請求方法"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "請求書タイプ"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "非グループ化"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "グループ化"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"請求書タイプはパートナ、受注オーダー、配達オーダーのために使用されます。顧客ニーズに応じて請求をグループ化するための固有の請求仕訳帳を作成できます：毎日、"
+"毎水曜日、月次など"
+
+#. module: sale_journal
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "請求書タイプ"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "請求"
diff --git a/addons/sale_layout/i18n/ja.po b/addons/sale_layout/i18n/ja.po
new file mode 100644
index 00000000000..64b745e2362
--- /dev/null
+++ b/addons/sale_layout/i18n/ja.po
@@ -0,0 +1,254 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-19 03:18+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-21 05:25+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "小計"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "割引（%）"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "注記"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr "行タイプ"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "オーダー番号"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "オーダー行"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "請求書行"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "単位"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "製品"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "説明"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "販売員"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "見積番号"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "消費税"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "請求書作成"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "属性"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "請求書住所："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "送付先住所："
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "合計："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "支払条件"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "履歴"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "区切り線"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "あなたの参照"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "見積日"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "状態"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "受注オーダー行"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "レイアウト付きオーダー"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "税金："
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "改ページ"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "オーダー行"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "価格"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "在庫移動"
diff --git a/addons/sale_layout/i18n/mn.po b/addons/sale_layout/i18n/mn.po
new file mode 100644
index 00000000000..ba2a15454a3
--- /dev/null
+++ b/addons/sale_layout/i18n/mn.po
@@ -0,0 +1,254 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-18 18:00+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-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Дэд дүн"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Гарчиг"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Хөнгөлөлт. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr "Мөрийн Төрөл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Захиалгын N°"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Захиалгын мөрүүд"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Хөнгөлөлт.(%)"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Нэхэмжлэлийн мөр"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Х.Н"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Манай борлуулагч"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Утас:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Үнийн санал №"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "НӨАТ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Нэхэмжлэл бэлдэх"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Шинж"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Факс :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Захиалсан огноо"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Татвар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Цэвэр дүн :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Нийт :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Төлбөрийн нөхцөл"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Тусгаарлагч Шугам"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Таны дугаар"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Үнийн Саналын Огноо"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "НӨАТ :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Тоо"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Төлөв"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Борлуулалтын захиалгын мөр"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Зохиомжтой Эрэмбэ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Татвар :"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Хуудас Таслагч"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Захиалгын мөр"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Үнэ"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Барааны хөдөлгөөн"
diff --git a/addons/sale_margin/i18n/mn.po b/addons/sale_margin/i18n/mn.po
new file mode 100644
index 00000000000..ab077d5a45b
--- /dev/null
+++ b/addons/sale_margin/i18n/mn.po
@@ -0,0 +1,51 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-18 18:06+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-06-19 04:54+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Өртөг үнэ"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr "Энэ нь Нэгж үнэ, Өртөг үнийн ялгааг тооцоолж ашигийг өгнө."
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Захлалт"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
new file mode 100644
index 00000000000..54218e6d919
--- /dev/null
+++ b/addons/sale_margin/i18n/sv.po
@@ -0,0 +1,51 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-25 16:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferensen måste vara unik per bolag!"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Kundorder"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Marginal"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 519863b85f7..f46b4e56ac7 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,14 +8,12 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
-                <group>
-                    <field name="margin"/>
-                </group>
+            <xpath expr="//group[@name='sale_total']" position="inside">
+                <field name="margin"/>
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line">
         <field name="name">sale.order.line.margin.view.form</field>
         <field name="type">form</field>
@@ -27,7 +25,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_form">
         <field name="name">sale.order.line.tree.margin.view.form</field>
         <field name="type">form</field>
@@ -39,7 +37,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_tree">
         <field name="name">sale.order.margin.view.tree</field>
         <field name="type">tree</field>
@@ -51,7 +49,7 @@
             </field>
         </field>
     </record>
-   
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
         <field name="name">sale.order.margin.line.view.tree</field>
         <field name="type">tree</field>
@@ -62,7 +60,7 @@
                 <field name="margin"/>
             </field>
         </field>
-    </record>    
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale_mrp/i18n/ja.po b/addons/sale_mrp/i18n/ja.po
new file mode 100644
index 00000000000..0f1b13f4752
--- /dev/null
+++ b/addons/sale_mrp/i18n/ja.po
@@ -0,0 +1,53 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 02:40+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: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "受注オーダーから顧客参照を示します。"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "受注参照"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "製造オーダー"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "販売名"
+
+#. module: sale_mrp
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "オーダー数量は負または0にはできません。"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "受注オーダーの名前を示します。"
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
new file mode 100644
index 00000000000..2cba8adf832
--- /dev/null
+++ b/addons/sale_mrp/i18n/sv.po
@@ -0,0 +1,53 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-25 16:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Indikerar kundreferense från kundorder"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Säljreferense"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produktionsorder"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Säljare"
+
+#. module: sale_mrp
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referensen måste vara unik per bolag!"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Orderkvantitet kan inte vara negativt eller noll!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Indikerar kundordernamn"
diff --git a/addons/sale_order_dates/i18n/ja.po b/addons/sale_order_dates/i18n/ja.po
new file mode 100644
index 00000000000..7a66700e568
--- /dev/null
+++ b/addons/sale_order_dates/i18n/ja.po
@@ -0,0 +1,58 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 02: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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "顧客が販売のために要求した日付"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "契約日"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "有効日"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "集荷が作成された日付"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "要求日"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "製品の配達がなされる日付"
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 608c41a4909..8b997e2357e 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -46,7 +46,6 @@ synchronization with other companies, etc.
     'demo_xml': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
-        'share_view.xml',
         'res_users_view.xml',
         'wizard/share_wizard_view.xml'
     ],
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
new file mode 100644
index 00000000000..0db52a2c09e
--- /dev/null
+++ b/addons/share/i18n/ja.po
@@ -0,0 +1,521 @@
+# 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-21 21:29+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:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr "タイトルの表示"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr "アクセスは承認されました。"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr "共有方法"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one e-mail per line)"
+msgstr "人々と共有（行毎に１つのEメール）"
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr "タイトルの共有"
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr "共有"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr "URLアクセス共有"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:782
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr "表示のために現在のログイン %s とパスワードが使用できます。\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:601
+#, python-format
+msgid "(Modified)"
+msgstr "（修正済）"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:769
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:"
+msgstr "ドキュメントは添付されていません。このOpenERPのサーバにてオンラインで直接参照できます："
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:579
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "ユーザ %s（%s）、グループ %s により作成された共有フィルタ"
+
+#. module: share
+#: field:share.wizard,embed_url:0 field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "共有URL"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:776
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr "これはこの保護領域にアクセスするためのあなたの資格証明です：\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:643
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard"
+msgstr "共有ウィザードを使うためには、あなたは共有 / ユーザグループのメンバーである必要があります。"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "アクセス情報"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share"
+msgstr "共有"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:551
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr "（共有許可の変更のために複製されました）"
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "さらに上位のデータ共有のためのオプションのドメイン"
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:777
+#, python-format
+msgid "Username"
+msgstr "ユーザ名"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr "共有オプション"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:765
+#, python-format
+msgid "Hello,"
+msgstr "こんにちは、"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:640
+#, python-format
+msgid "Action and Access Mode are required to create a shared access"
+msgstr "共有アクセスを作成するためにアクションとアクセスモードが要求されます。"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr "共有したいデータを含む画面を開くアクションを選択して下さい。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:781
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr "ドキュメントは現在のOpenERPドキュメントに自動的に加えられました。\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "共有グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid "Email required"
+msgstr "Eメールは必須"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr "オプションとして、共有データに適用する追加のドメイン制限を指定できます。"
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr "共有のタイトル（メニューとショートカット名としてユーザに表示）"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "通常のグループのみ（非共有グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:787
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+"OpenERPはパワフルでユーザフレンドリーなビジネスアプリケーション（CRM、販売、HRなど）スイートです。\n"
+"これはオープンソースです。http://www.openerp.com にアクセスして下さい。"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "共有するためのアクション"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Optional: include a personal message"
+msgstr "オプション：個人的なメッセージを含む"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "共有ユーザ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:647
+#, python-format
+msgid "Please indicate the emails of the persons to share with, one per line"
+msgstr "共有する人のEメールを１人１行で表してください。"
+
+#. module: share
+#: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr "グループは一部のユーザとデータ共有のアクセス権を設定するために作成されます。"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr "共有したいデータを含む画面を開くアクション"
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:526
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "（共有のためにコピー）"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "新規に作成されました。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:616
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr "ユーザ%s（%s） グループ %s により作成された間接的共有フィルタ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:767
+#, python-format
+msgid "I've shared %s with you!"
+msgstr "%s を共有しました。"
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr "共有アクセスが許されたユーザのためのメインアクセスページ"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "グループ名は一意である必要があります。"
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:636
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"残念ですが、共有しようとしている現在の画面とフィルタは現時点ではサポートされていません。\n"
+"単純なフィルタを試して下さい。"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this Link"
+msgstr "このリンクを使用"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid "Database"
+msgstr "データベース"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "ドメイン"
+
+#. module: share
+#: view:share.wizard:0 field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:493
+#, python-format
+msgid "Copied access for sharing"
+msgstr "共有のためのアクセスをコピーしました。"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr "ドキュメントの共有"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr "またはドキュメントを埋め込みたい場所に、次のコードを挿入します。"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An e-mail notification with instructions has been sent to the following "
+"people:"
+msgstr "指示によるEメール通知は次の人々に送信されました："
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr "データ共有をしたいユーザのタイプを選択します。"
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr "現在のビュータイプ"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr "表示可能"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr "編集可能"
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the e-mail notification."
+msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:60
+#: code:addons/share/wizard/share_wizard.py:635
+#, python-format
+msgid "Sharing access could not be created"
+msgstr "共有アクセスは作成されませんでした。"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr "データ共有の目的のためだけに作成されたアクセス制限のある外部ユーザ"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "共有ウィザード"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:740
+#, python-format
+msgid "Shared access created!"
+msgstr "共有アクセスは作成されました。"
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+"\n"
+"このグループのメンバーは共有ウィザードにアクセスして、彼らのドキュメントの一部を表示や編集する外部ユーザを招待することができます。"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr "アクセスグループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:778
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "パスワード"
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "Emails"
+msgstr "Eメール"
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr "検索ビューを表示"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:197
+#, python-format
+msgid "No e-mail address configured"
+msgstr "Eメールアドレスが設定されていません。"
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr "個人的メッセージ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr "現ユーザは外部Eメールを送信するために、ユーザ設定でEメールアドレスを設定する必要があります。"
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "一般ユーザのみ（共有ユーザを含まない）"
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "アクセスモード"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr "共有操作"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:198
+#, python-format
+msgid ""
+"You must configure your e-mail address in the user preferences before using "
+"the Share button."
+msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr "共有ドキュメント上に生成されたアクセス権"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
+msgid "Link or embed..."
+msgstr "リンクまたは埋め込み"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
+msgid "Share with..."
+msgstr "共有先"
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 0927462b5c3..008dd424fa5 100644
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A. (<http://www.openerp.com>).
+#    Copyright (C) 2010-2012 OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+from openerp.osv import osv
 
-class ir_model_access(osv.osv):
+class ir_model_access(osv.Model):
     _inherit = 'ir.model.access'
 
     # overload group_names_with_access() to avoid returning sharing groups
@@ -32,17 +32,17 @@ class ir_model_access(osv.osv):
         """
         assert access_mode in ['read','write','create','unlink'], 'Invalid access mode: %s' % access_mode
         cr.execute('''SELECT
-                        g.name
+                        c.name, g.name
                       FROM
-                        ir_model_access a 
-                        JOIN ir_model m ON (a.model_id=m.id) 
+                        ir_model_access a
+                        JOIN ir_model m ON (a.model_id=m.id)
                         JOIN res_groups g ON (a.group_id=g.id)
+                        LEFT JOIN ir_module_category c ON (c.id=g.category_id)
                       WHERE
                         m.model=%s AND
                         (g.share IS NULL or g.share IS false) AND
                         a.perm_''' + access_mode, (model_name,))
-        return [x[0] for x in cr.fetchall()]
-
-ir_model_access()
+        return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
+    
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3b74fbb4dbc..defbc522340 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,11 +7,13 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/field[@name='company_ids']" position="after">
-                    <field name="share">
-                        <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                <xpath expr="//field[@name='name']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                </xpath>
+                <xpath expr="//field[@name='company_ids']" position="after">
+                    <field name="share"/>
                 </xpath>
             </field>
         </record>
@@ -29,11 +31,12 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name"/>
-                    <field name="share">
-                        <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="share"/>
                 </search>
             </field>
         </record>
@@ -49,9 +52,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='users']" position="attributes">
+                <field name="users" position="attributes">
                     <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
+                </field>
+                <field name="name" position="after">
+                    <field name="share"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
deleted file mode 100644
index 315f750a7f6..00000000000
--- a/addons/share/share_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_groups_form" model="ir.ui.view">
-            <field name="name">res.groups.form</field>
-            <field name="model">res.groups</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_groups_form"/>
-            <field name="arch" type="xml">
-                 <field name="name" position="after">
-                    <field name="share"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 07004f333a8..336f56a5f97 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -32,6 +32,7 @@ from osv import expression
 from tools.translate import _
 from tools.safe_eval import safe_eval
 import openerp
+_logger = logging.getLogger(__name__)
 
 FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
 READ_WRITE_ACCESS = ('perm_read', 'perm_write')
@@ -48,7 +49,6 @@ def generate_random_pass():
     return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10))
 
 class share_wizard(osv.osv_memory):
-    _logger = logging.getLogger('share.wizard')
     _name = 'share.wizard'
     _description = 'Share Wizard'
 
@@ -335,7 +335,7 @@ class share_wizard(osv.osv_memory):
             except Exception:
                 # Note: must catch all exceptions, as UnquoteEvalContext may cause many
                 #       different exceptions, as it shadows builtins.
-                self._logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True)
+                _logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True)
                 result = context_str
         return result
 
@@ -496,8 +496,8 @@ class share_wizard(osv.osv_memory):
             [x.id for x in current_user.groups_id], target_model_ids, context=context)
         group_access_map = self._get_access_map_for_groups_and_models(cr, uid,
             [group_id], target_model_ids, context=context)
-        self._logger.debug("Current user access matrix: %r", current_user_access_map)
-        self._logger.debug("New group current access matrix: %r", group_access_map)
+        _logger.debug("Current user access matrix: %r", current_user_access_map)
+        _logger.debug("New group current access matrix: %r", group_access_map)
 
         # Create required rights if allowed by current user rights and not
         # already granted
@@ -520,7 +520,7 @@ class share_wizard(osv.osv_memory):
                     need_creation = True
             if need_creation:
                 model_access_obj.create(cr, UID_ROOT, values)
-                self._logger.debug("Creating access right for model %s with values: %r", model.model, values)
+                _logger.debug("Creating access right for model %s with values: %r", model.model, values)
 
     def _link_or_copy_current_user_rules(self, cr, current_user, group_id, fields_relations, context=None):
         rule_obj = self.pool.get('ir.rule')
@@ -542,13 +542,13 @@ class share_wizard(osv.osv_memory):
                                 'groups': [(6,0,[group_id])],
                                 'domain_force': rule.domain, # evaluated version!
                             })
-                            self._logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
                             rule_obj.write(cr, 1, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
-                            self._logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
 
     def _check_personal_rule_or_duplicate(self, cr, group_id, rule, context=None):
         """Verifies that the given rule only belongs to the given group_id, otherwise
@@ -567,7 +567,7 @@ class share_wizard(osv.osv_memory):
                                        'groups': [(6,0,[group_id])],
                                        'domain_force': rule.domain_force, # non evaluated!
                                })
-        self._logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force)
+        _logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force)
         # then disconnect from group_id:
         rule.write({'groups':[(3,group_id)]}) # disconnects, does not delete!
         return rule_obj.browse(cr, UID_ROOT, new_id, context=context)
@@ -602,7 +602,7 @@ class share_wizard(osv.osv_memory):
                     if restrict:
                         continue
                     else:
-                        self._logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain)
+                        _logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain)
                         return
                 if restrict:
                     # restricting existing rules is done by adding the clause
@@ -614,7 +614,7 @@ class share_wizard(osv.osv_memory):
                     new_clause = expression.normalize(eval(domain, eval_ctx))
                     combined_domain = expression.AND([new_clause, org_domain])
                     rule.write({'domain_force': combined_domain, 'name': rule.name + _('(Modified)')})
-                    self._logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)
+                    _logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)
         if not rule_ids or not restrict:
             # Adding the new rule in the group is ok for normal cases, because rules
             # in the same group and for the same model will be combined with OR
@@ -625,7 +625,7 @@ class share_wizard(osv.osv_memory):
                 'domain_force': domain,
                 'groups': [(4,group_id)]
                 })
-            self._logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain)
+            _logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain)
 
     def _create_indirect_sharing_rules(self, cr, current_user, wizard_data, group_id, fields_relations, context=None):
         rule_name = _('Indirect sharing filter created by user %s (%s) for group %s') % \
@@ -648,7 +648,7 @@ class share_wizard(osv.osv_memory):
                          group_id, model_id=model.id, domain=str(related_domain),
                          rule_name=rule_name, restrict=True, context=context)
         except Exception:
-            self._logger.exception('Failed to create share access')
+            _logger.exception('Failed to create share access')
             raise osv.except_osv(_('Sharing access could not be created'),
                                  _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
 
@@ -852,7 +852,7 @@ class share_wizard(osv.osv_memory):
             notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context)
     
     def send_emails(self, cr, uid, wizard_data, context=None):
-        self._logger.info('Sending share notifications by email...')
+        _logger.info('Sending share notifications by email...')
         mail_message = self.pool.get('mail.message')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.user_email:
@@ -885,7 +885,7 @@ class share_wizard(osv.osv_memory):
             msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.user_email, [email_to], subject, body, model='share.wizard', context=context))
         # force direct delivery, as users expect instant notification
         mail_message.send(cr, uid, msg_ids, context=context)
-        self._logger.info('%d share notification(s) sent.', len(msg_ids))
+        _logger.info('%d share notification(s) sent.', len(msg_ids))
 
     def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
         wizard = self.browse(cr, uid, ids[0], context)
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 9fab20c9643..1c416287e84 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <record id="view_stock_graph_board" model="ir.ui.view">
+            <field name="name">report.stock.move.graph</field>
+            <field name="model">report.stock.move</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Moves Analysis" type="bar">
+                    <field name="day"/>
+                    <field name="product_qty" operator="+"/>
+                    <field name="categ_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="action_incoming_product_board" model="ir.actions.act_window">
             <field name="name">Incoming Shipments</field>
             <field name="res_model">stock.move</field>
@@ -27,7 +41,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
-            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_in':1}</field>
          </record>
         <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
@@ -36,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
-            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_out':1}</field>
          </record>
         <record id="board_warehouse_form" model="ir.ui.view">
@@ -61,16 +75,18 @@
         </record>
 
         <record id="open_board_warehouse" model="ir.actions.act_window">
-            <field name="name">Warehouse Dashboard</field>
+            <field name="name">Warehouse</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_board_warehouse" parent="base.menu_reporting_dashboard" action="open_board_warehouse" sequence="20" groups="group_stock_manager"/>
-        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" groups="group_stock_manager" sequence="5"/>
-
+        <menuitem   id="menu_board_warehouse" 
+                    parent="base.menu_reporting_dashboard" 
+                    action="open_board_warehouse" 
+                    sequence="25" 
+                    groups="group_stock_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
new file mode 100644
index 00000000000..d73bbf6d106
--- /dev/null
+++ b/addons/stock/i18n/ja.po
@@ -0,0 +1,4034 @@
+# 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-24 02: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-25 05:14+0000\n"
+"X-Generator: Launchpad (build 15482)\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 "移動番号 %s の一部欠けている集荷データ"
+
+#. 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 "請求のための配達オーダー"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr "配達オーダーの割当"
+
+#. 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 ""
+"現在の移動行は既に梱包に割り当てられています。この製品のための番号を本当に変更したい場合は、最初にそれを削除して下さい：%s（ID：%d）"
+
+#. 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 ""
+"（現在の状況を開くには空のままとします。日による全リソースをフィルタするためには、HH:MM:SS形式でFrom日付に00:00:00を、To日付に23："
+"59：59と調整して下さい。）"
+
+#. 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 "この製品あるいはこの分類のために定義された在庫出力アカウントがありません：%s（ID：%d）"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree6
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
+msgid "Internal Moves"
+msgstr "内部移動"
+
+#. 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 "製品分類で定義された在庫評価アカウントがありません：%s（ID：%d）"
+
+#. 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 "8月"
+
+#. 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 "6月"
+
+#. 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 "10月"
+
+#. 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 "製品分類のための検証アカウントが定義されていません：%s"
+
+#. 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 "IT仕入先"
+
+#. 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 "%s 予定済"
+
+#. 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 "月-1"
+
+#. 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 "この製品のために定義された在庫出力アカウントがありません：%s（ID:%d）"
+
+#. 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 ""
+"・ 仕入先の場所：仕入先から来る製品のための元の場所を表す仮想の場所\n"
+"                      \n"
+"・ 表示：子の場所を集約し倉庫のための階層的な構造を作るために使用される「仮想の場所。直接製品を含むことはできません。\n"
+"                      \n"
+"・ 内部の場所：自身の倉庫の内側の物理的な場所\n"
+"                      \n"
+"・ 顧客の場所：顧客に製品を送るための宛先の場所を表す仮想の場所\n"
+"                      \n"
+"・ 在庫：在庫レベル（実在庫）を修正するために使用される在庫操作に対応して提供される仮想の場所\n"
+"                      \n"
+"・ "
+"調達：元（仕入先または製造）が未定の時、調達操作に対応した一時的に提供されrる仮想の場所。調達スケジューラの実行を終えた時にこの場所は空にされます。\n"
+"                      \n"
+"・ 製造：製造操作に対応する仮想の場所：この場所は原材料を消費し完成品を製造します。\n"
+"                      "
+
+#. 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 "%s %s を出荷するために単位の丸めは許されていません。%s %s の丸めのみが許されています。"
+
+#. 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 "3月"
+
+#. 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 ""
+"連鎖の場所のタイプを選択した時のみに使用されます。\n"
+"自動移動であれば、現在の在庫が自動的に検証された後で在庫移動を作成します。手動操作であれば、在庫移動は作業者が検証する必要があります。自動段階的追加なしで"
+"あれば場所はオリジナルの移動に置き換えられます。"
+
+#. 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 "棚卸 %s は完了しました。"
+
+#. 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 ""
+"内部移動は倉庫内で実行する必要がある全ての在庫操作を表示します。各作業者は彼自身の仕訳帳の中に彼自身の実行するための操作のリストを持つので、全ての操作は在"
+"庫仕訳帳の中に分類されます。ほとんどの操作は、あなたが前もって設定した物流ルールにしたがって、OpenERPにより自動的に準備されます。とはいえ、手動で在"
+"庫操作を記録することもできます。"
+
+#. 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/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 17e5126e824..9a99c5e499b 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:13+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-06-20 09:34+0000\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@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-05-11 04:39+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
+"X-Generator: Launchpad (build 15435)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -35,6 +35,7 @@ msgid ""
 "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
@@ -44,7 +45,7 @@ msgstr "如果固定为连锁库位"
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "放到新托盘"
+msgstr "放入到新的包装"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -77,7 +78,7 @@ msgstr "版本号"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "今天处理或计划处理的单据"
 
 #. module: stock
 #: view:stock.partial.move.line:0 view:stock.partial.picking:0
@@ -123,12 +124,12 @@ msgstr "定期盘点表用于盘点每个库位的可用产品数量.你可以
 #: code:addons/stock/wizard/stock_change_product_qty.py:87
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "数量不能为负"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "装箱单"
+msgstr "分拣单"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -189,13 +190,13 @@ msgstr "本月"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "无法分配所有到这个调拨里！"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr "库存调拨#%s丢失部分装箱单"
+msgstr "库存调拨#%s 丢失部分分拣数据"
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
@@ -212,7 +213,7 @@ msgstr "您不能删除任何记录！"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "送货单开发票"
 
 #. module: stock
 #: view:stock.picking:0
@@ -223,7 +224,7 @@ msgstr "安排送货单"
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "需要更新成本"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -232,7 +233,7 @@ 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 "当前调拨明细已分配到托盘,如果你真想修改产品: \"%s\" (id: %d)请先删除它."
+msgstr "当前调拨明细已分配到包装，如果你真想修改产品: \"%s\" (id: %d)请先删除它。"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -242,18 +243,18 @@ msgstr "无效"
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "其它单号或序列号"
+msgstr "其它相关单号或序列号"
 
 #. module: stock
 #: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
 msgid "Origin"
-msgstr "来源"
+msgstr "源"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
 msgid "Incoming Products"
-msgstr "进仓单"
+msgstr "入库货品"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -271,7 +272,7 @@ msgstr "向后追溯"
 #: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "单号"
+msgstr "相关单号"
 
 #. module: stock
 #: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
@@ -289,13 +290,13 @@ msgstr "如果勾选，所有产品数量将设为零以确保实物盘点操作
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
 msgid "_Validate"
-msgstr "验证(_V)"
+msgstr "审核（_V）"
 
 #. module: stock
 #: code:addons/stock/stock.py:1149
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr "库存调拨在完成状态，不能取消装箱单!"
+msgstr "你不能取消这分拣因为库存调拨在已完成状态!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
@@ -327,7 +328,7 @@ msgstr "业务伙伴"
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
-msgstr ""
+msgstr "不能建立账簿的分录。因为这产品的入仓科目和这产品类别的估价科目相同。"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -354,12 +355,12 @@ msgstr "贸易术语代码"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "这托盘的库存调拨"
+msgstr "这包装的库存调拨"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "可用的进货"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -466,7 +467,7 @@ msgstr "平均价格使用的币别"
 msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
-msgstr "产品当开启实时盘点估值时,此科目将记录产品的当前价格."
+msgstr "在进行产品实时库存核算时，此科目记录产品的当前估值。"
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
@@ -504,7 +505,7 @@ msgstr "["
 msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
-msgstr "生产批次在公司仓库内的可用产品数量"
+msgstr "在公司仓库可用生产批次的当前产品数量"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -540,13 +541,13 @@ msgstr ""
 #: code:addons/stock/stock.py:760
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "您不能处理没有调拨的装箱单"
+msgstr "您不能处理没有库存调拨的分拣"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱单"
+msgstr "包装"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -597,7 +598,7 @@ msgstr "收货"
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr "附加单号"
+msgstr "附加的相关单号"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -611,7 +612,7 @@ msgid ""
 "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 "系统允许你根据执行操作的类型或员工/团队将执行的操作对每个库存操作指定一个具体的账簿.例如质量控制,领料单,装箱单等."
+msgstr "系统允许你根据执行的操作或将要执行的操作对每个库存操作指定一个具体的账簿。例如质量控制，领料单，分拣单等."
 
 #. module: stock
 #: field:stock.location,complete_name:0 field:stock.location,name:0
@@ -628,7 +629,7 @@ msgid ""
 "any\n"
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
-msgstr ""
+msgstr "我们的记录显示下列款项为欠款。如果已经支付请付略这提示。但要是你对这有任何疑问请联系我们！\n"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -642,12 +643,12 @@ msgid ""
 "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 ""
+msgstr "进货单是您将从供应商那收货的所有订单列表。进货单来源于采购订单，包含要接收产品的列表。您可以拿着它来验货。"
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "父向导（现有的明细）"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -660,7 +661,7 @@ msgstr "调拨信息"
 msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
-msgstr ""
+msgstr "这个产品类别: \"%s\" (id: %d) 没有定义库存核算科目！"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -678,12 +679,12 @@ msgstr "8月"
 #: 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 "托盘"
+msgstr "包装"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试为不同的产品分配批次"
+msgstr "您尝试为不同的产品分配同一批次"
 
 #. module: stock
 #: view:res.partner:0
@@ -713,12 +714,12 @@ msgstr "生产批次"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "收件人"
+msgstr "接收者"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "冷藏室"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -741,17 +742,17 @@ msgstr "盘点表明细"
 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 "在进行实时盘点估值时,库存调拨处理将自动登入这账簿的明细里."
+msgstr "在进行实时库存核算时，库存调拨处理将自动登入这账簿的明细里."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "处理装箱单"
+msgstr "分拣处理"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "编号必须在公司内唯一！"
+msgstr "必须在公司内唯一！"
 
 #. module: stock
 #: code:addons/stock/product.py:417
@@ -776,7 +777,7 @@ msgstr "勾选此选项在列表中选择列表中现有的批次,否则您输
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "这产品类别: %s 未指定估价科目。"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -899,17 +900,17 @@ msgstr "单价"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "日程表日期"
+msgstr "安排日期"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "托盘搜索"
+msgstr "包装搜索"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "已处理的分拣"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -926,7 +927,7 @@ msgstr "账簿"
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr "是已计划安排 %s"
+msgstr "已计划安排 %s"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -949,7 +950,7 @@ msgstr "执行前置时间(天)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "进行部分调拨处理的向导"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -972,7 +973,7 @@ msgstr "上月"
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
-msgstr "通过取消勾选有效字段您可以隐藏而不是删除库位."
+msgstr "通过勾选是否有效字段，您可以隐藏而不是删除库位."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -984,7 +985,7 @@ msgstr "请在列表视图中选择多个待合并的盘点"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "确认分拣"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1010,13 +1011,13 @@ msgstr "左父项"
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "库存核算科目"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "正等待"
 
 #. module: stock
 #: constraint:product.product:0
@@ -1108,7 +1109,7 @@ msgstr "供应商"
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
-msgstr ""
+msgstr "为取消这个盘存，你必须要先取消相关的分录。"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1121,7 +1122,7 @@ msgstr "完成日期"
 msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
-msgstr ""
+msgstr "运输不允许您四舍五入这计量单位 \"%s %s\", ，只允许你对这个单位 \"%s %s\" 取整。"
 
 #. module: stock
 #: view:stock.move:0
@@ -1156,7 +1157,7 @@ msgstr "实物盘点"
 msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
-msgstr "公司的装箱单将包含连锁调拨(如果为空使用默认公司规则)"
+msgstr "公司的分拣单包含连锁调拨(如果为空使用默认的公司规则)"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1164,7 +1165,7 @@ 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 "装箱单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
+msgstr "分拣单的运送类型将包含连锁调拨(为空根据源和目标库位自动检测)"
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1222,25 +1223,25 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"选择一个连库位的类型.\n"
-"\"自动调拨\"值将在创建库存调拨后将自动使当前库存值生效.\n"
-"\"手动操作\"库存调拨要手动确认生效.\n"
-"\"自动不增加步骤\"这库位取代调拨的源."
+"选择一个连锁库位的类型.\n"
+"\"自动调拨\"将在创建库存调拨后将自动审核。\n"
+"\"手动操作\"库存调拨要手动审核。\n"
+"\"自动但不增加\"这库位取代调拨的源库位。"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr "托盘标识"
+msgstr "包装标识"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Packing List:"
-msgstr "分拣单列表："
+msgstr "包装列表："
 
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr "等待其他调拨"
+msgstr "等待其它调拨"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1253,14 +1254,14 @@ msgstr "对当前产品,这库位将作为默认的生产订单产生的库存
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+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 "字段用于记录这产品的成本,用户在确认装箱单时设置(用于在计算成本的平均价格)"
+msgstr "用户在确认分拣时设置期间，字段用于记录产品的成本。（用于在计算成本的平均价格）"
 
 #. module: stock
 #: code:addons/stock/stock.py:1350
@@ -1273,7 +1274,7 @@ msgstr "处于草稿状态"
 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 "这列出了您所有托盘.当您选择一个托盘,您可以获取此其内的产品的上游和下游的追溯信息."
+msgstr "列出了您所有包装，当您选择一个包装时，您可以获取包装中产品的上游和下游的追溯信息."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -1330,7 +1331,7 @@ msgstr "收货已处理"
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr "您只希望返回已确认,可用或已完成的装箱单!"
+msgstr "您可能只返回已确认，可用或已完成的分拣！"
 
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
@@ -1345,7 +1346,7 @@ msgstr "生产批次修订"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "内部装箱单"
+msgstr "内部分拣单"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1361,7 +1362,7 @@ msgstr "拆分"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "搜索装箱单"
+msgstr "搜索分拣单"
 
 #. module: stock
 #: code:addons/stock/product.py:92
@@ -1377,7 +1378,7 @@ msgstr "类型"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "可用的分拣单"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1387,7 +1388,7 @@ msgstr "一般IT供应商"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "接收"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1398,11 +1399,13 @@ msgid ""
 "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 "装箱单:"
+msgstr "分拣单："
 
 #. module: stock
 #: field:stock.inventory,date:0 field:stock.move,create_date:0
@@ -1423,7 +1426,7 @@ msgstr "客户或供应商地址"
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr "装箱单"
+msgstr "包装"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1436,18 +1439,18 @@ msgstr "客户库位"
 #: code:addons/stock/stock.py:2312
 #, python-format
 msgid "You can only delete draft moves."
-msgstr "您只可删除草稿调拨"
+msgstr "您只能删除草稿状态的调拨。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "盘点拆分明细"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "打印库位及子库位余额"
+msgstr "库位盘点总览"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1457,7 +1460,7 @@ msgstr "一般信息"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "分析包括未来的调拨（类似虚拟库存）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1512,7 +1515,8 @@ msgstr ""
 "* 确认：产品可用仍在等待\n"
 "* 可用：备用产品，只待确认\n"
 "* 等待中：在自动变为可用状态前等待其它调拨 （比如：在“按订单生产”的流程中）\n"
-"* 完成：已处理完，不能修改或取消* 已取消：已被取消，不能再确认"
+"* 完成：已处理完，不能修改或取消\n"
+"* 已取消：已被取消，不能再确认"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1553,9 +1557,9 @@ msgid ""
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
 "当创建的库存调拨状态为\"草稿\". \n"
-"如果在调度没找到产品,将设为\"不可用\"状态.\n"
+"如果在调度程序没找到产品,将设为\"不可用\"状态.\n"
 " 当产品被保留将设为\"可用\"状态.\n"
-"当完成装箱单状态是\"完成\". \n"
+"当完成分拣状态是\"完成\". \n"
 "如果这调拨在等待其它东西状态为\"等待\"."
 
 #. module: stock
@@ -1575,7 +1579,7 @@ msgstr "已损耗"
 #: help:stock.partial.move.line,currency:0
 #: help:stock.partial.picking.line,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr "单位成本金额的币别"
+msgstr "单位成本的币别"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1588,7 +1592,7 @@ msgstr "9月"
 msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
-msgstr "如果这装箱单已被拆分这字段链接的装箱单包括的其它部分已被处理."
+msgstr "如果这分拣已被拆分这字段链接的分拣包括的其它部分已被处理。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1598,7 +1602,7 @@ msgstr "库存统计"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "月计划"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1608,12 +1612,12 @@ msgstr "追踪生产批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "是子单"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "库存核算科目（出仓）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1634,7 +1638,7 @@ msgstr "送货"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1654,7 +1658,7 @@ msgstr "已创建库存调拨"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "库存核算科目（入仓）"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1669,7 +1673,7 @@ msgstr "跟踪批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "退货单"
+msgstr "子单"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
@@ -1679,7 +1683,7 @@ msgstr "对应的库存属性"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "位置"
+msgstr "本地化"
 
 #. module: stock
 #: code:addons/stock/product.py:429
@@ -1705,12 +1709,12 @@ msgid ""
 "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 ""
+msgstr "在进行实时核算时，除非对目标库位指定一个核算科目否则出库调拨账簿分录将登入这个科目。当产品没设定时，它默认继承产品的类别的设定。"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "计划日期"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1774,7 +1778,7 @@ msgstr "损耗产品"
 #: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "您不能删除状态为 %s 的装箱单!"
+msgstr "您不能删除状态为 %s 的分拣！"
 
 #. module: stock
 #: view:stock.inventory.line.split:0 view:stock.move.consume:0
@@ -1786,7 +1790,7 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "退货装箱单"
+msgstr "退回分拣"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -1829,11 +1833,12 @@ msgid ""
 "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 "输入退货的数量"
+msgstr "输入子单的产品数量"
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1843,12 +1848,12 @@ msgstr "成本价"
 #. module: stock
 #: view:product.product:0 field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "盘点估值"
+msgstr "库存核算"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "今天计划订单"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1881,7 +1886,7 @@ msgstr "调拨分析让您轻松检查和分析您公司的库存调拨.在您
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
-msgstr ""
+msgstr "不能创建该分录，因为产品的出库科目和该产品类别的估价科目相同。"
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1914,7 +1919,7 @@ msgstr "批次跟踪库存报表"
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
-msgstr "这产品或它的分类 : \"%s\" (id: %d) 没定义入库科目"
+msgstr "该产品或它的类别 : \"%s\" (id: %d) 没定义入库科目"
 
 #. module: stock
 #: code:addons/stock/product.py:419
@@ -1958,7 +1963,7 @@ msgstr "库存"
 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 ""
+msgstr "这字段用于决定产品批次列是否显示在move_ids 。"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1966,7 +1971,7 @@ 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 "在你盘点这产品时,这库存的库位将替代默认值作为库存调拨的源库位"
+msgstr "对当前的产品，在你盘点这产品时,这库位将代替默认值作为库存调拨的源库位"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -1986,7 +1991,7 @@ msgstr "物流货运单位：托盘、箱、包等"
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "客户库位"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2025,7 +2030,7 @@ msgstr "创建"
 #: view:report.stock.inventory:0
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
-msgstr ""
+msgstr "当前盘点分析（只调拨那些已处理的）"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2054,12 +2059,12 @@ msgstr "仓库管理"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "部分交付"
+msgstr "分批出货"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "自动，不加入步骤"
+msgstr "自动，但不增加"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2071,7 +2076,7 @@ msgstr "库存库位分析"
 msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
-msgstr "调拨日期: 直到调拨完成的日程表日期,这日期是调拨实际处理完的日期."
+msgstr "调拨日期: 安排的日期直到调拨完成的日期，这日期是调拨实际处理完成的日期."
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -2099,7 +2104,7 @@ msgstr "单据"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr "入库装箱单"
+msgstr "入库分拣单"
 
 #. module: stock
 #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
@@ -2118,7 +2123,7 @@ msgstr "产品： "
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
-msgstr "为所有调拨包括这产品和生成的生产单强制指定一个生产批次."
+msgstr "为所有调拨包括（其生产单）强制指定一个生产批次."
 
 #. module: stock
 #: view:product.product:0
@@ -2228,13 +2233,13 @@ msgstr "系统存储成品的库位"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "要不要送货"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr "出仓单"
+msgstr "出仓产品"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2245,8 +2250,8 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
-"在这您能接收单独的产品,不管它们是来自采购订单还是装箱单.您将找到所有等待的产品.一旦您收到订单,您就能基于供应商名称或采购订单筛选然后您能用每个明细最右"
-"边的按钮确认接收产品."
+"在这您能接收单独的产品，不管它们来自采购订单还是分拣单。您将找到所有等待的产品。一旦您收到订单,您就能从供应商名称或采购订单筛选然后您能用每个明细最右边的"
+"按钮确认接收产品。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2267,7 +2272,7 @@ msgstr "禁止操作"
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "处理此装箱单的预定日期"
+msgstr "此分拣处理的预定日期"
 
 #. module: stock
 #: code:addons/stock/product.py:435
@@ -2278,7 +2283,7 @@ msgstr "损益数量"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "内部分拣单开发票"
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2299,9 +2304,8 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"如果产品开启实时估值,系统将自动用分录记录对应的库存调拨.\r\n"
-"库存变动科目设置在这产品分类上,它表示当前库存产品的价值.\r\n"
-"库存入库科目和出库科目将记录调拨的入库产品和出库产品."
+"如果产品开启实时库存核算，系统将自动为库存调拨写分录。\r\n"
+"库存核算科目设置在这产品类别上，它表示当前库存产品的估值，和入库科目，出库科目配合将记录产品的进库和出库调拨。"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2367,13 +2371,13 @@ msgstr "盘点"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr "装箱单"
+msgstr "分拣单"
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr "序列号和内部单号必须是唯一."
+msgstr "序列号和内部单号的组合必须是唯一."
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2432,17 +2436,17 @@ msgid ""
 "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 "显示您产品的最后盘点并用特定的筛选规则去排序.如果您经常部分盘点,您需要确保这报表至少每年一次包含库存的所有产品."
+msgstr "显示您产品的最后盘点并用特定的筛选规则去排序。如果您经常部分盘点，您需要每年至少一次用这报表来控制您的库存产品。"
 
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "启用"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr "库存量预报"
+msgstr "库存量预测"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
@@ -2510,17 +2514,17 @@ msgstr "完成日期"
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "唯一的生产批次，将显示为 前缀/序列号 [INT_REF]"
+msgstr "唯一的生产批次，将显示为 ：PREFIX/SERIAL [INT_REF]"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "您的公司"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "您不能将产品移动到类型为视图的库位上。"
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -2586,12 +2590,12 @@ msgstr "填写盘点"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和采购的计量单位必须是同一类型."
 
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "送货"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2602,7 +2606,7 @@ msgstr "批次"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr "生产批号"
+msgstr "生产批次"
 
 #. module: stock
 #: code:addons/stock/stock.py:2697
@@ -2635,7 +2639,7 @@ msgstr "联系地址："
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "退货单"
+msgstr "分单"
 
 #. module: stock
 #: field:stock.incoterms,active:0 field:stock.location,active:0
@@ -2659,7 +2663,7 @@ msgstr "错误，无业务伙伴！"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "业务伙伴向导"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2693,7 +2697,7 @@ msgstr "贸易术语是一系列的销售术语,用来划分交易成本和买
 msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
-msgstr "如果选择,产品可选择的库位将包含子库位."
+msgstr "如果选择将包括该库位子库位的产品。"
 
 #. module: stock
 #: field:stock.inventory,name:0
@@ -2704,7 +2708,7 @@ msgstr "盘点表单号"
 #: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr "内部装箱单"
+msgstr "内部分拣单"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2746,7 +2750,7 @@ msgstr "会计库存属性"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "客户装箱单"
+msgstr "客户包装"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0 view:report.stock.move:0
@@ -2783,7 +2787,7 @@ msgstr "完成日期"
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
-msgstr "如果想生成发票，请在装箱单上填写上业务伙伴."
+msgstr "如果想生成发票，请在分拣单上填写上业务伙伴."
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -2852,7 +2856,7 @@ msgstr "开发票"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "指定的内部调拨"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -2916,17 +2920,17 @@ msgstr "总价"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr "正在等待其他操作"
+msgstr "正在等待其它操作"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "供应商库位"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -2938,18 +2942,18 @@ msgstr "向导"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+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 "库位历史库存"
+msgstr "按库位划分产品"
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr "包括子项"
+msgstr "包括子库位"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
@@ -2966,23 +2970,23 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
-"内部调拨显示您仓库里必须要执行的盘点操作.\r\n"
-"所有操作都被归类入库存账簿这样每个员工都有自己的账簿记录自己执行的操作,大多数操作系统根据您预先设置物流规则自动准备,但您也可以记录手动的库存操作."
+"内部调拨显示您仓库里必须要执行的全部盘点操作。\r\n"
+"所有操作可分为入库存账簿这样每个员工都有自己的账簿记录自己执行的操作，大多数操作系统根据您设置的物流规则自动准备，但您也可以记录手动的库存操作。"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr "排序"
+msgstr "订单"
 
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price :"
-msgstr ""
+msgstr "成本价："
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "托盘编号"
+msgstr "包装编号"
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,location_id:0
@@ -3004,7 +3008,7 @@ msgstr "会计分录"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "主管"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3035,12 +3039,12 @@ msgstr "批次"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "New Pack"
-msgstr "新托盘"
+msgstr "新包装"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr "目标"
+msgstr "目的库位"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3064,7 +3068,7 @@ msgstr "未来生产"
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr "开票"
+msgstr "开发票"
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3095,12 +3099,12 @@ msgstr "此生产批次的调拨信息"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr "放入当前的托盘"
+msgstr "放入当前的包装"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "盘点明细"
+msgstr "盘点批次"
 
 #. module: stock
 #: view:stock.move:0
@@ -3110,12 +3114,12 @@ msgstr "原因"
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "冰淇淋"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "分部拣货处理向导"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3127,8 +3131,8 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
-"这列表是您所有生产批次的记录(序号),当您选择一个批次您可以向上或向下追溯在这批次的产品.\r\n"
-"在默认情况下,这列表在您的仓库筛选可用的序号,但您能在不勾选\"可用\"按钮下去获得您所有生产,收货,发货的批次."
+"这列表是您所有生产批次的记录（序号），当您选择一个批次您可以向上或向下追溯在这批次的产品。\r\n"
+"在默认情况下，这列表在您的仓库筛选可用的序号，但您能在不勾选“可用”按钮下去获得您所有生产，收货或送货到客户的批次。"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3164,6 +3168,7 @@ msgid ""
 "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
@@ -3200,13 +3205,13 @@ msgstr "已取消"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "确认送货单"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
 #: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr "装箱单"
+msgstr "分拣"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -3217,7 +3222,7 @@ msgstr "它指定送货是一次性交付还是直接交付."
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "这装箱单不需要开发票."
+msgstr "这分拣单不需要开发票。"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3240,10 +3245,10 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
-"决定这库位是不是连锁库位的头,比如这库位接收来货然后送到连锁库位的下一个位置.\n"
-"连锁库位的类型包括:\n"
+"决定这库位是不是连锁库位的头，比如这库位收货将送到连锁库位的下一个位置。\n"
+"连锁库位的类型包括：\n"
 "  * 不是 : 不是连锁库位.\n"
-"  * 客户 : 这连锁库位将来自客户的库位,它在收货的装箱单指定为源.\n"
+"  * 客户 : 这连锁库位将来自客户的库位，它在收货的分拣单指定的源。\n"
 "  * 固定库位 : 如果连锁库位为固定."
 
 #. module: stock
@@ -3277,26 +3282,26 @@ msgstr "送货单"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+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 "这库存库位替代默认值作为您送货物到业务伙伴的目标库位."
+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 "已确定"
+msgstr "已确认"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "确定"
+msgstr "确认"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3323,17 +3328,17 @@ msgstr "收货："
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
-msgstr "这选项确定这库位能不能放置废料"
+msgstr "这选项允许这库位能不能放置废料"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "装箱单"
+msgstr "关联的分拣"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Year Planned"
-msgstr ""
+msgstr "今年的计划"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3343,7 +3348,7 @@ msgstr "总出库数量"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
@@ -3356,12 +3361,12 @@ msgstr "此产品明细的单位成本"
 #: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr "产品分类"
+msgstr "产品类别"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "报告"
+msgstr "报表"
 
 #. module: stock
 #: code:addons/stock/stock.py:1343
@@ -3372,12 +3377,12 @@ msgstr " 为了 "
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to Leave in the Current Pack"
-msgstr "在当前托盘里的数量"
+msgstr "在当前包装的数量"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "库存可以送货"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3388,7 +3393,7 @@ msgstr "创建发票"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "确认内部调拨"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3399,7 +3404,7 @@ msgstr "设置"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr "已存在批次"
+msgstr "现有批次"
 
 #. module: stock
 #: view:stock.location:0
@@ -3415,8 +3420,8 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
-"如果成本价格增加,库存变动科目为借方,出库科目为贷方,其值=(相差的金额 * 数量).\n"
-"如果成本价格减少,库存变动科目为贷方,入库科目为借方."
+"如果成本价增加，库存核算科目为借方，出库科目为贷方，其值=(相差的金额 * 数量)。\n"
+"如果成本价减少，库存核算科目为贷方，入库科目为借方。"
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -3426,7 +3431,7 @@ msgstr "连锁库位账簿"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Packing list"
-msgstr "装箱单"
+msgstr "包装列表"
 
 #. module: stock
 #: code:addons/stock/stock.py:738
@@ -3442,7 +3447,7 @@ msgstr "客户"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "等待可用"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
@@ -3469,12 +3474,12 @@ msgstr "未来送货"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr "备注信息"
+msgstr "其他信息"
 
 #. module: stock
 #: view:stock.move:0 field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr "托盘"
+msgstr "包装"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -3504,7 +3509,7 @@ msgstr "12月"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "可用产品批次"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3531,7 +3536,7 @@ msgstr "审核盘点"
 msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
-msgstr "字段用于记录用户在确认装箱单时所用的币别(用于计算平均成本价格)."
+msgstr "字段用于记录用户确认在分拣期间所用的币别(用于计算平均成本价格)。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
@@ -3547,7 +3552,7 @@ msgstr "产品调拨"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "已开发票"
 
 #. module: stock
 #: field:stock.picking,max_date:0
@@ -3557,7 +3562,7 @@ msgstr "最大预计日期"
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr "自动装箱"
+msgstr "自动分拣"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@@ -3598,11 +3603,11 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"当创建库存调拨时它是\"草稿\"状态.\n"
-"之后设为\"确认\"状态.\n"
-"如果库存为可用状态设为\"可用\".\n"
-"在装箱单完成时设为\"完成\"状态.\n"
-"如果调拨时在等待其它设为\"等待\"状态."
+"当创建库存调拨时它是“草稿”状态。\n"
+"之后设为“确认”状态。\n"
+"如果库存可用状态设为“可用”。\n"
+"分拣完成时设为“完成”状态。\n"
+"如果调拨时在等待其它设为“等待”状态。"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3620,7 +3625,7 @@ msgstr "请指定一个不为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 "对现有产品这库存库位将用来替代默认作为库存调拨产生的需求的源库位."
+msgstr "对当前产品这库位将用来默认作为库存调拨产生的需求的源库位。"
 
 #. module: stock
 #: code:addons/stock/stock.py:1346
@@ -3631,7 +3636,7 @@ msgstr "准备过程"
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "产生此产品装箱单的单号"
+msgstr "此产品分拣的相关单据"
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3641,13 +3646,13 @@ msgstr "设为0."
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr "不需要发票的装箱单."
+msgstr "不需要发票的分拣单。"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -3658,7 +3663,7 @@ msgstr "11月"
 #: 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 "这产品分类: \"%s\" (id: %d)没定义账簿."
+msgstr "这产品类别： \"%s\" (id: %d)没定义账簿。"
 
 #. module: stock
 #: code:addons/stock/product.py:441
@@ -3725,8 +3730,8 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
-"这是您公司的仓库和库位结构.\r\n"
-"您可以点击一个库位来获得指定库位和它的所有子项的产品的列表和库存量."
+"这是您公司的仓库和库位结构。\r\n"
+"您可以点击一个库位来获得指定库位和它的所有子 库位的产品的列表和库存量。"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3785,7 +3790,7 @@ msgid ""
 "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 ""
+msgstr "在进行实时库存盘点时，除非为源库位指定一个库存核算科目，否则所有的入库调拨账簿明细将登入这科目。当没在产品设定时，使用产品类别的设定。"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
@@ -3805,7 +3810,7 @@ msgstr "目标库位"
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr "指定托盘的属性如数量,类型等"
+msgstr "指定包装的属性如数量,类型等"
 
 #. module: stock
 #: constraint:stock.move:0
@@ -3832,7 +3837,7 @@ msgstr "拆分调拨"
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr "退货单"
+msgstr "分单"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:106
@@ -3845,7 +3850,7 @@ msgstr "没有产品给退货(只有在完成状态和没完全退完才能退
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "未来的库存调拨"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -3856,7 +3861,7 @@ msgstr "拆分生产批次"
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "处理错误"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3884,7 +3889,7 @@ msgstr "向前追溯"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr "打印库位余额"
+msgstr "库位包含"
 
 #. module: stock
 #: code:addons/stock/product.py:447
@@ -3929,12 +3934,12 @@ msgstr "生产批次标识"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "小型冷藏库"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "便利店"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
@@ -3979,12 +3984,12 @@ msgstr "出库"
 msgid ""
 "By default, the pack reference is generated following the sscc standard. "
 "(Serial number + 1 check digit)"
-msgstr ""
+msgstr "默认情况下，包装参考sscc标准。（序列号+1位校验码）"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "错误，您不能创建循环引用的会员用户"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -4000,12 +4005,12 @@ msgstr ""
 #, python-format
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
-msgstr ""
+msgstr "生产批次数量%d，%s大于最大可用数量(%d) !"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "错误！您不能创建循环的类别。"
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
@@ -4026,7 +4031,7 @@ msgstr "物理库位"
 #. module: stock
 #: view:stock.picking:0 selection:stock.picking,state:0
 msgid "Ready to Process"
-msgstr ""
+msgstr "准备处理"
 
 #. module: stock
 #: help:stock.location,posx:0 help:stock.location,posy:0
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 5a90c20aa81..1c229121e1c 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -9,15 +9,14 @@
         <field name="name">res.partner.stock.property.form.inherit</field>
         <field name="model">res.partner</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="product.view_partner_property_form"/>
         <field name="arch" type="xml">
-            <page string="Sales &amp; Purchases" position="inside">
-                <group colspan="2" col="2" groups="stock.group_locations">
-                    <separator string="Inventory Properties" colspan="2"/>
+            <group name="pricelists" position="after">
+                <group groups="stock.group_locations">
                     <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
                     <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
                 </group>
-            </page>
+            </group>
         </field>
     </record>
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..09fa784e56a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,13 +60,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="standard_price" position="replace">
+                <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0"/>
-                    <group col="2" colspan="1">
+                    <div>
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
                             type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
-                    </group>
+                    </div>
                 </field>
             </field>
         </record>
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                <xpath expr="//group[@name='properties']" position="before">
                     <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
@@ -102,22 +102,20 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="status" position="after">
-                    <group colspan="2" col="3">
-                        <separator string="Stocks" colspan="4"/>
+                <group name="status" position="before" version="7.0">
+                    <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
-                        <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
-                        <newline/>
-                        <field name="virtual_available"/>
-                    </group>
-                    <group colspan="2" col="2" name="stock_variations">
-                        <separator string="Expected Stock Variations" colspan="2"/>
                         <field name="incoming_qty"/>
+                        <label for="virtual_available" />
+                        <div>
+                            <field name="virtual_available" class="oe_inline" />
+
+                            <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline" />
+                        </div>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot">
-                        <separator string="Lots" colspan="4"/>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
                         <field name="track_incoming" groups="stock.group_tracking_lot"/>
                         <field name="track_outgoing" groups="stock.group_tracking_lot"/>
@@ -204,7 +202,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="stock.group_locations">
+                    <group name="store" groups="stock.group_locations">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index dc457bc4ea8..89cbd9c1340 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -49,17 +49,7 @@
              </graph>
          </field>
     </record>
-    <record id="view_stock_graph_board" model="ir.ui.view">
-         <field name="name">report.stock.move.graph</field>
-         <field name="model">report.stock.move</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Moves Analysis" type="bar">
-                 <field name="day"/>
-                 <field name="product_qty" operator="+"/>
-             </graph>
-         </field>
-    </record>
+
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>
         <field name="model">report.stock.move</field>
@@ -67,37 +57,21 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="Year"
-                    name="year"
-                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                    help="Current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                    name="month"
-                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                    help="Current month"/>
-                <filter icon="terp-go-month"
-                    string="Month-1"
-                    name="month-1"
-                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                     help="Last month"/>
-                <separator orientation="vertical"/>
-                <filter string="Done"
-                    name="done"
-                    icon="terp-dialog-close"
-                    domain="[('state','=','done')]"
-                    help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                    icon="terp-gtk-go-back-rtl"
-                    domain="[('state','in',('assigned','waiting','confirmed'))]"
-                    help = "Future Stock-Moves"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <filter string="Done"
+                        name="done"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help = "Completed Stock-Moves"/>
+                    <filter string="Todo"
+                        icon="terp-gtk-go-back-rtl"
+                        domain="[('state','in',('assigned','waiting','confirmed'))]"
+                        help = "Future Stock-Moves"/>
+                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -190,33 +164,15 @@
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
-                        name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current month"/>
-                    <filter icon="terp-go-month"
-                        string="Month-1"
-                        name="month-1"
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-
                     <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-
-                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id" default_focus="1"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 51236e47962..69a7829f565 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -34,16 +34,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
-                    <field name="date"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 7e18809fc1a..3ad4b8e5914 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -65,15 +65,15 @@ class stock_config_settings(osv.osv_memory):
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
         'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
             implied_group='stock.group_inventory_valuation',
-            help="""This allows to split stock inventory lines according to serial numbers."""),
+            help="""Allows to configure inventory valuations on products and product categories."""),
         'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
             implied_group='stock.group_locations',
             help="""This allows to configure and use multiple stock locations and warehouses,
                 instead of having a single default one."""),
-        'group_product_variant': fields.boolean("Product Variant",
+        'group_product_variant': fields.boolean("Support Multiple Variants per Product",
             implied_group='product.group_product_variant',
-            help="""This allows to configure and use Product Variant."""),                
-        'decimal_precision': fields.integer('Decimal Precision on Weight'),
+            help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),                
+        'decimal_precision': fields.integer('Decimal Precision on Weights', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index de3e91ee183..2f3a4214af8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -9,32 +9,38 @@
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <separator string="Traceability" colspan="4"/>
+                        <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)]}"/>
-                            <newline/>
-                            <field name="group_stock_tracking_lot"/>
-
-                            <separator string="Logistics" colspan="4"/>
-                            <field name="group_stock_multiple_locations"/>
-                            <field name="module_stock_location"/>
-                            <field name="module_stock_invoice_directly"/>
-                            <field name="decimal_precision"/>
-
-                            <separator string="Products" colspan="4"/>
-                            <field name="group_stock_packaging"/>
-                            <field name="group_stock_inventory_valuation"/>
-                            <field name="group_uom"/>
-                            <field name="group_uos"/>
-                            <field name="group_product_variant"/>
-
-                            <separator string="Partners" colspan="4"/>
+                        </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>
+                        <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="Partners">
                             <field name="module_claim_from_delivery"/>
                         </group>
                     </sheet>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a391f117393..593dc7eb9f3 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -12,7 +12,11 @@ access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_
 access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,0,0,0
 access_stock_tracking_sales_user,stock.tracking sales.user,model_stock_tracking,base.group_sale_salesman,1,1,1,0
 access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1
+access_stock_picking_in_user,stock.picking.in,model_stock_picking_in,stock.group_stock_user,1,1,1,1
+access_stock_picking_out_user,stock.picking.out,model_stock_picking_out,stock.group_stock_user,1,1,1,1
 access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,0,0
+access_stock_picking_in_manager,stock.picking.in manager,model_stock_picking_in,stock.group_stock_manager,1,0,0,0
+access_stock_picking_out_manager,stock.picking.out manager,model_stock_picking_out,stock.group_stock_manager,1,0,0,0
 access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,0,0,0
 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87cf9ade130..a279b8bea6c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -33,7 +33,7 @@ import tools
 from tools import float_compare
 import decimal_precision as dp
 import logging
-
+_logger = logging.getLogger(__name__)
 
 #----------------------------------------------------------
 # Incoterms
@@ -419,9 +419,8 @@ class stock_location(osv.osv):
                     # so we ROLLBACK to the SAVEPOINT to restore the transaction to its earlier
                     # state, we return False as if the products were not available, and log it:
                     cr.execute("ROLLBACK TO stock_location_product_reserve")
-                    logger = logging.getLogger('stock.location')
-                    logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
-                    logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
+                    _logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
+                    _logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
                     return False
 
             # XXX TODO: rewrite this with one single query, possibly even the quantity conversion
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0154af26d95..d2a7c2d90b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,8 +78,10 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
@@ -119,15 +121,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"  /> 
+                        </div>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"/>
+                        </h1>
+                    </div>
                 <group>
-                    <label for="name" clas="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="name" placeholder="Annual invetory 2013"/>
-                    </h1>
-                    <group col="4">
+                    <group>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
+                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -182,7 +189,6 @@
                          </field>
                     </page>
                     </notebook>
-                    </group>
                     </sheet>
                 </form>
             </field>
@@ -279,9 +285,10 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
@@ -386,13 +393,13 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -505,9 +512,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="location_id" class="oe_form_readonly_hidden"/>
+                    <label for="location_id" class="oe_edit_only"/>
                     <h2><field name="location_id"/></h2>
                     <group>
                         <group string="Additional Information">
@@ -548,6 +555,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
@@ -555,7 +564,6 @@
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -621,7 +629,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
@@ -723,20 +731,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_form_inline"/>
+                        <field name="name" class="oe_inline"/>
                         <span attr="{'invisible': [('origin','=',False)]}"> - </span>
-                        <field name="origin" placeholder="PO0032" class="oe_form_inline"/>
+                        <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
-                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+                    <label for="partner_id" class="oe_edit_only"/>
                     <h2>
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
                     </h2>
                     <group>
                         <group>
                             <field name="backorder_id" readonly="1"/>
-                            <field name="invoice_state" string="Invoice Control"/>
+                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>
@@ -775,7 +783,6 @@
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
                                     <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
                                 <form string="Stock Moves" version="7.0">
@@ -783,77 +790,81 @@
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <field name="state" widget="statusbar"/>
+                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                    <group string="Move Information">
-                                        <field name="name" invisible="1"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                        <label for="product_qty"/>
-                                        <div>
-                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
-                                            <button name="%(stock.move_scrap)d"
-                                                    string="Scrap" type="action"
-                                                    icon="gtk-convert" context="{'scrap': True}"
-                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        </div>
-                                        <label for="product_uos_qty" groups="product.group_uos"/>
-                                        <div>
-                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                        </div>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                    </group>
+                                        <group string="Move Information">
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
 
-                                    <group string="Locations" groups="stock.group_locations">
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                    </group>
+                                        <group string="Dates">
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
 
-                                    <group string="Dates">
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                                        </group>
 
-                                    <group groups="stock.group_tracking_lot" string="Traceability">
-                                        <label for="tracking_id"/>
-                                        <div>
-                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
-                                            <button name="%(split_into)d" string="New Pack" type="action"
-                                                  groups="product.group_stock_packaging"
-                                                  icon="terp-stock_effects-object-colorize"
-                                                  states="draft,assigned,confirmed"/>
-                                        </div>
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
 
-                                        <label for="prodlot_id"/>
-                                        <div>
-                                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
-                                            <button name="%(track_line)d"
-                                                groups="stock.group_tracking_lot"
-                                                states="draft,waiting,confirmed,assigned"
-                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                        </div>
-                                    </group>
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Additional info">
-                            <group col="4">
-                                <field name="auto_picking"/>
-                                <field name="date_done"/>
-                                <field name="move_type"/>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group>
+                                    <field name="move_type"/>
+                                    <field name="type"/>
+                                    <field name="auto_picking"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="date_done"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -868,12 +879,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
@@ -933,6 +944,7 @@
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
@@ -980,16 +992,14 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1054,8 +1064,8 @@
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
-                    <field name="invoice_state"/>
-                    <field name="stock_journal_id" widget="selection"/>
+                    <field name="invoice_state" groups="account.group_account_invoice"/>
+                    <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1080,7 +1090,7 @@
                         <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_form_bottom">
+                        <div class="oe_bottom">
                             <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>
@@ -1094,15 +1104,13 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
@@ -1219,35 +1227,40 @@
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                <field name="product_qty"
+                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
+                                    class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
+                            <label for="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            </div>
+                            <field name="name" string="Reason"/>
+                        </group>
+                        <group>
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
-                        </group>
-                        <group string="Move Information">
-                            <field name="name" string="Reason"/>
-                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                        </group>
-                        <group string="Picking" name="picking">
-                            <field name="picking_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Dates">
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+
                         </group>
-                        <group string="Traceability">
+                        <group>
                             <label for="tracking_id"/>
                             <div>
-                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
                                       icon="terp-stock_effects-object-colorize"
@@ -1257,7 +1270,7 @@
                             <div>
                                 <field name="prodlot_id" groups="stock.group_production_lot"
                                     context="{'location_id':location_id, 'product_id':product_id}"
-                                    domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                    domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
                                     groups="stock.group_tracking_lot"
@@ -1279,17 +1292,18 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
@@ -1404,8 +1418,8 @@
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1413,21 +1427,18 @@
                         </div>
                         <label for="product_uos_qty"/>
                         <div>
-                            <field name="product_uos_qty" groups="product.group_uos" class="oe_form_inline"
+                            <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
                         <field name="name" string="Reason"/>
-                    </group><group>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id"/>
-                    </group>
-                    <group name="picking">
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <group>
+                        <field name="picking_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@@ -1436,7 +1447,7 @@
                     <group>
                         <label name="tracking_id"/>
                         <div>
-                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                             <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
@@ -1446,10 +1457,10 @@
                         <div>
                             <field name="prodlot_id" groups="stock.group_production_lot"
                                 context="{'location_id':location_id, 'product_id':product_id}"
-                                domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                domain="[('product_id','=?',product_id)]" class="oe_inline"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                             <button name="%(track_line)d"
-                                  groups="stock.group_tracking_lot" class="oe_form_inline"
+                                  groups="stock.group_tracking_lot" class="oe_inline"
                                   states="draft,waiting,confirmed,assigned,done"
                                   string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
                         </div>
@@ -1468,13 +1479,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1499,13 +1510,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1694,7 +1705,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 1cf08d8cadf..36c28075595 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -51,8 +51,8 @@
                         <field name="product_id"  readonly="1"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty" class="oe_form_inline"/>
-                            <field name="product_uom" class="oe_form_inline" readonly="1"/>
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" readonly="1"/>
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
@@ -83,8 +83,8 @@
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
                         <div>
-                            <field name="qty" readonly="1" class="oe_form_inline"/>
-                            <field name="product_uom" readonly="1" class="oe_form_inline"/>
+                            <field name="qty" readonly="1" class="oe_inline"/>
+                            <field name="product_uom" readonly="1" class="oe_inline"/>
                         </div>
                         <field name="location_id" invisible="1"/>
                         <field name="use_exist"/>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 722486c81fa..80b64f3ae75 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -39,10 +39,10 @@
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
                     <field name="quantity" />
-                    <field name="product_uom" />
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
                     <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 76f457e364a..764e345fac2 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -26,7 +26,7 @@
                         <tree editable="bottom" string="Product Moves">
                             <field name="product_id" />
                             <field name="quantity" />
-                            <field name="product_uom" />
+                            <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>
                             <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
diff --git a/addons/stock_invoice_directly/i18n/ja.po b/addons/stock_invoice_directly/i18n/ja.po
new file mode 100644
index 00000000000..79da1ee6573
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/ja.po
@@ -0,0 +1,23 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 21:30+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:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr "部分集荷処理ウィザード"
diff --git a/addons/stock_location/i18n/ja.po b/addons/stock_location/i18n/ja.po
new file mode 100644
index 00000000000..f569acdac78
--- /dev/null
+++ b/addons/stock_location/i18n/ja.po
@@ -0,0 +1,397 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 22: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-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "送付商品"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "移動"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "元の場所"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_id:0
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr ""
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr ""
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr ""
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
new file mode 100644
index 00000000000..399d5b0139b
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -0,0 +1,53 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 23:54+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-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "製造オーダー"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "自動集荷"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "製造オーダーの原材料のための自動集荷"
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: stock_no_autopicking
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "オーダー数量は負または0にはできません。"
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 324aeb0dcd2..e6f3b8d4218 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -29,7 +29,7 @@ from tools.translate import _
 import logging
 import decimal_precision as dp
 
-_logger = logging.getLogger('mps') 
+_logger = logging.getLogger(__name__) 
 
 
 def rounding(fl, round_value):
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0ae33cec3af..60f8127165f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,12 +50,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <field name="name" string="Stock Periods"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
             </field>
         </record>
@@ -87,7 +88,7 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Stock and Sales Forecast" layout="auto">
-                    <group colspan = "4" col = "4" class="oe_form_header">
+                    <group colspan = "4" col = "4" class="oe_header">
                         <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
@@ -198,6 +199,7 @@
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
@@ -304,6 +306,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
diff --git a/addons/subscription/i18n/ja.po b/addons/subscription/i18n/ja.po
new file mode 100644
index 00000000000..cd6abc3b64f
--- /dev/null
+++ b/addons/subscription/i18n/ja.po
@@ -0,0 +1,310 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 21:20+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: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "元となるドキュメント"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "今週"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "サブスクリプションの検索"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "初回日"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "サブスクリプションの履歴"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "現在の日付"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "週"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "本日"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:136
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "サブスクリプション"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "間隔の量"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr "停止"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "期間中"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "サブスクリプション履歴"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "間隔の単位"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "ドキュメントの数"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr "アクティブ項目をFalseにセットすると、サブスクリプションドキュメントは削除することなく非表示にできます。"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:136
+#, python-format
+msgid "You cannot delete an active subscription !"
+msgstr "アクティブなサブスクリプションを削除できません。"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "月"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "日"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Cronジョブ"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "サブスクリプション"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "サブスクリプション上で実行中のスケジューラ"
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "定期的イベント"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "サブスクリプションデータ"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "サブスクリプションの詳細または要約"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "サブスクリプションドキュメント"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr "アクティブ項目をFalseにセットすると、サブスクリプションを削除することなく非表示にできます。"
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr "新規ドキュメントが生成された時にデフォルトの値が項目にセットされます。"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr ""
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "処理"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr "ユーザは作成したいドキュメントの元となるドキュメントを選択できます。"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "ドキュメントタイプ"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:109
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "元となるドキュメントが誤っています。"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "サブスクリプションドキュメント項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:109
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"他の元となるドキュメントを提供して下さい。\n"
+"これは存在しません。"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "デフォルト値"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "ドキュメントは作成されました。"
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index c2cffdc1bfa..e02ce3d07dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,15 +74,14 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
+                        <field name="name" string="Subscription"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_init"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check"
-                        string="Running"
-                        domain="[('state','=','running')]"/>
+	                        string="Running"
+	                        domain="[('state','=','running')]"/>
                         <separator orientation="vertical"/>
-                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-today" string="Today"
-                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
@@ -169,7 +168,8 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Subscription Document"/>
+                        <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
                 </search>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index cc9158aa23c..c50613f466b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,14 +258,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="title" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         <separator orientation="vertical"/>
-                        <field name="title"/>
                         <field name="type" widget="selection"/>
-                        <field name="responsible_id">
-                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
-                        </field>
+                        <field name="responsible_id"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -302,150 +302,152 @@
             <field name="model">survey.page</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Page">
-                    <field name="title" colspan="4" select="1"/>
-                    <field name="survey_id" select="1"/>
-                    <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" select="1"/>
+                <form string="Survey Page" version="7.0">
+                    <sheet>
+                        <field name="title" colspan="4" select="1"/>
+                        <field name="survey_id" select="1"/>
                         <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>
-                                <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" />
+                        <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" select="1"/>
+                            <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 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>
-
-                    </form>
-                    <tree string="Survey Question">
-                        <field name="sequence" string="Seq"/>
-                        <field name="question" colspan="4" select="1"/>
-                        <field name="answer_choice_ids"/>
-                    </tree>
-                    </field>
+                                    <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>
+    
+                        </form>
+                        <tree string="Survey Question">
+                            <field name="sequence" string="Seq"/>
+                            <field name="question" colspan="4" select="1"/>
+                            <field name="answer_choice_ids"/>
+                        </tree>
+                        </field>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -471,7 +473,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title"/>
+                    <field name="title" string="Page"/>
+                    <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -676,7 +679,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question"/>
+                    <field name="question" string="Question"/>
+                    <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
@@ -1065,7 +1069,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>
                 <sheet string="Survey Request" layout="auto">
-                    <group class="oe_form_header">
+                    <group class="oe_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
@@ -1098,14 +1102,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="email" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection"/>
-                        <field name="email"/>
-                        <field name="user_id">
-                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 86380e98037..8c7fabca427 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -358,7 +358,7 @@ class survey_question_wiz(osv.osv_memory):
                     fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                     etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
                     etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-
+                    
                     if pre_button:
                         etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
@@ -450,6 +450,7 @@ class survey_question_wiz(osv.osv_memory):
             
             # hr.applicant: if survey answered directly in system: attach report to applicant
             if context.get('active_model') == 'hr.applicant':
+                self.pool.get('hr.applicant').write(cr,uid,[context.get('active_ids')[0]],{'response':context.get('response_id')})
                 result = base64.b64encode(result)
                 file_name = file_name + '.pdf'
                 ir_attachment = self.pool.get('ir.attachment').create(cr, uid, 
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 004ed043ab6..162e820c059 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -5,13 +5,12 @@
         <!--
             Survey Question Wizard
          -->
-
         <record id="view_survey_question_message" model="ir.ui.view">
-            <field name="name">Survey Question</field>
+            <field name="name">Answer Survey</field>
             <field name="model">survey.question.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Your Messages" version="7.0">
+                <form string="Your Messages"  version="7.0">
                     <field name="name" nolabel="1" colspan="4" />
                 </form>
             </field>
@@ -29,7 +28,7 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
-            <field name="name">Survey Question</field>
+            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>
@@ -37,6 +36,5 @@
             <field name="target">new</field>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/users_ldap/i18n/ja.po b/addons/users_ldap/i18n/ja.po
new file mode 100644
index 00000000000..79bdcb4ef59
--- /dev/null
+++ b/addons/users_ldap/i18n/ja.po
@@ -0,0 +1,178 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 22:21+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"LDAPサーバへの接続時に安全なTLS/SSL暗号化を要求します。このオプションはサーバがSTARTTLSが使用可能であることを要求します。そうでない場合"
+"は全ての認証要求は失敗します。"
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP設定"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAPバインディング"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "データベースにない場合、ユーザを作成します。"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "ユーザ作成のために使用するモデル"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "会社"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAPサーバアドレス"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAPサーバポート"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr "LDAPサーバ上のユーザアカウントはディレクトリへのクエリーのために使用されます。匿名接続する場合は空のままにして下さい。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAPベース"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "ユーザー情報"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "処理パラメータ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS を使用"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "ログイン情報"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "サーバー情報"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "LDAPサーバの設定"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAPパラメータ"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "LDAPサーバのユーザアカウントのパスワードはディレクトリへのクエリー使用されます。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAPパスワード"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "モデルユーザ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAPフィルタ"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "ユーザの作成"
diff --git a/addons/users_ldap/i18n/sv.po b/addons/users_ldap/i18n/sv.po
new file mode 100644
index 00000000000..47cd3c95ec1
--- /dev/null
+++ b/addons/users_ldap/i18n/sv.po
@@ -0,0 +1,176 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-23 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-24 05:28+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP-konfiguration"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP-binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Skapa användaren om den saknas i databasen"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Klass som används för att skapa användaren"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP serveradress"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP serverport"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP-bas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Användarinformation"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Processparameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Nummerserie"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Inloggningsuppgifter"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Ställ in din LDAP-server"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP-parametrar"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP-lösenord"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallanvändare"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP-filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Skapa användare"
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index 1d0c1e3acb9..e4615907c79 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -27,6 +27,7 @@ import pooler
 import tools
 from osv import fields, osv
 from openerp import SUPERUSER_ID
+_logger = logging.getLogger(__name__)
 
 class CompanyLDAP(osv.osv):
     _name = 'res.company.ldap'
@@ -107,8 +108,7 @@ class CompanyLDAP(osv.osv):
         except ldap.INVALID_CREDENTIALS:
             return False
         except ldap.LDAPError, e:
-            logger = logging.getLogger('orm.ldap')
-            logger.error('An LDAP exception occurred: %s', e)
+            _logger.error('An LDAP exception occurred: %s', e)
         return entry
         
     def query(self, conf, filter, retrieve_attributes=None):
@@ -135,7 +135,6 @@ class CompanyLDAP(osv.osv):
         """
 
         results = []
-        logger = logging.getLogger('orm.ldap')
         try:
             conn = self.connect(conf)
             conn.simple_bind_s(conf['ldap_binddn'] or '',
@@ -144,9 +143,9 @@ class CompanyLDAP(osv.osv):
                                      filter, retrieve_attributes, timeout=60)
             conn.unbind()
         except ldap.INVALID_CREDENTIALS:
-            logger.error('LDAP bind failed.')
+            _logger.error('LDAP bind failed.')
         except ldap.LDAPError, e:
-            logger.error('An LDAP exception occurred: %s', e)
+            _logger.error('An LDAP exception occurred: %s', e)
         return results
 
     def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry):
@@ -188,8 +187,7 @@ class CompanyLDAP(osv.osv):
             if res[1]:
                 user_id = res[0]
         elif conf['create_user']:
-            logger = logging.getLogger('orm.ldap')
-            logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
+            _logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
             user_obj = self.pool.get('res.users')
             values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
             if conf['user']:
diff --git a/addons/warning/i18n/ja.po b/addons/warning/i18n/ja.po
new file mode 100644
index 00000000000..f736f73ba5b
--- /dev/null
+++ b/addons/warning/i18n/ja.po
@@ -0,0 +1,242 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 21:49+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: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "発注オーダー行"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "受注オーダー行のためのメッセージ"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "発注オーダー行のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "受注オーダー行"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "この製品の支払時に警告"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr "メッセージをブロック"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "在庫集荷"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "請求書上の警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "メッセージなし"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "この製品の販売時に警告"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "受注オーダー"
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "請求書のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "発注オーダー"
+
+#. module: warning
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "受注オーダーのためのメッセージ"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "発注オーダーのためのメッセージ"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+"警告オプションを選択するとユーザにメッセージを通知します。メッセージをブロックを選択するとメッセージとともに例外が発生しその流れがブロックされます。メッセ"
+"ージは次の項目で記述する必要があります。"
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr "%s の注意です。"
+
+#. module: warning
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "請求書番号は会社ごとに固有である必要があります。"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: warning
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr "集荷時に警告"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "発注オーダー時に警告"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "%s の警告です。"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "受注オーダー時に警告"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr "在庫集荷のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
new file mode 100644
index 00000000000..1c50534b3ab
--- /dev/null
+++ b/addons/web_livechat/i18n/ja.po
@@ -0,0 +1,28 @@
+# 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_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index 656fded1d75..8236b43cea9 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -3,9 +3,9 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_systray_dropdown">
+    <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>
-        <ul class="oe_systray_shortcuts_items oe_systray_dropdown_options"/>
+        <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
     </div>
 </t>
 <t t-name="Systray.Shortcuts.Item">
diff --git a/addons/wiki/i18n/ja.po b/addons/wiki/i18n/ja.po
new file mode 100644
index 00000000000..97728365f6d
--- /dev/null
+++ b/addons/wiki/i18n/ja.po
@@ -0,0 +1,438 @@
+# 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 05:47+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: wiki
+#: field:wiki.groups,template:0
+msgid "Wiki Template"
+msgstr "Wikiテンプレート"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
+msgid "Wiki Pages"
+msgstr "Wikiページ"
+
+#. module: wiki
+#: field:wiki.groups,method:0
+msgid "Display Method"
+msgstr "表示方法"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
+msgid "Author"
+msgstr "著者"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
+#: view:wiki.wiki.page.open:0
+msgid "Open Page"
+msgstr "ページを開く"
+
+#. module: wiki
+#: field:wiki.groups,menu_id:0
+msgid "Menu"
+msgstr "メニュー"
+
+#. module: wiki
+#: field:wiki.wiki,section:0
+msgid "Section"
+msgstr "セクション"
+
+#. module: wiki
+#: help:wiki.wiki,toc:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "このページは目次を持つかどうかを表します。"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
+msgid "Wiki History"
+msgstr "Wiki履歴"
+
+#. module: wiki
+#: field:wiki.wiki,minor_edit:0
+msgid "Minor edit"
+msgstr "細部の編集"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,text_area:0
+msgid "Content"
+msgstr "コンテンツ"
+
+#. module: wiki
+#: field:wiki.wiki,child_ids:0
+msgid "Child Pages"
+msgstr "子ページ"
+
+#. module: wiki
+#: field:wiki.wiki,parent_id:0
+msgid "Parent Page"
+msgstr "親ページ"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "最終貢献者"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "親メニュー"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_make_index.py:52
+#, python-format
+msgid "There is no section in this Page"
+msgstr "このページにセクションがありません。"
+
+#. module: wiki
+#: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
+msgid "Wiki Group"
+msgstr "Wikiグループ"
+
+#. module: wiki
+#: field:wiki.wiki,name:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "メニュー作成ウィザード"
+
+#. module: wiki
+#: field:wiki.wiki,history_id:0
+msgid "History Lines"
+msgstr "履歴行"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Page Content"
+msgstr "ページコンテンツ"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:237
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "リビジョンの変更はありません。"
+
+#. module: wiki
+#: help:wiki.wiki,section:0
+msgid "Use page section code like 1.2.1"
+msgstr "1.2.1のようなページセクションコードを使用します。"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "メニュー名"
+
+#. module: wiki
+#: field:wiki.groups,notes:0
+msgid "Description"
+msgstr "説明"
+
+#. module: wiki
+#: field:wiki.wiki,review:0
+msgid "Needs Review"
+msgstr "要レビュー"
+
+#. module: wiki
+#: help:wiki.wiki,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr "他の貢献者の関心を高めて、このページはレビューされる必要があることを示しています。"
+
+#. module: wiki
+#: view:wiki.create.menu:0 view:wiki.make.index:0
+msgid "Menu Information"
+msgstr "メニュー情報"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
+msgid "Page History"
+msgstr "ページ履歴"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "Tree"
+msgstr "ツリー"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Page Template"
+msgstr "ページテンプレート"
+
+#. module: wiki
+#: field:wiki.wiki,tags:0
+msgid "Keywords"
+msgstr "キーワード"
+
+#. module: wiki
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+"Wikiページで同僚とアイディアや疑問を共有することができます。ひとつまたは幾つかのアプリケーション（CRM、販売など）とリンクさせる新しいドキュメントを"
+"作成できます。Wikiページにアクセスを簡単にするためのキーワードを使用することができます。テキスト形式の基本Wiki編集機能があります。"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr "表示方法がホームページの時はホームページの選択が要求されます。"
+
+#. module: wiki
+#: field:wiki.wiki.history,create_date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: wiki
+#: view:wiki.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr "選択ぺーじにインデックスを作成しますか？ "
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
+#: view:wizard.wiki.history.show_diff:0
+msgid "Difference"
+msgstr "差分"
+
+#. module: wiki
+#: field:wiki.groups,page_ids:0
+msgid "Pages"
+msgstr "ページ"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Group Description"
+msgstr "グループの説明"
+
+#. module: wiki
+#: view:wiki.wiki.page.open:0
+msgid "Want to open a wiki page? "
+msgstr "Wikiページを開きますか？ "
+
+#. module: wiki
+#: field:wiki.groups,section:0
+msgid "Make Section ?"
+msgstr "セクションを作りますか？"
+
+#. module: wiki
+#: field:wiki.wiki.history,text_area:0
+msgid "Text area"
+msgstr "テキストエリア"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Meta Information"
+msgstr "メタ情報"
+
+#. module: wiki
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
+msgstr "作成日"
+
+#. module: wiki
+#: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "List"
+msgstr "リスト"
+
+#. module: wiki
+#: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: wiki
+#: field:wiki.groups,create_date:0
+msgid "Created Date"
+msgstr "作成日"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_history
+msgid "All Page Histories"
+msgstr "全ページの履歴"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki
+msgid "wiki.wiki"
+msgstr ""
+
+#. module: wiki
+#: help:wiki.groups,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr "このグループに作成されたメニューのデフォルトの振る舞いを定義します。"
+
+#. module: wiki
+#: view:wizard.wiki.history.show_diff:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
+msgid "wizard.wiki.history.show_diff"
+msgstr ""
+
+#. module: wiki
+#: field:wiki.wiki.history,wiki_id:0
+msgid "Wiki Id"
+msgstr "Wiki ID"
+
+#. module: wiki
+#: field:wiki.groups,home:0 selection:wiki.groups,method:0
+msgid "Home Page"
+msgstr "ホームページ"
+
+#. module: wiki
+#: help:wiki.wiki,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr "現在のトピックで　他のページにリンクすることができます。"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Modification Information"
+msgstr "変更情報"
+
+#. module: wiki
+#: help:wiki.wiki,group_id:0
+msgid "Topic, also called Wiki Group"
+msgstr "トピックはWikiグループとも呼ばれます。"
+
+#. module: wiki
+#: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,write_date:0
+msgid "Modification Date"
+msgstr "変更日"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
+#: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
+msgid "Create Index"
+msgstr "インデックスを作成"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr "最低１つまたは２つの履歴リビジョンを選択する必要があります。"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
+#: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
+msgid "Create Menu"
+msgstr "メニューの作成"
+
+#. module: wiki
+#: field:wiki.wiki.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr "これは主要な編集ですか？"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
+#: model:ir.model,name:wiki.model_wiki_groups
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups view:wiki.groups:0
+msgid "Wiki Groups"
+msgstr "Wikiグループ"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Topic"
+msgstr "トピック"
+
+#. module: wiki
+#: field:wiki.wiki.history,write_uid:0
+msgid "Modify By"
+msgstr "変更者"
+
+#. module: wiki
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
+#: field:wiki.wiki,toc:0
+#, python-format
+msgid "Table of Contents"
+msgstr "目次"
+
+#. module: wiki
+#: view:wiki.groups:0 view:wiki.wiki.page.open:0
+msgid "Open Wiki Page"
+msgstr "Wikiページを開く"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr "ページを開くウィザード"
+
+#. module: wiki
+#: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: wiki
+#: field:wizard.wiki.history.show_diff,file_path:0
+msgid "Diff"
+msgstr "差分"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Need Review"
+msgstr "要レビュー"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr "レビュー待ちページ"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
+msgid "Search Page"
+msgstr "ページの検索"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c10890d3928..8069de21d04 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -30,7 +30,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki Groups">
+                <form string="Wiki Groups" version="7.0">
                     <group col="4" colspan="3" >
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
@@ -41,17 +41,18 @@
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
-                    <page string="Notes">
-                        <separator string="Group Description" colspan="4"/>
-                        <field name="notes" colspan="4" nolabel="1"/>
-                    </page><page string="Configuration">
-                        <separator string="Page Template" colspan="4"/>
-                        <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
-                    </page>
+                        <page string="Notes">
+                            <separator string="Group Description" colspan="4"/>
+                            <field name="notes" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Configuration">
+                            <separator string="Page Template" colspan="4"/>
+                            <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
+                        </page>
                     </notebook>
                      <field name="menu_id"/>
                      <button
-                         name="%(wiki.action_wiki_create_menu)d"
+                        name="%(wiki.action_wiki_create_menu)d"
                          string="Create Menu"
                           type="action"
                           icon="gtk-justify-fill"
@@ -126,30 +127,32 @@
             <field name="model">wiki.wiki</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="6"/>
-                        <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="parent_id" domain="[('group_id','=',group_id)]"/>
-                        <field name="section"/>                        
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Content">
-                        <separator colspan="4" string="Page Content"/>
-                        <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
-                        </page>
-                    </notebook>
-                    <group col="2" colspan="2" groups="base.group_no_one">
-                        <separator colspan="4" string="Modification Information"/>
-                        <field name="write_date" readonly="1"/>
-                        <field name="minor_edit"/>
-                        <field name="review" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Meta Information"/>
-                        <field name="tags" select="1"/>
-                        <field name="toc" groups="base.group_no_one"/>
-                    </group>
+                <form string="Wiki" version="7.0">
+                    <sheet>
+                        <group col="6" colspan="4">
+                            <field name="name" select="1" colspan="6"/>
+                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
+                            <field name="parent_id" domain="[('group_id','=',group_id)]"/>
+                            <field name="section"/>                        
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Content">
+                            <separator colspan="4" string="Page Content"/>
+                            <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
+                            </page>
+                        </notebook>
+                        <group col="2" colspan="2" groups="base.group_no_one">
+                            <separator colspan="4" string="Modification Information"/>
+                            <field name="write_date" readonly="1"/>
+                            <field name="minor_edit"/>
+                            <field name="review" select="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="4" string="Meta Information"/>
+                            <field name="tags" select="1"/>
+                            <field name="toc" groups="base.group_no_one"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -161,14 +164,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
+                        string="Wiki"/>
+                    <separator orientation="vertical"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="group_id"/>
-                    <field name="tags"/>
-                    <field name="section"/>
                     <field name="write_uid"/>
-                    <field name="write_date" groups="base.group_no_one"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
@@ -227,12 +232,14 @@
             <field name="model">wiki.wiki.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki History">
-                    <field name="wiki_id" select="1" colspan="4"/>
-                    <field name="summary" select="1" colspan="4"/>
-                    <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
-                    <field name="create_date" select="1" readonly="1"/>
-                    <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                <form string="Wiki History" version="7.0">
+                    <sheet>
+                        <field name="wiki_id" select="1" colspan="4"/>
+                        <field name="summary" select="1" colspan="4"/>
+                        <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
+                        <field name="create_date" select="1" readonly="1"/>
+                        <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki_faq/i18n/ja.po b/addons/wiki_faq/i18n/ja.po
new file mode 100644
index 00000000000..ac15d84c27f
--- /dev/null
+++ b/addons/wiki_faq/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-06-16 05:48+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: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"このモジュールはWiki FAQテンプレートを提供します。\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "ドキュメント管理 - Wiki - FAQ"
diff --git a/addons/wiki_quality_manual/i18n/ja.po b/addons/wiki_quality_manual/i18n/ja.po
new file mode 100644
index 00000000000..5d8e984575a
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-06-16 05:49+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: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"品質マニュアルのテンプレート\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "ドキュメント管理 - Wiki - 品質マニュアル"
diff --git a/addons/wiki_sale_faq/i18n/ja.po b/addons/wiki_sale_faq/i18n/ja.po
new file mode 100644
index 00000000000..b9c15b4d987
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/ja.po
@@ -0,0 +1,62 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 06:04+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: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Wikiページは同僚とアイディアを疑問を共有できます。１つまたは幾つかのアプリケーション（プロジェクトの仕様、販売チームのFAQなど）にリンクすることがで"
+"きる新しいドキュメントを作成できます。キーワードはWikiページに簡単にタグをつけるために使用できます。OpenERP "
+"Webクライアントインタフェースとともにこのアプリケーションを使うべきです。"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"ドキュメントは任意のレコードに添付されている全てのファイルにアクセスできます。Eメール、プロジェクトに関連する添付物、そのほかのドキュメントなどの全てのド"
+"キュメントの貯蔵庫です。このビューからドキュメントのコンテンツを検索できます。OpenERPは自動的に関連したパートナや "
+".DOC、.ODT、.TXT、.SXW、.PDFドキュメントのコンテンツのインデックスのようなレコードを基準としたメタデータを割り当てます。"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "ドキュメント"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wikiページ"