diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
| commit | 2bbdc47dc8d791cd502c8fc37ec9a5273ee10292 (patch) | |
| tree | bc8dbba2cad6cc3eb2d9b343b1552d53698b6987 /addons/analytic_user_function | |
| parent | d72386f18fff4abc3e7dcd2b9223a25028375a19 (diff) | |
| parent | 0d2d7ee5855ecbd463ccc6fd902f3af54c504410 (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/__openerp__.py | 8 | ||||
| -rw-r--r-- | addons/analytic_user_function/i18n/pt_BR.po | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index c2dcc3cc91b..1c1f345aca0 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -28,9 +28,13 @@ This module allows you to define what is the default function of a specific user on a given account. ==================================================================================================== -This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. +This is mostly used when a user encodes his timesheet: the values are retrieved +and the fields are auto-filled. But the possibility to change these values is +still available. -Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. +Obviously if no data has been recorded for the current account, the default +value is given as usual by the employee data so that this module is perfectly +compatible with older configurations. """, 'author': 'OpenERP SA', diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po index a0f4fe0d092..e2aa342be6b 100644 --- a/addons/analytic_user_function/i18n/pt_BR.po +++ b/addons/analytic_user_function/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2011-01-13 21:15+0000\n" -"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n" +"PO-Revision-Date: 2012-07-28 16:30+0000\n" +"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:11+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 @@ -30,6 +30,7 @@ msgstr "Tabela da relação entre usuários e produtos em uma conta analítica" #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." msgstr "" +"Você não pode modificar uma entrada que está como Confirmada/Concluída" #. module: analytic_user_function #: field:analytic.user.funct.grid,account_id:0 |