[MERGE]

bzr revid: apa@tinyerp.com-20120917100306-20mykzfvurzr71wm

addons/account/account.py

@@ -181,7 +181,7 @@ class account_account_type(osv.osv):
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', store=True,
             selection= [('none','/'),
                         ('income', _('Profit & Loss (Income account)')),
                         ('expense', _('Profit & Loss (Expense account)')),
@@ -838,6 +838,7 @@ class account_journal(osv.osv):
         """
         if not ids:
             return []
+
         if isinstance(ids, (int, long)):
             ids = [ids]
         result = self.browse(cr, user, ids, context=context)

addons/account/res_config.py

@@ -51,10 +51,10 @@ class account_config_settings(osv.osv_memory):
         'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
-            ('round_per_line', 'Round per Line'),
+            ('round_per_line', 'Round per line'),
-            ('round_globally', 'Round Globally'),
+            ('round_globally', 'Round globally'),
             ], string='Tax calculation rounding method',
-            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
+            help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default purchase tax"),
         'sale_tax_rate': fields.float('Sales tax (%)'),
@@ -72,40 +72,40 @@ class account_config_settings(osv.osv_memory):
         'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'),
         'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'),
         'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'),
-        'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+        'purchase_journal_id': fields.many2one('account.journal', 'Purchase journal'),
         'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'),
         'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'),
         'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'),
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
         'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('pay your suppliers by check',
+        'module_account_check_writing': fields.boolean('Pay your suppliers by check',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
+        'module_account_accountant': fields.boolean('Full accounting features: journals, legal statements, chart of accounts, etc.',
             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',
+        '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, ...)"""),
-        'module_account_budget': fields.boolean('budget management',
+        '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,
                 the project managers can set the planned amount on each analytic account.
                 This installs the module account_budget."""),
-        'module_account_payment': fields.boolean('manage payment orders',
+        'module_account_payment': fields.boolean('Manage payment orders',
             help="""This allows you to create and manage your payment orders, with purposes to
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('manage customer payments',
+        'module_account_voucher': fields.boolean('Manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('manage customer payment follow-ups',
+        'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
+        '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',
@@ -114,7 +114,7 @@ class account_config_settings(osv.osv_memory):
             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."""),
-        'group_multi_currency': fields.boolean('allow multi currencies',
+        'group_multi_currency': fields.boolean('Allow multi currencies',
             implied_group='base.group_multi_currency',
             help="Allows you multi currency environment"),
     }

addons/account/security/account_security.xml

@@ -5,6 +5,7 @@
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>

addons/account/security/ir.model.access.csv

@@ -82,6 +82,7 @@ access_account_entries_report_invoice,account.entries.report,model_account_entri
 access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
 access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0
 access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1
+access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0
 access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
 access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
 access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0

addons/account_accountant/__openerp__.py

@@ -26,15 +26,12 @@
     'sequence': 10,
     'summary': 'Financial and Analytic Accounting',
     'description': """
-Accounting Access Rights.
+Accounting Access Rights
-=========================
+========================
+It gives the Administrator user access to all accounting features such as journal items and the chart of accounts.
 
-This module gives the Admin user the access to all the accounting features
+It assigns manager and user access rights to the Administrator and only user rights to the Demo user. 
-like the journal items and the chart of accounts.
+""",
-
-It assigns manager and user access rights to the Administrator and only
-user rights to Demo user.
-    """,
     'website': 'http://www.openerp.com',
     'depends' : ['account_voucher'],
     'data': [

addons/account_accountant/account_accountant_data.xml

@@ -5,6 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Accounting"
             id="account.menu_finance"/>
+
     </data>
 
     <data noupdate="1">
@@ -14,10 +15,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>
-        <record id="todo_open_account_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_account_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
 
         <!-- Notify all employees of module installation -->

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -465,7 +465,7 @@ class account_analytic_account(osv.osv):
     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))])
+        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','in',context.get('search_default_partner_id',False))])
         names = [record.name for record in self.browse(cr, uid, ids, context=context)]
         name = _('Sale Order Lines of %s') % ','.join(names)
         return {

addons/account_analytic_analysis/account_analytic_analysis_menu.xml

@@ -73,16 +73,16 @@
             <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">{'default_type':'contract', 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="context">{'default_type':'contract', 'search_default_open':1, 'search_default_pending':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a new contract.
                 </p><p>
-                    You can use the way you invoice each contract (timesheet, fixed price, charge employees expenses). 
+                    Use contracts to follow tasks, issues, timesheets or invoicing based on
-                </p><p>
+                    work done, expenses and/or sales orders. OpenERP will automatically manage
-                     A template can be used to set automatically all invoicing information.
+                    the alerts for the renewal of the contracts to the right salesperson.
                 </p>
             </field>
         </record>

addons/account_analytic_analysis/account_analytic_analysis_view.xml

@@ -18,18 +18,8 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="40" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="name"]' position="after" version="7.0">
-                        <h4>
-                            <label for="date_start" string="Start Date"/>
-                        </h4>
-                        <div>
-                            <h1>
-                                <field name="date_start" class="oe_inline"/>
-                            </h1>
-                        </div>
-                </xpath>
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
-                    <label for="quantity_max" string="Prepaid Time Unit"/>
+                    <label for="quantity_max"/>
                     <div>
                         <field name="quantity_max" class="oe_inline"/>
                     </div>
@@ -152,11 +142,11 @@
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click here to create a Template of contract.
+                    Click here to create a template of contract.
                 </p><p>
                     Templates are used to prefigure contract/project that 
-                    can be selected by the salespeople to create their customer 
+                    can be selected by the salespeople to quickly configure the
-                    contract/project from the menu Sales/Contracts.
+                    terms and conditions of the contract.
                 </p>
             </field>
              

addons/account_budget/account_budget_view.xml

@@ -294,7 +294,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Budget Lines">
+                    <page string="Budget Lines" groups="account.group_account_user">
                             <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
                                 <tree string="Budget Lines" editable="top">
                                     <field name="crossovered_budget_id"/>

addons/account_budget/security/ir.model.access.csv

@@ -4,4 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
-access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,1,1,0

addons/account_sequence/i18n/el.po

@@ -0,0 +1,214 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-15 17:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-09-16 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+"Η εταιρία πρέπει να είναι ίδια για τους σχετικούς λογαριασμούς και περίοδο"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Επόμενος αριθμός αυτής της ακολουθίας"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Επόμενος Αριθμός"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Αριθμός Προσαύξησης"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""

addons/account_voucher/__openerp__.py

@@ -25,13 +25,19 @@
     'author' : 'OpenERP SA',
     'summary': 'Send Invoices and Track Payments',
     'description': """
-eInvoicing & Payments module manage all Voucher Entries such as 'Reconciliation Entries', 'Adjustment Entries', 'Closing or Opening Entries' for Sales, Purchase, Bank, Cash, Expense, Contra.
+Invoicing & Payments by Accounting Voucher & Receipts
-==============================================================================================================================================================================================
+======================================================
+The specific and easy-to-use Invoicing system in OpenERP allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your suppliers and customers. 
 
-    * Voucher Entry
+You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. 
-    * Voucher Receipt [Sales & Purchase]
+
-    * Voucher Payment [Customer & Supplier]
+The Invoicing system includes receipts and vouchers (an easy way to keep track of sales and purchases). It also offers you an easy method of registering payments, without having to encode complete abstracts of account.
-    * Cheque Register
+
+This module manages:
+
+* Voucher Entry
+* Voucher Receipt [Sales & Purchase]
+* Voucher Payment [Customer & Supplier]
     """,
     'category': 'Accounting & Finance',
     'sequence': 4,

addons/account_voucher/account_voucher_view.xml

@@ -270,10 +270,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>
-        <record id="todo_open_invoice_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_invoice_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
 
     </data>

addons/analytic/analytic_view.xml

@@ -41,6 +41,7 @@
                                         units is reached, the account manager
                                         is warned by email to renew the contract.
                                     </p>
+                                    <field name="date_start"/>
                                     <label for="date" string="End Date"/>
                                     <div name="duration">
                                         <field name="date" class="oe_inline"/>

addons/anonymization/anonymization.py

@@ -64,11 +64,13 @@ class ir_model_fields_anonymization(osv.osv):
             state = 'anonymized' # all fields are anonymized
         else:
             state = 'unstable' # fields are mixed: this should be fixed
+
         return state
 
     def _check_write(self, cr, uid, context=None):
         # check that the field is created from the menu and not from an database update
         # otherwise the database update can crash:
+
         if context.get('manual'):
             global_state = self._get_global_state(cr, uid, context=context)
             if global_state == 'anonymized':
@@ -100,12 +102,16 @@ class ir_model_fields_anonymization(osv.osv):
         # check field state: all should be clear before we can add a new field to anonymize:
         self._check_write(cr, uid, context=context)
 
+        global_state = self._get_global_state(cr, uid, context=context)
+
         if 'field_name' in vals and vals['field_name'] and 'model_name' in vals and vals['model_name']:
             vals['model_id'], vals['field_id'] = self._get_model_and_field_ids(cr, uid, vals, context=context)
 
         # check not existing fields:
         if not vals.get('field_id'):
             vals['state'] = 'not_existing'
+        else:
+            vals['state'] = global_state
 
         res = super(ir_model_fields_anonymization, self).create(cr, uid, vals, context=context)
 
@@ -340,8 +346,9 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                 # remove the placeholer:
                 eview.remove(placeholder)
             else:
-                # unstable ?
+                msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
-                raise
+                  " while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
+                raise osv.except_osv('Error !', msg)
 
             res['arch'] = etree.tostring(eview)
 

addons/auth_oauth/__openerp__.py

@@ -34,7 +34,8 @@ Allow users to login through Google OAuth2.
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
-        'auth_oauth_view.xml'
+        'auth_oauth_view.xml',
+        'security/ir.model.access.csv'
     ],
     'js': ['static/src/js/auth_oauth.js'],
     'css': ['static/lib/zocial/css/zocial.css'],

addons/auth_oauth/auth_oauth_view.xml

@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_form">
             <field name="name">auth.oauth.provider.form</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="arch" version="7.0">
                     <sheet>
@@ -26,7 +25,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="arch" version="7.0">
                     <field name="name" />

addons/auth_oauth/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_auth_oauth_provider,auth_oauth_provider,model_auth_oauth_provider,base.group_system,1,1,1,1

addons/auth_reset_password/auth_reset_password.py

@@ -32,10 +32,6 @@ def message_check(msg, secret):
 class res_users(osv.osv):
     _inherit = 'res.users'
 
-    _sql_constraints = [
-        ('email_uniq', 'UNIQUE (user_email)', 'You can not have two users with the same email!')
-    ]
-
     def _auth_reset_password_secret(self, cr, uid, context=None):
         uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
         res = {
@@ -77,6 +73,7 @@ class res_users(osv.osv):
         MailMessage.send(cr, uid, [msg_id], context=context)
 
     def send_reset_password_request(self, cr, uid, email, context=None):
+        # TODO reseting a password knowing only an email is not good enough (email can be shared between multiple logins).
         ids = self.pool.get('res.users').search(cr, SUPERUSER_ID, [('user_email', '=', email)], context=context)
         if ids:
             self._auth_reset_password_send_email(cr, SUPERUSER_ID, email, 'reset_password_email', ids[0], context=context)

addons/auth_reset_password/auth_reset_password.xml

@@ -22,7 +22,6 @@ or by copy-pasting the following URL in your browser: ${object._auth_reset_passw
         <record id="reset_password_wizard_form_view" model="ir.ui.view">
             <field name="name">auth.reset_password.form</field>
             <field name="model">auth.reset_password</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset Password" version="7.0">
                     <field name="state" invisible="1"/> 

addons/auth_signup/res_config.py

@@ -25,7 +25,7 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"),
+        'auth_signup_uninvited': fields.boolean('Allow public users to sign up', help="If unchecked only invited users may sign up"),
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 

addons/base_setup/base_setup_views.xml

@@ -6,9 +6,6 @@
         <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_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">

addons/base_setup/res_config.py

@@ -25,16 +25,16 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('manage multiple companies',
+        'module_multi_company': fields.boolean('Manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_share': fields.boolean('allow documents sharing',
+        'module_share': fields.boolean('Allow documents sharing',
             help="""Share or embbed any screen of openerp."""),
-        'module_portal': fields.boolean('activate the customer/supplier portal',
+        'module_portal': fields.boolean('Activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('activate the public portal',
+        'module_auth_anonymous': fields.boolean('Activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
-        'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
@@ -57,17 +57,17 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+        'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
+        'module_plugin_thunderbird': fields.boolean('Enable 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('enable Outlook plugin',
+        'module_plugin_outlook': fields.boolean('Enable 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

addons/base_setup/res_config_view.xml

@@ -16,7 +16,7 @@
                     <div>
                         <p>
                             <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                            <button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
                         </p>
                     </div>
                     <group>

addons/base_setup/res_partner_view.xml

@@ -9,9 +9,11 @@
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
-                    <t t-foreach="record.category_id.raw_value" t-as="category">
+                    <span class="oe_kanban_list_many2many" data-model="res.partner.category">
-                        <span class="oe_tag" t-att-data-category_id="category"/>
+                        <t t-foreach="record.category_id.raw_value" t-as="category">
-                    </t>
+                            <span class="oe_tag" t-att-data-list_id="category"/>
+                        </t>
+                    </span>
                 </xpath>
             </field>
         </record>

addons/base_setup/static/src/js/base_setup.js

@@ -1,24 +0,0 @@
-openerp.base_setup = function(openerp) {
-    /* extend kanban to include the names of partner categories in the kanban view of partners */
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-            if (this.dataset.model === 'res.partner') {
-                /* Set names for partner categories */
-                var category_ids = [];
-                this.$el.find('.oe_kanban_partner_categories span').each(function() {
-                    category_ids.push($(this).data('category_id'));
-                });
-                var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
-                dataset.name_get(_.uniq(category_ids)).then(function(result) {
-                    _.each(result, function(value) {
-                        self.$el
-                            .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
-                            .html(value[1]);
-                    });
-                });
-            }
-        }
-    });
-};

addons/base_vat/base_vat.py

@@ -109,6 +109,7 @@ class res_partner(osv.osv):
         if not self.check_vat(cr, uid, ids, context=context):
             msg = self._construct_constraint_msg(cr, uid, ids, context=context)
             raise osv.except_osv(_('Error!'), msg)
+        return True
 
     def check_vat(self, cr, uid, ids, context=None):
         user_company = self.pool.get('res.users').browse(cr, uid, uid).company_id

addons/crm/__openerp__.py

@@ -27,35 +27,24 @@
     'sequence': 2,
     'summary': 'Leads, Opportunities, Agenda',
     'description': """
-The generic OpenERP Customer Relationship Management.
+The generic OpenERP Customer Relationship Management
 =====================================================
 
-This system enables a group of people to intelligently and efficiently manage
+This application enables a group of people to intelligently and efficiently manage leads, opportunities, meetings and phone calls.
-leads, opportunities, meeting, phonecall.
 
-It manages key tasks such as communication, identification, prioritization,
+It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.
-assignment, resolution and notification.
 
-OpenERP ensures that all cases are successfully tracked by users, customers and
+OpenERP ensures that all cases are successfully tracked by users, customers and suppliers. It can automatically send reminders, escalate the request, trigger specific methods and many other actions based on your own enterprise rules.
-suppliers. It can automatically send reminders, escalate the request, trigger
-specific methods and lots of other actions based on your own enterprise rules.
 
-The greatest thing about this system is that users don't need to do anything
+The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and OpenERP. That way, users can just send emails to the request tracker. 
-special. They can just send email to the request tracker. OpenERP will take
-care of thanking them for their message, automatically routing it to the
-appropriate staff and make sure all future correspondence gets to the right
-place.
 
-The CRM module has a email gateway for the synchronisation interface
+OpenERP will take care of thanking them for their message, automatically routing it to the appropriate staff and make sure all future correspondence gets to the right place.
-between mails and OpenERP.
 
-Creates a dashboard for CRM that includes:
+
-------------------------------------------
+Dashboard for CRM will include:
-    * List of New Leads
+-------------------------------
-    * List of My Opportunities
+* Planned Revenue by Stage and User (graph)
-    * List of My Next Meetings
+* Opportunities by Stage (graph)
-    * Planned Revenue by Stage and User (graph)
-    * Opportunities by Stage (graph)
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

addons/crm/crm_data.xml

@@ -8,10 +8,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
         </record>
-        <record id="todo_open_crm_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_crm_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
 
         <record model="crm.case.channel" id="crm_case_channel_website">

addons/crm/res_config.py

@@ -26,19 +26,19 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("create leads from incoming mails",
+        '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("applications with Caldav protocol",
+        'module_crm_caldav': fields.boolean("Applications with Caldav protocol",
             help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
                 This installs the module crm_caldav."""),
         'module_import_sugarcrm': fields.boolean("SugarCRM",
             help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
                 This installs the module import_sugarcrm."""),
-        'module_import_google': fields.boolean("Google (Contacts and Calendar)",
+        'module_import_google': fields.boolean("Google (contacts and calendar)",
             help="""Import google contact in partner address and add google calendar events details in Meeting.
                 This installs the module import_google."""),
-        'module_google_map': fields.boolean("add google maps on customers",
+        'module_google_map': fields.boolean("Add google maps on customers",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",

addons/crm/res_config_view.xml

@@ -32,12 +32,6 @@
                         </div>
                     </group>
                 </div>
-                <div name="Customer Features" position="inside">
-                    <div>
-                        <field name="module_google_map" class="oe_inline"/>
-                        <label for="module_google_map"/>
-                    </div>
-                </div>
             </field>
         </record>
 

addons/crm/security/crm_security.xml

@@ -3,18 +3,21 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User - Own Leads Only</field>
+        <field name="name">User: Own Leads Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">User - All Leads</field>
+        <field name="name">User: All Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+        <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>

addons/crm/test/process/communication_with_customer.yml

@@ -18,9 +18,9 @@
     assert not lead.partner_id, "Customer should be a new"
     assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match"
 -
-  I reply him request with welcome message.
+  I reply him request with welcome message. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
-  !python {model: mail.compose.message}: |
+  !python {model: mail.mail}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
     id = self.create(cr, uid, {'body': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)

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",
+        '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."""),
     }

addons/crm_partner_assign/i18n/pt_BR.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-28 18:41+0000\n"
+"PO-Revision-Date: 2012-09-15 21:58+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n"
+"X-Launchpad-Export-Date: 2012-09-16 04:39+0000\n"
-"X-Generator: Launchpad (build 15914)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -36,7 +36,7 @@ msgstr "Excluir Permanentemente o email após o envio"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr "Espera para Fechar"
+msgstr "Adiar Fechamento"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
@@ -92,12 +92,12 @@ msgstr "Março"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr "Prospécto"
+msgstr "Prospecto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr "Atraso para fechar"
+msgstr "Adiar o fechamento"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -233,7 +233,7 @@ msgstr "Anterior"
 #: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
-msgstr "Erro de rede"
+msgstr "Erro na rede"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
@@ -274,12 +274,12 @@ msgstr "Prioridade"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -318,12 +318,12 @@ msgstr "Analisar Prospecções"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
-msgstr "Dt. Criação"
+msgstr "Data de Criação"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr "Documento Relacionado"
+msgstr "ID do Documento Relacionado"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -397,7 +397,7 @@ msgstr "Fechar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr "Usar modelo"
+msgstr "Usar Modelo"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -453,7 +453,7 @@ msgstr "Assunto"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Salesman"
-msgstr "Vendedor"
+msgstr "Representante"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -580,7 +580,7 @@ msgstr "# da Oportunidade"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr "Atribuir Prospécto"
+msgstr "Atribuir Prospecto"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -600,7 +600,7 @@ msgstr "Janeiro"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr "O Parceiro desse Caso foi Enviado/Atribuído para."
+msgstr "Parceiro para que este caso foi enviado/atribuído"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
@@ -661,7 +661,7 @@ msgstr "Nome da Grade"
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr "Última data que este Caso foi Enviado/Atribuído a um parceiro"
+msgstr "Última data que este caso foi enviado/atribuído a um parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -679,7 +679,9 @@ msgstr "Cópia oculta da mensagem para os destinatários"
 msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
-msgstr "Cabeçalho completo, Ex Cabecalhos SMTP"
+msgstr ""
+"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente "
+"disponível somente para mensagens recebidas)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -808,7 +810,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr "Analise de Parceria"
+msgstr "Análise de Parceria"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -839,7 +841,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0

addons/crm_todo/i18n/ru.po

@@ -0,0 +1,96 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-14 06:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-15 04:55+0000\n"
+"X-Generator: Launchpad (build 15944)\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 "Назад"

addons/document/document_directory.py

@@ -69,7 +69,7 @@ class document_directory(osv.osv):
     }
 
 
-    def _get_root_directory(self, cr,uid, context=None):
+    def _get_root_directory(self, cr, uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
@@ -77,9 +77,7 @@ class document_directory(osv.osv):
                 return False
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
-        except Exception, e:
+        except Exception:
-
-            _logger.warning('Cannot set directory root:'+ str(e))
             return False
         return objid.browse(cr, uid, mid, context=context).res_id
 

addons/document/report/document_report_view.xml

@@ -114,7 +114,7 @@
             <field name="model">report.document.user</field>
             <field name="arch" type="xml">
                 <graph string="Files by User" type="pie">
-                    <field name="user" />
+                    <field name="user_id" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>

addons/document_page/document_page_demo.xml

@@ -6,7 +6,6 @@
         </record>
         <record id="demo_category1" model="document.page">
             <field name="name">OpenERP Features</field>
-            <field name="sequence">10</field>
             <field name="type">category</field>
             <field  name="content">
 Summary of the feature

addons/document_page/wizard/document_page_create_menu.py

@@ -65,7 +65,6 @@ class document_page_create_menu(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
             'target': 'inlineview',
-            'nodestroy': True,
         }
         value['domain'] = "[('parent_id','=',%d)]" % (page.id)
         value['res_id'] = page.id

addons/event/__openerp__.py

@@ -25,21 +25,18 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'summary': 'For Trainings, Conferences & Meetings',
+    'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
     'description': """
 Organization and management of Events.
 ======================================
 
-This module allows you:
+The event module allows you to efficiently organise events and all related tasks: planification, registration tracking,
------------------------
+attendances, etc.
-    * to manage your events and their registrations
-    * to use emails to automatically confirm and send acknowledgements for any
-      registration to an event
 
-Note that:
+Key Features
-----------
+------------
-    - You can define new types of events in
+* Manage your Events and Registrations
-        **Events** / **Configuration** / **Types of Events**
+* Use emails to automatically confirm and send acknowledgements for any event registration
 """,
     'author': 'OpenERP SA',
     'depends': ['base_setup', 'board', 'email_template', 'google_map'],

addons/event/event_data.xml

@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('event.event_main_menu')}"/>
         </record>
-        <record id="todo_open_event_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_event_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
 
         <!-- notify all employees of module installation -->

addons/event_moodle/wizard_moodle.xml

@@ -39,10 +39,9 @@
         </record>
 
         <!-- register configuration wizard -->
-        <record id="config_wizard_config_moodle" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="configure_moodle"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="name">Configuration of moodle</field>
         </record>
 
         <menuitem name="Moodle Configuration" parent="base.menu_marketing_config_root" id="wizard_moodle" action="configure_moodle"/>

addons/event_sale/event_sale.py

@@ -81,8 +81,6 @@ class sale_order_line(osv.osv):
                     'nb_register': int(order_line.product_uom_qty),
                     'email': order_line.order_id.partner_id.email,
                     'phone': order_line.order_id.partner_id.phone,
-                    'street': order_line.order_id.partner_invoice_id.street,
-                    'city': order_line.order_id.partner_invoice_id.city,
                     'origin': order_line.order_id.name,
                     'event_id': order_line.event_id.id,
                 }

addons/google_base_account/wizard/google_login.py

@@ -38,12 +38,12 @@ class google_login(osv.osv_memory):
 
     def google_login(self, user, password, type='', context=None):
         if type == 'group':
-            gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
-        if type == 'contact':
             gd_client = gdata.contacts.service.ContactsService()
-        if type == 'calendar':
+        elif type == 'contact':
+            gd_client = gdata.contacts.service.ContactsService()
+        elif type == 'calendar':
             gd_client = gdata.calendar.service.CalendarService()
-        if type =='docs_client':
+        elif type =='docs_client':
             gd_client = gdata.docs.client.DocsClient()
         else:
             gd_client = gdata.contacts.service.ContactsService()

addons/hr/__openerp__.py

@@ -26,16 +26,19 @@
     'category': 'Human Resources',
     'sequence': 12,
     'website': 'http://www.openerp.com',
-    'summary': 'All Infos on Employees',
+    'summary': 'Jobs, Departments, Employees Details',
     'description': """
-Module for Human Resource Management.
+Human Resources Management
-=====================================
+=========================
+
+This application enables you to manage important aspects of your company's staff and other details such as their skills, contacts, working time...
+
 
 You can manage:
 ---------------
-    * Employees and hierarchies : You can define your employee with User and display hierarchies
+* Employees and hierarchies : You can define your employee with User and display hierarchies
-    * HR Departments
+* HR Departments
-    * HR Jobs
+* HR Jobs
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

addons/hr/res_config.py

@@ -26,23 +26,23 @@ class hr_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers',
+        'module_hr_timesheet_sheet': fields.boolean('Allow timesheets validation by managers',
             help ="""This installs the module hr_timesheet_sheet."""),
-        'module_hr_attendance': fields.boolean('track attendances',
+        'module_hr_attendance': fields.boolean('Track attendances',
             help ="""This installs the module hr_attendance."""),
-        'module_hr_timesheet': fields.boolean('manage timesheets',
+        'module_hr_timesheet': fields.boolean('Manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('manage holidays, leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('Manage holidays, leaves and allocation requests',
             help ="""This installs the module hr_holidays."""),
-        'module_hr_expense': fields.boolean('manage employees expenses',
+        'module_hr_expense': fields.boolean('Manage employees expenses',
             help ="""This installs the module hr_expense."""),
-        'module_hr_recruitment': fields.boolean('manage the recruitment process',
+        'module_hr_recruitment': fields.boolean('Manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('record contracts per employee',
+        'module_hr_contract': fields.boolean('Record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('organize employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
-        'module_hr_payroll': fields.boolean('manage payroll',
+        'module_hr_payroll': fields.boolean('Manage payroll',
             help ="""This installs the module hr_payroll."""),
     }
 

addons/hr/res_config_view.xml

@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_hr_root')}"/>
         </record>
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_hr_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
     </data>
     <data>

addons/hr_attendance/hr_attendance.py

@@ -55,7 +55,7 @@ class hr_attendance(osv.osv):
         'name': fields.datetime('Date', required=True, select=1),
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
         'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
-        'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True, select=True),
         'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {

addons/hr_evaluation/__openerp__.py

@@ -25,19 +25,27 @@
     'author': 'OpenERP SA',
     'category': 'Human Resources',
     'website': 'http://www.openerp.com',
-    'summary': 'Periodical Evaluations, Surveys',
+    'summary': 'Periodical Evaluations, Appraisals, Surveys',
     'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'],
     'depends': ['hr','base_calendar','survey'],
     'description': """
-Ability to create employees evaluation.
+Periodical Employees evaluation and appraisals
-=======================================
+==============================================
 
-An evaluation can be created by employee for subordinates, juniors as well as
+By using this application you can maintain the motivational process by doing periodical evaluations of your employees' performance. The regular assessment of human resources can benefit your people as well your organization. 
-his manager. The evaluation is done under a plan in which various surveys can be
+
-created and it can be defined which level of employee hierarchy fills what and
+An evaluation plan can be assigned to each employee. These plans define the frequency and the way you manage your periodic personal evaluations. You will be able to define steps and attach interview forms to each step. 
-final review and evaluation is done by the manager. Every evaluation filled by
+
-the employees can be viewed in the form of pdf file.
+Manages several types of evaluations: bottom-up, top-down, self-evaluations and the final evaluation by the manager.
-         """,
+
+Key Features
+------------
+* Ability to create employees evaluations.
+* An evaluation can be created by an employee for subordinates, juniors as well as his manager.
+* The evaluation is done according to a plan in which various surveys can be created. Each survey can be answered by a particular level in the employees hierarchy. The final review and evaluation is done by the manager.
+* Every evaluation filled by employees can be viewed in a PDF form.
+* Interview Requests are generated automatically by OpenERP according to employees evaluation plans. Each user receives automatic emails and requests to perform a periodical evaluation of their colleagues.
+""",
     "demo": ["hr_evaluation_demo.xml"],
     "data": [
         'security/ir.model.access.csv',

addons/hr_evaluation/hr_evaluation_data.xml

@@ -1,17 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
-
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">

addons/hr_expense/__openerp__.py

@@ -27,19 +27,21 @@
     'sequence': 30,
     'summary': 'Expenses Validation, Invoicing',
     'description': """
-This module aims to manage employee expenses.
+Manage expenses by Employees
-=============================================
+============================
 
-The whole workflow is implemented:
+This application allows you to manage your employees' daily expenses. It gives you access to your employees’ fee notes and give you the right to complete and validate or refuse the notes. After validation it creates an invoice for the employee.
+Employee can encode their own expenses and the validation flow puts it automatically in the accounting after validation by managers.
+
+
+The whole flow is implemented as:
 ----------------------------------
-    * Draft expense
+* Draft expense
-    * Confirmation of the sheet by the employee
+* Confirmation of the sheet by the employee
-    * Validation by his manager
+* Validation by his manager
-    * Validation by the accountant and receipt creation
+* Validation by the accountant and receipt creation
 
-This module also uses the analytic accounting and is compatible with
+This module also uses analytic accounting and is compatible with the invoice on timesheet module so that you are able to automatically re-invoice your customers' expenses if your work by project.
-the invoice on timesheet module so that you will be able to automatically
-re-invoice your customer's expenses if your work by project.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

addons/hr_expense/hr_expense_installer_view.xml

@@ -1,15 +1,9 @@
 <openerp>
-  <data>
-      <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-          <field name="state">done</field>
-      </record>
-  </data>
   <data noupdate="1">
       <!-- After installation of the module, open the related menu -->
-      <record id="todo_open_hr_menu" model="ir.actions.todo">
+      <record id="base.open_menu" model="ir.actions.todo">
           <field name="action_id" ref="hr.action_client_hr_menu"/>
-          <field name="type">automatic</field>
+          <field name="state">open</field>
-          <field name="sequence">100</field>
       </record>
   </data>
   <data>

addons/hr_holidays/__openerp__.py

@@ -29,33 +29,20 @@
     'summary': 'Holidays, Allocation and Leave Requests',
     'website': 'http://www.openerp.com',
     'description': """
-This module allows you to manage leaves and leave requests.
+Manage leaves and allocation requests
-===========================================================
+=====================================
 
-Implements a dashboard for human resource management that includes:
+This application controls the holiday schedule of your company. It allows employees to request holidays. Then, managers can review requests for holidays and approve or reject them. This way you can control the overall holiday planning for the company or department.
--------------------------------------------------------------------
-    * Leaves
 
-Note that:
+You can configure several kinds of leaves (sickness, holidays, paid days, ...) and allocate leaves to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted).
-~~~~~~~~~~
+
-    - A synchronisation with an internal agenda (use of the CRM module) is
+You can keep track of leaves in different ways by following reports: 
-      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
+* Leaves Summary
-      can setup this info and your colour preferences in
+* Leaves by Department
-      
+* Leaves Analysis
-          **Human Resources** / **Configuration** / **Leave Type**
+
-    - An employee can make an ask for more off-days by making a new Allocation. It will increase his total of that leave type available (if the request is accepted).
+A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type.
-    - There are two ways to print the employee's holidays:
-        * The first will allow to choose employees by department and is used by clicking the menu item located in
-                **Reporting** / **Human Resources** / **Leaves** / **Leaves by Department**
-        * The second will allow you to choose the holidays report for specific employees. Go on the list
-                **Human Resources** / **Human Resources** / **Employees**
-                then select the ones you want to choose, click on the print icon and select the option
-                'Leaves Summary'
-    - The wizard allows you to choose if you want to print either the Approved & Confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in
-                **Settings** / **Users** / **Users**
-                
-                for example, you maybe will do it for the user 'admin'.
 """,
     'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
     'depends': ['hr', 'base_calendar', 'process', 'resource'],

addons/hr_holidays/hr_holidays_data.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">

addons/hr_payroll/hr_payroll_view.xml

@@ -99,8 +99,8 @@
         <menuitem
             id="menu_hr_payroll_structure_view"
             action="action_view_hr_payroll_structure_list_form"
-            parent="hr.menu_hr_configuration"
+            parent="payroll_configure"
-            sequence="20"
+            sequence="2"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
             <field name="name">Salary Structures Hierarchy</field>

addons/hr_payroll/res_config.py

@@ -24,6 +24,6 @@ from osv import osv, fields
 class human_resources_configuration(osv.osv_memory):
     _inherit = 'hr.config.settings'
     _columns = {
-        'module_hr_payroll_account': fields.boolean('link your payroll to accounting system',
+        'module_hr_payroll_account': fields.boolean('Link your payroll to accounting system',
-            help ="""Create Journal Entries from Payslips"""),
+            help ="""Create journal entries from payslips"""),
     }

addons/hr_recruitment/__openerp__.py

@@ -25,17 +25,16 @@
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 24,
-    'summary': 'Recruitment Process, Job Descriptions',
+    'summary': 'Jobs, Recruitment, Applications, Job Interviews',
     'description': """
-Manages job positions and the recruitment process.
+Manage job positions and the recruitment process
-==================================================
+=================================================
 
-It's integrated with the survey module to allow you to define interview for different jobs.
+This application allows you to easily keep track of jobs, vacancies, applications, interviews...
 
-This module is integrated with the mail gateway to automatically tracks email
+It is integrated with the mail gateway to automatically fetch email sent to <jobs@yourcompany.com> in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it is integrated with the survey module to allow you to define interviews for different jobs.
-sent to jobs@YOURCOMPANY.com. It's also integrated with the document management
+You can define the different phases of interviews and easily rate the applicant from the kanban view.
-system to store and search in your CV base.
+""",
-    """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],

addons/hr_recruitment/hr_recruitment.py

@@ -194,7 +194,7 @@ class hr_applicant(base_stage, osv.Model):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
-        'categ_ids': fields.many2many('hr.applicant_category', string='Categories'),
+        'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
@@ -398,7 +398,7 @@ class hr_applicant(base_stage, osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = False
             if applicant.partner_id:
-                address_id = applicant.partner_id.address_get(['contact'])['contact']
+                address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
             if applicant.job_id:
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
                 emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name,

addons/hr_recruitment/hr_recruitment_view.xml

@@ -337,7 +337,7 @@
             <field name="no_of_recruitment" version="7.0" position="after">
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
-                    <field name="survey_id" class="oe_inline"/>
+                    <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
                     <button class="oe_inline"
                         string="Interview"
                         name="action_print_survey" type="object"

addons/hr_recruitment/res_config.py

@@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory):
     _inherit = ['hr.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'module_document_ftp': fields.boolean('allow the automatic indexation of resumes',
+        'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 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 an incoming email account',
+        'fetchmail_applicants': fields.boolean('Create applicants from an incoming email account',
             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."""),

addons/hr_recruitment/res_config_view.xml

@@ -2,17 +2,12 @@
 <openerp>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
+            <field name="state">open</field>
-            <field name="sequence">100</field>
         </record>
     </data>
     <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-
         <record id="view_hr_apll_config_settings" model="ir.ui.view">
             <field name="name">hr settings for recruitment</field>
             <field name="model">hr.config.settings</field>

addons/hr_timesheet/hr_timesheet.py

@@ -137,11 +137,13 @@ class hr_analytic_timesheet(osv.osv):
         if context is None:
             context = {}
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
-        if emp_id:
+        if not emp_id :
-            emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+            raise osv.except_osv(_('Warning!'), _('Please create an employee for this user, using the menu: Human Resources > Employees.'))
-            if emp.journal_id:
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
-                return emp.journal_id.id
+        if emp.journal_id:
-        return False
+            return emp.journal_id.id
+        else :
+            raise osv.except_osv(_('Warning!'), _('No analytic journal defined for \'%s\'.\nYou should assign an analytic journal on the employee form.')%(emp.name))
 
 
     _defaults = {

addons/hr_timesheet_sheet/__openerp__.py

@@ -27,27 +27,21 @@
     'sequence': 16,
     'summary': 'Timesheets, Attendances, Activities',
     'description': """
-This module helps you to easily record and validate timesheets and attendances within the same view.
+Record and validate timesheets and attendances easily
-====================================================================================================
+=====================================================
 
-    * It will maintain attendances and track (sign in/sign out) events.
+This application supplies a new screen enabling you to manage both attendances (Sign in/Sign out) and your work encoding (timesheet) by period. Timesheet entries are made by employees each day. At the end of the defined period, employees validate their sheet and the manager must then approve his team's entries. Periods are defined in the company forms and you can set them to run monthly or weekly.
-    * Track the timesheet lines.
 
-Other tabs contains statistics views to help you analyse your time or the time of your team:
+The complete timesheet validation process is:
---------------------------------------------------------------------------------------------
+---------------------------------------------
-    * Time spent by day (with attendances)
+* Draft sheet
-    * Time spent by project
+* Confirmation at the end of the period by the employee
-
+* Validation by the project manager
-This module also implements a complete timesheet validation process:
---------------------------------------------------------------------
-    * Draft sheet
-    * Confirmation at the end of the period by the employee
-    * Validation by the project manager
 
 The validation can be configured in the company:
 ------------------------------------------------
-    * Period size (day, week, month, year)
+* Period size (Day, Week, Month)
-    * Maximal difference between timesheet and attendances
+* Maximal difference between timesheet and attendances
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml

@@ -46,7 +46,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
+                    <button name="button_confirm" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" />
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" />

addons/hr_timesheet_sheet/i18n/ar.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -976,7 +976,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/bg.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/bs.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/ca.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -991,7 +991,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/cs.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/da.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/de.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ msgstr "Sie können nicht an einem anderen Tag ein oder aus cheken"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "Bestätigen zur Überprüfung"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1368,3 +1368,6 @@ msgstr "Journal"
 #~ "* Periodendauer des Unternehmens (Tag, Woche, Monat, Jahr)\n"
 #~ "* Maximal akzeptierte Abweichung zwischen Anwesenheit und Arbeitszeit u.a.\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Bestätigen zur Überprüfung"

addons/hr_timesheet_sheet/i18n/el.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -963,7 +963,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/es.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -990,7 +990,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/es_AR.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -959,7 +959,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/es_CR.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -1010,8 +1010,8 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "Propuesto al Director"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1363,3 +1363,6 @@ msgstr "Diario"
 #~ "* El tamaño del período (día, semana, mes, año)\n"
 #~ "* Diferencia máxima entre el parte de horas y de las visitas\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Propuesto al Director"

addons/hr_timesheet_sheet/i18n/es_EC.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -975,7 +975,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/et.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/fi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -978,8 +978,8 @@ 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"
+msgid "Submit to Manager"
-msgstr "Lähetetty esimiehelle"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1265,3 +1265,6 @@ msgstr "Loki"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Ei voida poistaa tuntilistoja joilla on läsnäoloja syötettynä"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Lähetetty esimiehelle"

addons/hr_timesheet_sheet/i18n/fr.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1016,8 +1016,8 @@ 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"
+msgid "Submit to Manager"
-msgstr "Soumettre au responsable"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1327,3 +1327,6 @@ msgstr "Journal"
 #~ "* Durée de la période (jour, semaine, mois, année)\n"
 #~ "* Différence maximale entre les feuilles de temps et les présences\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Soumettre au responsable"

addons/hr_timesheet_sheet/i18n/hr.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot

@@ -976,7 +976,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/hu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -127,7 +127,7 @@ msgstr "Munkaidő-kimutatás alapján"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Csoportosítás nap szerint"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
@@ -143,7 +143,7 @@ msgstr "Jóváhagyás"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Jóváhagyott"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -220,7 +220,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt /Gyűjtőkód"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -361,7 +361,7 @@ msgstr "Órák"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Csoportosítás hónap szerint"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -400,7 +400,7 @@ msgstr "Munka a feladaton"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Napi"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -467,7 +467,7 @@ msgstr "Megnyitja az Ön aktuális munkaidő-kimutatását"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Munkaidő kimutatást nem lehet duplikálni!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -493,6 +493,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Ahhoz, hogy munkaidő kimutatást lehessen létrehozni ennek a mukavállalónak, "
+"hozzá kell kapcsolni egy termékhez!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -502,7 +504,7 @@ msgstr "Bejelentkezés/Kijelentkezés"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Jóváhagyásra vár"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -528,7 +530,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Megjegyzés"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -694,7 +696,7 @@ msgstr "Vállalatok"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -706,7 +708,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "Nem jóváhagyott munkaidő-kimutatások"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
@@ -723,7 +725,7 @@ msgstr "Mennyiség"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Jóváhagyott munkaidő kimutatást nem lehet törölni!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -821,7 +823,7 @@ msgstr "Munkaidő-kimutatás megnyitása"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Csoportosítás év szerint"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -860,7 +862,7 @@ msgstr "Munkaidő-kimutatás keresése"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Jóváhagyott munkaidő kimutatások"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -914,7 +916,7 @@ msgstr "Feladattételeket mozgat a munkaidő-kimutatás sorba"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Összes jelenlét"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -992,7 +994,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/id.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/it.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -968,7 +968,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/ja.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -971,8 +971,8 @@ msgstr "今日とは別の日付でサインイン / サインアウトするこ
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "マネジャに提出済み"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1040,5 +1040,8 @@ msgstr "合計"
 msgid "Journal"
 msgstr "仕訳帳"
 
+#~ msgid "Submited to Manager"
+#~ msgstr "マネジャに提出済み"
+
 #~ msgid "My Timesheet"
 #~ msgstr "私の勤務表"

addons/hr_timesheet_sheet/i18n/ko.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/lt.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/lv.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/mn.po

@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ msgstr "Өнөөдрөөс өөр өдөрт нэвтрэх/гарах үйлд
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "Менежерт илгээгдсэн"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1305,3 +1305,6 @@ msgstr "Журнал"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Ирцийн бичлэгүүд бүртгэгдсэн цаг бүртгэлийг устгаж болохгүй !"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Менежерт илгээгдсэн"

addons/hr_timesheet_sheet/i18n/nl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1007,8 +1007,8 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "Verzonden naar de manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1350,3 +1350,6 @@ msgstr "Dagboek"
 #~ "* periode grootte (dag, week, maand, jaar)\n"
 #~ "* maximaal verschil tussen urenstaat en aanwezigheid\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Verzonden naar de manager"

addons/hr_timesheet_sheet/i18n/nl_BE.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/pl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -228,7 +228,7 @@ msgstr "Ostrzeżenie !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Zapis pracownika w karcie"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -314,7 +314,7 @@ msgstr "Nowe"
 #. 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 "Moje obecności w tygodniach"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -372,7 +372,7 @@ msgstr "Niedozwolona akcja !"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Manedżer projektu zatwierdza projekt"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -410,7 +410,7 @@ msgstr "Suma karty czasu pracy"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Znane obecności"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -449,6 +449,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Do utworzenia karty dla pracownika musisz w Pracowniku wybrać produkt jak "
+"np. 'Konsultant'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -476,7 +478,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Projekt"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
@@ -485,11 +487,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Do utworzenia karty dla pracownika musisz w Pracowniku wybrać produkt jak "
+"np. 'Konsultant'!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Wejście/Wyjście"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -604,23 +608,23 @@ msgstr "Data"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Zakres kart"
 
 #. 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 ""
+msgstr "Nie możesz modyfikować wpisów w potwierdzonych kartach"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
@@ -638,7 +642,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -659,7 +663,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -669,12 +673,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Firmy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Podsumowanie"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -697,7 +701,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
@@ -709,7 +713,7 @@ msgstr ""
 #: 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 ""
+msgstr "Konto ogólne"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
@@ -757,22 +761,23 @@ msgstr "Wykonano"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "Stan jest 'Projekt'."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nie możesz zmieniać zapisów w potwierdzonej/wykonanej karcie czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anulowanie"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Zatwierdzone"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -821,7 +826,7 @@ 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 ""
+msgstr "Analiza czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -842,7 +847,7 @@ msgstr "Pozycja karty czasu pracy"
 #: 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 ""
+msgstr "Produkt"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -864,7 +869,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -907,17 +912,17 @@ msgstr "Nieobecny(a)"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nazwa firmy musi być unikalna !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Pracownicy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -927,12 +932,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Potwierdzenie"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -944,7 +949,7 @@ msgstr "Współczynnik fakturowania"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Błąd Użytkownika"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
@@ -962,7 +967,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -992,7 +997,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Koszt"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -1014,12 +1019,12 @@ msgstr "Rok"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otwarte"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Do aprobaty"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -1029,7 +1034,7 @@ msgstr "Suma"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -1213,3 +1218,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Dozwolone różnice między wejściami/wyśjciami a wyliczeniami karty czasu "
 #~ "pracy dla jednej karty. Ustaw 0, jeśli nie chcesz żadnej kontroli."
+
+#~ msgid "My Timesheet"
+#~ msgstr "Moja karta czasu pracy"

addons/hr_timesheet_sheet/i18n/pt.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1002,8 +1002,8 @@ 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"
+msgid "Submit to Manager"
-msgstr "Submetido ao Gestor"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1350,3 +1350,6 @@ msgstr "Diário"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "?!?!?!?!?!?!?!?!?!?Não é possível eliminar Folha(s) que têm  !"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Submetido ao Gestor"

addons/hr_timesheet_sheet/i18n/pt_BR.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -250,7 +250,7 @@ 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
@@ -1008,8 +1008,8 @@ msgstr "Você não pode entrar/sair a partir de outra data que não hoje"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
-msgstr "Enviar ao Gerente"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1118,3 +1118,6 @@ msgstr "Diário"
 
 #~ msgid "My Timesheet"
 #~ msgstr "Minha Planilha de Horas"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Enviar ao Gerente"

addons/hr_timesheet_sheet/i18n/ro.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ 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"
+msgid "Submit to Manager"
-msgstr "Inmanat Managerului"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1181,3 +1181,6 @@ msgstr "Jurnal"
 
 #~ msgid "My Timesheet"
 #~ msgstr "Fisa mea de pontaj"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Inmanat Managerului"

addons/hr_timesheet_sheet/i18n/ru.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -972,7 +972,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/sl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet

addons/hr_timesheet_sheet/i18n/sq.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n"
+"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet