From c4476c4ad3d5953c5677127aa542f1ce61816f53 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 2 Jul 2012 17:46:46 +0530 Subject: [PATCH 001/187] [FIX] plugin:when create the partner from the thunderbird at that time create partner two times. bzr revid: tpa@tinyerp.com-20120702121646-bzom7r2buerwj5n7 --- addons/plugin/plugin_handler.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 700b9648237..2de179f6744 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -126,9 +126,10 @@ class plugin_handler(osv.osv_memory): partner_obj = self.pool.get('res.partner') dictcreate = dict(data) if partner_id == 0: - partner_id = partner_obj.create(cr, uid, {'name':dictcreate.get('name')}) - dictcreate['partner_id'] = partner_id - self.pool.get('res.partner').create(cr, uid, dictcreate) + partner_id = partner_obj.create(cr, uid, dictcreate) + else: + dictcreate['parent_id'] = partner_id + partner_obj.create(cr, uid, dictcreate) url = self._make_url(cr, uid, partner_id, 'res.partner') return ('res.partner', partner_id, url) From edfac27fac7696f61d616919ab74fd59dd9488d2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 2 Jul 2012 18:29:26 +0530 Subject: [PATCH 002/187] [IMP] improved code bzr revid: tpa@tinyerp.com-20120702125926-r9mtwclvb9mrm5f7 --- addons/plugin/plugin_handler.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 2de179f6744..a026eb61d4b 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -125,11 +125,9 @@ class plugin_handler(osv.osv_memory): """ partner_obj = self.pool.get('res.partner') dictcreate = dict(data) - if partner_id == 0: - partner_id = partner_obj.create(cr, uid, dictcreate) - else: + if partner_id: dictcreate['parent_id'] = partner_id - partner_obj.create(cr, uid, dictcreate) + partner_id = partner_obj.create(cr, uid, dictcreate) url = self._make_url(cr, uid, partner_id, 'res.partner') return ('res.partner', partner_id, url) From ee941671d2c391d085f153f6496bc755a900813d Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Thu, 19 Jul 2012 14:15:42 +0530 Subject: [PATCH 003/187] [FIX] account : Improve the code. lp bug: https://launchpad.net/bugs/1026434 fixed bzr revid: amb@tinyerp.com-20120719084542-la8jx5qxiefwoojr --- addons/account/wizard/account_move_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 66f634bd59f..a84c7f8eabb 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -99,7 +99,7 @@ class account_move_journal(osv.osv_memory): period = False if period_id: - period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name'] + period = period_pool.browse(cr, uid, [period_id], context=None)[0]['name'] period_string = _("Period: %s") % tools.ustr(period) open_string = _("Open") From 5c31f52c47c8205703a4da666a01916f9971b522 Mon Sep 17 00:00:00 2001 From: "Cristian Salamea (Gnuthink)" <> Date: Thu, 19 Jul 2012 17:49:45 +0530 Subject: [PATCH 004/187] [FIX]l10n_ec: Change The name of Author lp bug: https://launchpad.net/bugs/1026085 fixed bzr revid: dsi@tinyerp.com-20120719121945-nmad9m98t3q77tet --- addons/l10n_ec/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py index 9dd81606036..13d11f03b9d 100644 --- a/addons/l10n_ec/__openerp__.py +++ b/addons/l10n_ec/__openerp__.py @@ -27,7 +27,7 @@ This is the base module to manage the accounting chart for Ecuador in OpenERP. Accounting chart and localization for Ecuador. """, - 'author': 'OpenERP SA', + 'author': 'Gnuthink Co.Ltd.', 'depends': [ 'account', 'base_vat', From dd55d30961d370546267deafefc0ba614e728a0e Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 20 Jul 2012 11:35:06 +0530 Subject: [PATCH 005/187] [FIX] account : Improve the code lp bug: https://launchpad.net/bugs/1026434 fixed bzr revid: amb@tinyerp.com-20120720060506-clb6z56xa5tqzyy3 --- addons/account/wizard/account_move_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index a84c7f8eabb..ea2244edb15 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -99,7 +99,7 @@ class account_move_journal(osv.osv_memory): period = False if period_id: - period = period_pool.browse(cr, uid, [period_id], context=None)[0]['name'] + period = period_pool.browse(cr, uid, [period_id], context=context)[0]['name'] period_string = _("Period: %s") % tools.ustr(period) open_string = _("Open") From 7488a675b4d9a8e99cf2b9b25c194e114babcafb Mon Sep 17 00:00:00 2001 From: "Ravish Murari (OpenERP)" Date: Mon, 23 Jul 2012 16:56:17 +0530 Subject: [PATCH 006/187] [FIX] removed rest of the base_group_extended group from addons lp bug: https://launchpad.net/bugs/1027875 fixed bzr revid: rmu@tinyerp.com-20120723112617-h7um6wkj22martms --- addons/account/account_view.xml | 2 +- addons/crm_fundraising/crm_fundraising_view.xml | 2 +- addons/point_of_sale/point_of_sale_view.xml | 2 +- addons/purchase/report/purchase_report_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1e1f7b91851..e117d31212a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2593,7 +2593,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 9e67a4001a7..961ba2d6d3e 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -66,7 +66,7 @@ +
+ +
@@ -693,7 +695,7 @@ - + From f1a46cff591c8bc14fc0ad155fa0097a242fb499 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 16 Sep 2012 23:21:39 +0200 Subject: [PATCH 163/187] [IMP] better algo for image thumbnails bzr revid: fp@openerp.com-20120916212139-2qnvuwk6sppxnp99 --- openerp/tools/image.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/openerp/tools/image.py b/openerp/tools/image.py index 38997978326..e2b14f18d0d 100644 --- a/openerp/tools/image.py +++ b/openerp/tools/image.py @@ -20,6 +20,7 @@ ############################################################################## import io +import sys import StringIO from PIL import Image @@ -66,15 +67,18 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file # check image size: do not create a thumbnail if avoiding smaller images if avoid_if_small and image.size[0] <= size[0] and image.size[1] <= size[1]: return base64_source - # create a thumbnail: will resize and keep ratios, then sharpen for better looking result - image.thumbnail(size, Image.ANTIALIAS) - image.convert('RGB') - image = image.filter(ImageFilter.SHARPEN) - # create a transparent image for background - background = Image.new('RGBA', size, (255, 255, 255, 0)) - # past the resized image on the background - background.paste(image, ((size[0] - image.size[0]) / 2, (size[1] - image.size[1]) / 2)) - # return an encoded image + + if (float(image.size[0])/image.size[1]) > (float(size[0]) / size[1]): + ibox = (size[1] * image.size[0] / image.size[1] , size[1]) + deltax = max((size[1] * image.size[0] / image.size[1] - size[0]) / 2, 0) + deltay = 0 + else: + ibox = (size[0],size[0] * image.size[1] / image.size[0]) + deltax = 0 + deltay = max((size[0] * image.size[1] / image.size[0] - size[1]) / 2, 0) + + im2 = image.resize(ibox, Image.ANTIALIAS) + background = im2.crop((deltax, deltay, deltax+size[0], deltay+size[1])) background_stream = StringIO.StringIO() background.save(background_stream, filetype) return background_stream.getvalue().encode(encoding) @@ -157,3 +161,4 @@ def image_get_resized_images(base64_source, return_big=False, return_medium=True if return_small: return_dict[small_name] = image_resize_image_small(base64_source, avoid_if_small=avoid_resize_small) return return_dict + From cd644106f30d303738fdd0a04b9b15e5e4a33bbf Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 17 Sep 2012 04:38:01 +0000 Subject: [PATCH 164/187] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120917043801-c5hlomwn6boqewhb --- addons/hr_timesheet_sheet/i18n/ar.po | 6 +- addons/hr_timesheet_sheet/i18n/bg.po | 6 +- addons/hr_timesheet_sheet/i18n/bs.po | 6 +- addons/hr_timesheet_sheet/i18n/ca.po | 6 +- addons/hr_timesheet_sheet/i18n/cs.po | 6 +- addons/hr_timesheet_sheet/i18n/da.po | 6 +- addons/hr_timesheet_sheet/i18n/de.po | 11 +- addons/hr_timesheet_sheet/i18n/el.po | 6 +- addons/hr_timesheet_sheet/i18n/es.po | 6 +- addons/hr_timesheet_sheet/i18n/es_AR.po | 6 +- addons/hr_timesheet_sheet/i18n/es_CR.po | 11 +- addons/hr_timesheet_sheet/i18n/es_EC.po | 6 +- addons/hr_timesheet_sheet/i18n/et.po | 6 +- addons/hr_timesheet_sheet/i18n/fi.po | 11 +- addons/hr_timesheet_sheet/i18n/fr.po | 11 +- addons/hr_timesheet_sheet/i18n/hr.po | 6 +- addons/hr_timesheet_sheet/i18n/hu.po | 36 ++- addons/hr_timesheet_sheet/i18n/id.po | 6 +- addons/hr_timesheet_sheet/i18n/it.po | 6 +- addons/hr_timesheet_sheet/i18n/ja.po | 11 +- addons/hr_timesheet_sheet/i18n/ko.po | 6 +- addons/hr_timesheet_sheet/i18n/lt.po | 6 +- addons/hr_timesheet_sheet/i18n/lv.po | 6 +- addons/hr_timesheet_sheet/i18n/mn.po | 11 +- addons/hr_timesheet_sheet/i18n/nl.po | 11 +- addons/hr_timesheet_sheet/i18n/nl_BE.po | 6 +- addons/hr_timesheet_sheet/i18n/pl.po | 78 +++-- addons/hr_timesheet_sheet/i18n/pt.po | 11 +- addons/hr_timesheet_sheet/i18n/pt_BR.po | 13 +- addons/hr_timesheet_sheet/i18n/ro.po | 11 +- addons/hr_timesheet_sheet/i18n/ru.po | 6 +- addons/hr_timesheet_sheet/i18n/sl.po | 6 +- addons/hr_timesheet_sheet/i18n/sq.po | 6 +- addons/hr_timesheet_sheet/i18n/sv.po | 304 ++++++++++-------- addons/hr_timesheet_sheet/i18n/tlh.po | 6 +- addons/hr_timesheet_sheet/i18n/tr.po | 6 +- addons/hr_timesheet_sheet/i18n/uk.po | 6 +- addons/hr_timesheet_sheet/i18n/vi.po | 6 +- addons/hr_timesheet_sheet/i18n/zh_CN.po | 11 +- addons/hr_timesheet_sheet/i18n/zh_TW.po | 6 +- addons/l10n_multilang/i18n/pt_BR.po | 2 +- addons/purchase/i18n/pt_BR.po | 11 +- .../purchase_double_validation/i18n/es_EC.po | 72 +++++ 43 files changed, 472 insertions(+), 310 deletions(-) create mode 100644 addons/purchase_double_validation/i18n/es_EC.po diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po index 2a052980de2..3869c57ea26 100644 --- a/addons/hr_timesheet_sheet/i18n/ar.po +++ b/addons/hr_timesheet_sheet/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po index 89abb06674c..62ca751e32f 100644 --- a/addons/hr_timesheet_sheet/i18n/bg.po +++ b/addons/hr_timesheet_sheet/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po index a2307c645e2..6bcd34aaa57 100644 --- a/addons/hr_timesheet_sheet/i18n/bs.po +++ b/addons/hr_timesheet_sheet/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po index 826eefdc70b..86df1c28e42 100644 --- a/addons/hr_timesheet_sheet/i18n/ca.po +++ b/addons/hr_timesheet_sheet/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po index ae6eb00bfef..b6a5ae3ae0a 100644 --- a/addons/hr_timesheet_sheet/i18n/cs.po +++ b/addons/hr_timesheet_sheet/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po index b5654be2e0b..748e4fb9485 100644 --- a/addons/hr_timesheet_sheet/i18n/da.po +++ b/addons/hr_timesheet_sheet/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po index 11b9bcae304..e4205b91199 100644 --- a/addons/hr_timesheet_sheet/i18n/de.po +++ b/addons/hr_timesheet_sheet/i18n/de.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Bestätigen zur Überprüfung" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po index 905a8ae9cb3..2a3c0cf21ca 100644 --- a/addons/hr_timesheet_sheet/i18n/el.po +++ b/addons/hr_timesheet_sheet/i18n/el.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po index 429e38996b0..082c6549f61 100644 --- a/addons/hr_timesheet_sheet/i18n/es.po +++ b/addons/hr_timesheet_sheet/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po index 4266f7f8ef9..d720bcf5d93 100644 --- a/addons/hr_timesheet_sheet/i18n/es_AR.po +++ b/addons/hr_timesheet_sheet/i18n/es_AR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po index e2ef03fbd72..20bb3c1d615 100644 --- a/addons/hr_timesheet_sheet/i18n/es_CR.po +++ b/addons/hr_timesheet_sheet/i18n/es_CR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Propuesto al Director" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/es_EC.po b/addons/hr_timesheet_sheet/i18n/es_EC.po index 33b008073c8..bafedcd6692 100644 --- a/addons/hr_timesheet_sheet/i18n/es_EC.po +++ b/addons/hr_timesheet_sheet/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po index 29c44c0bd5c..25894b3f933 100644 --- a/addons/hr_timesheet_sheet/i18n/et.po +++ b/addons/hr_timesheet_sheet/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po index 876b518eb56..d5ca0abf51c 100644 --- a/addons/hr_timesheet_sheet/i18n/fi.po +++ b/addons/hr_timesheet_sheet/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Lähetetty esimiehelle" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po index 83cce2efe64..2ff2a369d15 100644 --- a/addons/hr_timesheet_sheet/i18n/fr.po +++ b/addons/hr_timesheet_sheet/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Soumettre au responsable" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po index 75c2a1e1b07..8c94c427a51 100644 --- a/addons/hr_timesheet_sheet/i18n/hr.po +++ b/addons/hr_timesheet_sheet/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po index 44d5534bd7f..edcb3e36762 100644 --- a/addons/hr_timesheet_sheet/i18n/hu.po +++ b/addons/hr_timesheet_sheet/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po index 2c7a4b49f7b..0a7328c69af 100644 --- a/addons/hr_timesheet_sheet/i18n/id.po +++ b/addons/hr_timesheet_sheet/i18n/id.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po index 7a23a5408a1..90c6a50f1a9 100644 --- a/addons/hr_timesheet_sheet/i18n/it.po +++ b/addons/hr_timesheet_sheet/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po index cc6fa798487..62d1437d431 100644 --- a/addons/hr_timesheet_sheet/i18n/ja.po +++ b/addons/hr_timesheet_sheet/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "マネジャに提出済み" +msgid "Submit to Manager" +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 "私の勤務表" diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po index 7b6e81618e7..d9d0d4a9746 100644 --- a/addons/hr_timesheet_sheet/i18n/ko.po +++ b/addons/hr_timesheet_sheet/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po index ca671af16e1..932eaec0f5e 100644 --- a/addons/hr_timesheet_sheet/i18n/lt.po +++ b/addons/hr_timesheet_sheet/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po index 5395251e4b2..567be361497 100644 --- a/addons/hr_timesheet_sheet/i18n/lv.po +++ b/addons/hr_timesheet_sheet/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po index cf336e89bf9..a78526df9be 100644 --- a/addons/hr_timesheet_sheet/i18n/mn.po +++ b/addons/hr_timesheet_sheet/i18n/mn.po @@ -27,8 +27,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Менежерт илгээгдсэн" +msgid "Submit to Manager" +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 "Менежерт илгээгдсэн" diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po index c7dcedf5594..c464eb8ee35 100644 --- a/addons/hr_timesheet_sheet/i18n/nl.po +++ b/addons/hr_timesheet_sheet/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Verzonden naar de manager" +msgid "Submit to 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" diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po index 5230f91d32e..33c451de44d 100644 --- a/addons/hr_timesheet_sheet/i18n/nl_BE.po +++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po index 3d77824b778..4498bc5b091 100644 --- a/addons/hr_timesheet_sheet/i18n/pl.po +++ b/addons/hr_timesheet_sheet/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po index dbf68c2b1b6..0f06fdbb4ab 100644 --- a/addons/hr_timesheet_sheet/i18n/pt.po +++ b/addons/hr_timesheet_sheet/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Submetido ao Gestor" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po index 8117e35f6fa..032def05d98 100644 --- a/addons/hr_timesheet_sheet/i18n/pt_BR.po +++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Enviar ao Gerente" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po index 728f0498135..7ed867aa36c 100644 --- a/addons/hr_timesheet_sheet/i18n/ro.po +++ b/addons/hr_timesheet_sheet/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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" -msgstr "Inmanat Managerului" +msgid "Submit to Manager" +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" diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po index 6ab0139e2ff..8990e9f74ab 100644 --- a/addons/hr_timesheet_sheet/i18n/ru.po +++ b/addons/hr_timesheet_sheet/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po index a397c5745e7..f276800468b 100644 --- a/addons/hr_timesheet_sheet/i18n/sl.po +++ b/addons/hr_timesheet_sheet/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po index 37b4c570707..9da314634f6 100644 --- a/addons/hr_timesheet_sheet/i18n/sq.po +++ b/addons/hr_timesheet_sheet/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:21+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po index 837606e71de..a8a62cdcd5c 100644 --- a/addons/hr_timesheet_sheet/i18n/sv.po +++ b/addons/hr_timesheet_sheet/i18n/sv.po @@ -13,15 +13,15 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0 msgid "Sheet" -msgstr "Sheet" +msgstr "Rapport" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 @@ -32,7 +32,7 @@ msgstr "Tjänst" #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 #, python-format msgid "No employee defined for your user !" -msgstr "No employee defined for your user !" +msgstr "Ingen anställd som definierats för ditt användarnamn!" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0 @@ -44,7 +44,7 @@ msgstr "Gruppera på..." #: field:hr_timesheet_sheet.sheet,total_attendance:0 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0 msgid "Total Attendance" -msgstr "Total Attendance" +msgstr "Total Närvaro" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -61,7 +61,7 @@ msgstr "Årets tidrapporter" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0 msgid "Task timesheet" -msgstr "" +msgstr "Uppgift tidrapport" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -80,7 +80,7 @@ msgstr "" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "March" -msgstr "mars" +msgstr "Mars" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,cost:0 @@ -107,22 +107,22 @@ msgstr "Bolag" #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0 #: view:timesheet.report:0 msgid "Timesheet" -msgstr "Timesheet" +msgstr "Tidrapport" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Set to Draft" -msgstr "Set to Draft" +msgstr "Satt till utkast" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0 msgid "Date to" -msgstr "Date to" +msgstr "Datum till" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0 msgid "Based on the timesheet" -msgstr "" +msgstr "Baserat på tidrapporten" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 @@ -133,7 +133,7 @@ msgstr "Gruppera på dagen i datumet" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615 #, python-format msgid "You cannot modify an entry in a confirmed timesheet!" -msgstr "" +msgstr "Du kan inte ändra en post i en Bekräftad tidrapport!" #. module: hr_timesheet_sheet #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0 @@ -148,7 +148,7 @@ msgstr "Godkänd" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Present" -msgstr "Present" +msgstr "Närvarande" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 @@ -162,12 +162,14 @@ msgid "" "In order to create a timesheet for this employee, you must assign the " "employee to an analytic journal!" msgstr "" +"För att skapa en tidrapport för den anställde måste du koppla den anställde " +"till en analytisk journal!" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0 msgid "Refuse" -msgstr "Refuse" +msgstr "Avslå" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619 @@ -176,6 +178,7 @@ msgstr "Refuse" msgid "" "You cannot enter an attendance date outside the current timesheet dates!" msgstr "" +"Du kan inte ange ett närvaro datum utanför nuvarande tidrapport datum!" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open @@ -187,11 +190,17 @@ msgid "" "the user and can be validated by his manager. If required, as defined on the " "project, you can generate the invoices based on the timesheet." msgstr "" +"Min tidrapport öppnar din tidrapport så att du kan boka aktiviteter i " +"systemet. Från samma formulär kan du registrera dina närvaro (Logga in / ut) " +"och beskriva den arbetstid som gjorts på de olika projekten. Vid slutet av " +"perioden som anges i företaget, är tidrapporten bekräftas av användaren och " +"kan valideras av sin chef. Om det behövs, enligt definitionen i projektet, " +"kan du skapa fakturor baserade på tidrapporten." #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Difference" -msgstr "Total Difference" +msgstr "Totalt Skillnad" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 @@ -201,17 +210,17 @@ msgstr " Månad-1 " #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "My Departments Timesheet" -msgstr "" +msgstr "Mina avdelningstidrapporter" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day msgid "Timesheet by Day" -msgstr "Timesheet by Day" +msgstr "Tidrapport för dag" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,name:0 msgid "Project / Analytic Account" -msgstr "" +msgstr "Projekt / Analytisk konto" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0 @@ -222,29 +231,29 @@ msgstr "Granskning" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274 #, python-format msgid "Warning !" -msgstr "Warning !" +msgstr "Varning !" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0 msgid "Employee's timesheet entry" -msgstr "" +msgstr "Arbetstagarens tidrapport start" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0 #: view:timesheet.report:0 field:timesheet.report,account_id:0 msgid "Analytic Account" -msgstr "Analytic Account" +msgstr "Analytiskt Konto" #. module: hr_timesheet_sheet #: field:timesheet.report,nbr:0 msgid "#Nbr" -msgstr "" +msgstr "Antal" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_from:0 #: field:timesheet.report,date_from:0 msgid "Date from" -msgstr "Date from" +msgstr "Datum från" #. module: hr_timesheet_sheet #: view:timesheet.report:0 @@ -264,24 +273,24 @@ msgstr "Tidrapporter" #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0 #: view:timesheet.report:0 selection:timesheet.report,state:0 msgid "Confirmed" -msgstr "Confirmed" +msgstr "Bekräftad" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.day,total_attendance:0 #: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0 msgid "Attendance" -msgstr "Attendance" +msgstr "Närvaro" #. module: hr_timesheet_sheet #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0 msgid "Confirm" -msgstr "Confirm" +msgstr "Bekräfta" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,timesheet_ids:0 msgid "Timesheet lines" -msgstr "Timesheet lines" +msgstr "Tidrapportrader" #. module: hr_timesheet_sheet #: constraint:res.company:0 @@ -297,7 +306,7 @@ msgstr "Status" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0 msgid "State is 'confirmed'." -msgstr "" +msgstr "Status är 'Bekräftad'." #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,employee_id:0 @@ -308,12 +317,12 @@ msgstr "Anställd" #: selection:hr_timesheet_sheet.sheet,state:0 #: selection:timesheet.report,state:0 msgid "New" -msgstr "New" +msgstr "Ny" #. 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 "Min totala närvaro per vecka" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241 @@ -331,23 +340,23 @@ msgstr "" #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 #, python-format msgid "Error !" -msgstr "Error !" +msgstr "Fel !" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,total:0 msgid "Total Time" -msgstr "Total Time" +msgstr "Total Tid" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet msgid "Timesheet Lines" -msgstr "Timesheet Lines" +msgstr "Tidrapportrader" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 msgid "Hours" -msgstr "timmar" +msgstr "Timmar" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 @@ -365,17 +374,17 @@ msgstr "" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457 #, python-format msgid "Invalid action !" -msgstr "Invalid action !" +msgstr "Ogiltig åtgärd !" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0 msgid "The project manager validates the timesheets." -msgstr "" +msgstr "Projektledaren validerar tidrapporter." #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "July" -msgstr "juli" +msgstr "Juli" #. module: hr_timesheet_sheet #: view:res.company:0 @@ -385,7 +394,7 @@ msgstr "Konfiguration" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0 msgid "Work on Task" -msgstr "" +msgstr "Arbeta från uppgift" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -395,7 +404,7 @@ msgstr "Daglig" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,quantity:0 msgid "#Quantity" -msgstr "" +msgstr "Antal" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_timesheet:0 @@ -403,22 +412,22 @@ msgstr "" #: view:hr_timesheet_sheet.sheet.day:0 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0 msgid "Total Timesheet" -msgstr "Total Timesheet" +msgstr "Total Tidrapport" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Available Attendance" -msgstr "" +msgstr "Tillgänglig Närvaro" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Sign In" -msgstr "Sign In" +msgstr "Logga in" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0 msgid "#Total Timesheet" -msgstr "" +msgstr "# Totalt Tidrapport" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open @@ -428,17 +437,17 @@ msgstr "hr.timesheet.current.open" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Go to:" -msgstr "Go to:" +msgstr "Gå till:" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "September" -msgstr "september" +msgstr "September" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "December" -msgstr "december" +msgstr "December" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248 @@ -447,17 +456,19 @@ msgid "" "In order to create a timesheet for this employee, you must link the employee " "to a product, like 'Consultant'!" msgstr "" +"För att skapa en tidrapport för den anställde måste du länka den anställde " +"till en produkt, som t.ex 'konsult'!" #. module: hr_timesheet_sheet #: view:hr.timesheet.current.open:0 msgid "It will open your current timesheet" -msgstr "" +msgstr "Det kommer att öppna din nuvarande tidrapport" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241 #, python-format msgid "You cannot duplicate a timesheet!" -msgstr "" +msgstr "Du kan inte kopiera en tidrapport!" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0 @@ -469,12 +480,12 @@ msgstr "Månad" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,total_diff:0 msgid "#Total Diff" -msgstr "" +msgstr "# Total Diff" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "In Draft" -msgstr "" +msgstr "Som utkast" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261 @@ -483,16 +494,18 @@ msgid "" "In order to create a timesheet for this employee, you must link the employee " "to a product!" msgstr "" +"För att skapa en tidrapport för den anställde måste du länka den anställde " +"till en produkt!" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0 msgid "Sign in/out" -msgstr "" +msgstr "Logga in / ut" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "Waiting Approval" -msgstr "" +msgstr "Väntar på godkännande" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0 @@ -505,16 +518,18 @@ msgid "" "The timesheet line represents the time spent by the employee on a specific " "service provided." msgstr "" +"Tidrapportenraden representerar den tid som den anställde lagt ner på " +"specifik tjänst." #. module: hr_timesheet_sheet #: constraint:hr_timesheet_sheet.sheet:0 msgid "You must select a Current date which is in the timesheet dates !" -msgstr "" +msgstr "Du måste välja en aktuell datum som finns i tidrapporten!" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,name:0 msgid "Note" -msgstr "" +msgstr "Anteckning" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all @@ -524,36 +539,40 @@ msgid "" "your employees. You can group them by specific selection criteria thanks to " "the search tool." msgstr "" +"Rapporten utför analys av tidrapporter som skapats av din personal i " +"systemet. Det låter dig ha full överblick över poster som görs av dina " +"anställda. Du kan gruppera dem genom specifika urvalskriterier tack vare " +"sökverktyget." #. module: hr_timesheet_sheet #: view:timesheet.report:0 selection:timesheet.report,state:0 msgid "Draft" -msgstr "Draft" +msgstr "Utkast" #. module: hr_timesheet_sheet #: field:res.company,timesheet_max_difference:0 msgid "Timesheet allowed difference(Hours)" -msgstr "" +msgstr "Tidrapport tillåten skillnad (timmar)" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0 msgid "The invoice is created based on the timesheet." -msgstr "" +msgstr "Fakturan skapas utifrån tidrapporten." #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0 msgid "Draft Timesheet" -msgstr "" +msgstr "Utkast av Tidrapport" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Week" -msgstr "Week" +msgstr "Vecka" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "August" -msgstr "" +msgstr "Augusti" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -563,24 +582,24 @@ msgstr "Godkänn" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "June" -msgstr "juni" +msgstr "Juni" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Current Status" -msgstr "Current Status" +msgstr "Nuvarande Status" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646 #, python-format msgid "You cannot modify an entry in a confirmed timesheet !" -msgstr "You cannot modify an entry in a confirmed timesheet !" +msgstr "Du kan inte ändra en post i en bekräftad tidrapport!" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day msgid "Timesheets by Period" -msgstr "" +msgstr "Tidrapporter efter period" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0 @@ -592,17 +611,17 @@ msgstr "Användare" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account msgid "Timesheet by Account" -msgstr "Timesheet by Account" +msgstr "Tidrapport per Konto" #. module: hr_timesheet_sheet #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0 msgid "Date" -msgstr "Date" +msgstr "Datum" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "November" -msgstr "november" +msgstr "November" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 @@ -612,18 +631,18 @@ msgstr "Utökade filter..." #. module: hr_timesheet_sheet #: field:res.company,timesheet_range:0 msgid "Timesheet range" -msgstr "" +msgstr "Tidrapport område" #. 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 "You can not modify an entry in a confirmed timesheet !" +msgstr "Du kan inte ändra en post i en bekräftad tidrapport!" #. module: hr_timesheet_sheet #: view:board.board:0 msgid "My Total Attendance By Week" -msgstr "" +msgstr "Min totala närvaro per vecka" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259 @@ -632,11 +651,13 @@ msgid "" "You cannot have 2 timesheets that overlaps!\n" "You should use the menu 'My Timesheet' to avoid this problem." msgstr "" +"Du kan inte ha 2 tidrapporter som överlappar!\n" +"Du bör använda menyn 'Min tidrapport' för att undvika detta problem." #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "October" -msgstr "oktober" +msgstr "Oktober" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form @@ -645,6 +666,9 @@ msgid "" "on a project (i.e. an analytic account) thus generating costs in the " "analytic account concerned." msgstr "" +"Kontrollera dina tidrapporter för en viss period. Du kan också koda tid på " +"ett projekt (dvs. ett analytiskt konto) vilket genererar kostnader i " +"analytiska kontot i fråga." #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237 @@ -653,26 +677,28 @@ msgid "" "The timesheet cannot be validated as it does not contain an equal number of " "sign ins and sign outs!" msgstr "" +"Tidrapporten kan inte valideras, eftersom den inte innehåller lika många " +"inloggningar och utloggningar." #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "January" -msgstr "januari" +msgstr "Januari" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0 msgid "The employee signs in and signs out." -msgstr "" +msgstr "De anställdas inloggningar och utloggningar." #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_res_company msgid "Companies" -msgstr "Bolag" +msgstr "Företag" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Summary" -msgstr "" +msgstr "Sammanfattning" #. module: hr_timesheet_sheet #: constraint:hr_timesheet_sheet.sheet:0 @@ -680,17 +706,19 @@ msgid "" "You cannot have 2 timesheets that overlaps !\n" "Please use the menu 'My Current Timesheet' to avoid this problem." msgstr "" +"Du kan inte ha 2 tidrapporter som överlappar! \n" +"Var god använd menyn 'Min aktuella Tidrapport' för att undvika detta problem." #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Unvalidated Timesheets" -msgstr "Unvalidated Timesheets" +msgstr "Icke validerade Tidrapporter" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457 #, python-format msgid "You cannot delete a timesheet which have attendance entries!" -msgstr "" +msgstr "Du kan inte ta bort en tidrapport som har närvaro poster!" #. module: hr_timesheet_sheet #: field:hr.timesheet.report,quantity:0 @@ -701,7 +729,7 @@ msgstr "Antal" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455 #, python-format msgid "You cannot delete a timesheet which is already confirmed!" -msgstr "" +msgstr "Du kan inte ta bort en tidrapport som redan bekräftasts!" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0 @@ -712,12 +740,12 @@ msgstr "Huvudkonton" #. module: hr_timesheet_sheet #: help:res.company,timesheet_range:0 msgid "Periodicity on which you validate your timesheets." -msgstr "" +msgstr "Periodicitet som du validerar dina tidrapporter." #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Search Account" -msgstr "" +msgstr "Sök Konto" #. module: hr_timesheet_sheet #: help:res.company,timesheet_max_difference:0 @@ -725,6 +753,8 @@ msgid "" "Allowed difference in hours between the sign in/out and the timesheet " "computation for one sheet. Set this to 0 if you do not want any control." msgstr "" +"Tillåten skillnad i timmar mellan Logga in / ut och tidrapportberäkning för " +"en tidrapport. Ställ den här till 0 om du inte vill ha någon kontroll." #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0 @@ -737,7 +767,7 @@ msgstr "Period" #: selection:res.company,timesheet_range:0 view:timesheet.report:0 #: field:timesheet.report,day:0 msgid "Day" -msgstr "Day" +msgstr "Dag" #. module: hr_timesheet_sheet #: view:hr.timesheet.current.open:0 @@ -750,58 +780,58 @@ msgstr "My Current Timesheet" #. module: hr_timesheet_sheet #: view:timesheet.report:0 selection:timesheet.report,state:0 msgid "Done" -msgstr "Done" +msgstr "Klar" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0 msgid "State is 'draft'." -msgstr "" +msgstr "Statusen är 'utkast'." #. module: hr_timesheet_sheet #: constraint:hr.analytic.timesheet:0 msgid "You cannot modify an entry in a Confirmed/Done timesheet !." -msgstr "" +msgstr "Du kan inte ändra en post i en Bekräftad / Klar tidrapport!." #. module: hr_timesheet_sheet #: view:hr.timesheet.current.open:0 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0 msgid "Validated" -msgstr "" +msgstr "Validerad" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0 msgid "Invoice on Work" -msgstr "Invoice on Work" +msgstr "Fakturera mot arbete" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 msgid "Timesheet in current month" -msgstr "" +msgstr "Tidrapport i innevarande månad" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Timesheet by Accounts" -msgstr "Timesheet by Accounts" +msgstr "Tidrapport per konton" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51 #, python-format msgid "Open Timesheet" -msgstr "" +msgstr "Öppna Tidrapport" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 view:timesheet.report:0 msgid "Group by year of date" -msgstr "" +msgstr "Gruppera efter år" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0 msgid "State is 'validated'." -msgstr "" +msgstr "Status 'validerad'." #. module: hr_timesheet_sheet #: help:hr_timesheet_sheet.sheet,state:0 @@ -813,136 +843,142 @@ msgid "" "* The 'Done' state is used when users timesheet is accepted by his/her " "senior." msgstr "" +" * Tillståndet 'Utkast' används när en användare skapar en ny och obekräftad " +"tidrapport.\n" +" * Tillståndet 'Bekräftad' används för att bekräfta tidrapporten för " +"användaren.\n" +" * Tillståndet 'Klar' används när användarens tidrapport accepterats av hans " +"eller hennes chef." #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all msgid "Timesheet Analysis" -msgstr "" +msgstr "Tidrapport analys" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Search Timesheet" -msgstr "" +msgstr "Sök Tidrapport" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Confirmed Timesheets" -msgstr "" +msgstr "Bekräftade Tidrapporter" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet msgid "Timesheet Line" -msgstr "Timesheet Line" +msgstr "Tidrapportrader" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0 #: view:timesheet.report:0 field:timesheet.report,product_id:0 msgid "Product" -msgstr "" +msgstr "Produkt" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 #: field:hr_timesheet_sheet.sheet,attendances_ids:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance msgid "Attendances" -msgstr "Attendances" +msgstr "Närvaro" #. module: hr_timesheet_sheet #: field:hr.timesheet.report,name:0 field:timesheet.report,name:0 msgid "Description" -msgstr "Description" +msgstr "Beskrivnig" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0 msgid "The employee periodically confirms his own timesheets." -msgstr "" +msgstr "Den anställde bekräftar periodvis sina egna tidrapporter." #. 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 msgid "Defines the work summary of task" -msgstr "" +msgstr "Definierar arbetssammanfattningen av uppgiften" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Sign Out" -msgstr "Sign Out" +msgstr "Logga ut" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0 msgid "Moves task entry into the timesheet line" -msgstr "" +msgstr "Flyttar uppgiftrad till tidrapportrad" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Attendances" -msgstr "" +msgstr "Totalt närvaro" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all msgid "Timesheet Sheet Analysis" -msgstr "" +msgstr "Tidrapport Rapportanalys" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_difference:0 #: field:hr_timesheet_sheet.sheet,total_difference_day:0 #: field:hr_timesheet_sheet.sheet.day,total_difference:0 msgid "Difference" -msgstr "Difference" +msgstr "Skillnad" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Absent" -msgstr "Absent" +msgstr "Frånvarande" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "February" -msgstr "" +msgstr "Februari" #. module: hr_timesheet_sheet #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Företagsnamnet måste vara unikt!" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Employees" -msgstr "" +msgstr "Anställda:" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0 msgid "Information of time spent on a service" -msgstr "" +msgstr "Information om tid spenderat på en tjänst" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0 msgid "April" -msgstr "" +msgstr "April" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0 msgid "Confirmation" -msgstr "" +msgstr "Bekräftelse" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0 msgid "Invoice rate" -msgstr "Invoice rate" +msgstr "Fakturakostnad" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639 #, python-format msgid "UserError" -msgstr "UserError" +msgstr "Användarfel" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250 @@ -951,27 +987,29 @@ msgid "" "In order to create a timesheet for this employee, you must assign the " "employee to an analytic journal, like 'Timesheet'!" msgstr "" +"För att skapa en tidrapport för den anställde måste du tilldela den " +"anställde till en analytisk journal, som 'Tidrapport'!" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318 #, python-format msgid "You cannot sign in/sign out from an other date than today" -msgstr "" +msgstr "Du kan inte logga in / logga ut från en annan tidpunkt än i dag" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 -msgid "Submited to Manager" +msgid "Submit to Manager" msgstr "" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,account_ids:0 msgid "Analytic accounts" -msgstr "Analytic accounts" +msgstr "Analytiska Konton" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,to_invoice:0 msgid "Type of Invoicing" -msgstr "" +msgstr "Typ av fakturering" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246 @@ -981,53 +1019,55 @@ msgid "" "In order to create a timesheet for this employee, you must assign it to a " "user!" msgstr "" +"För att skapa en tidrapport för den anställde måste du tilldela den till en " +"användare!" #. module: hr_timesheet_sheet #: view:timesheet.report:0 field:timesheet.report,total_attendance:0 msgid "#Total Attendance" -msgstr "" +msgstr "# Total Närvaro" #. module: hr_timesheet_sheet #: field:hr.timesheet.report,cost:0 msgid "Cost" -msgstr "" +msgstr "Kostnad" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_current:0 #: field:timesheet.report,date_current:0 msgid "Current date" -msgstr "Current date" +msgstr "Aktuellt datum" #. module: hr_timesheet_sheet #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0 msgid "Hr Timesheet" -msgstr "" +msgstr "HR Tidrapport" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0 #: view:timesheet.report:0 field:timesheet.report,year:0 msgid "Year" -msgstr "Year" +msgstr "År" #. module: hr_timesheet_sheet #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0 msgid "Open" -msgstr "" +msgstr "Öppna" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "To Approve" -msgstr "" +msgstr "Att godkänna" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Total" -msgstr "Total" +msgstr "Totalt" #. module: hr_timesheet_sheet #: field:hr.timesheet.report,journal_id:0 msgid "Journal" -msgstr "" +msgstr "Journal" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" @@ -1230,3 +1270,9 @@ msgstr "" #~ msgid "My Department's Timesheet to Validate" #~ msgstr "My Department's Timesheet to Validate" + +#~ msgid "My Timesheet" +#~ msgstr "Min tidrapport" + +#~ msgid "Submited to Manager" +#~ msgstr "Lämnas till chef" diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po index 9593c5853a3..3ae29dc9a28 100644 --- a/addons/hr_timesheet_sheet/i18n/tlh.po +++ b/addons/hr_timesheet_sheet/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po index 2c35482fa7c..80ec9301b9d 100644 --- a/addons/hr_timesheet_sheet/i18n/tr.po +++ b/addons/hr_timesheet_sheet/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po index d13830ab51c..acdf2cce77a 100644 --- a/addons/hr_timesheet_sheet/i18n/uk.po +++ b/addons/hr_timesheet_sheet/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po index 54bd912768d..f8f3e556738 100644 --- a/addons/hr_timesheet_sheet/i18n/vi.po +++ b/addons/hr_timesheet_sheet/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po index 07cae2bc952..52a003b6f05 100644 --- a/addons/hr_timesheet_sheet/i18n/zh_CN.po +++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0 @@ -966,8 +966,8 @@ msgstr "你只能做今天的签入/签出" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 -msgid "Submited to Manager" -msgstr "提交给经理" +msgid "Submit to Manager" +msgstr "" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,account_ids:0 @@ -1285,3 +1285,6 @@ msgstr "账簿" #, python-format #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !" #~ msgstr "无法删除这记工单因为它有考勤记录！" + +#~ msgid "Submited to Manager" +#~ msgstr "提交给经理" diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po index 1db56103ed9..cdddcb35d18 100644 --- a/addons/hr_timesheet_sheet/i18n/zh_TW.po +++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\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 diff --git a/addons/l10n_multilang/i18n/pt_BR.po b/addons/l10n_multilang/i18n/pt_BR.po index 87490221c5c..6382de88eb0 100644 --- a/addons/l10n_multilang/i18n/pt_BR.po +++ b/addons/l10n_multilang/i18n/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-16 04:39+0000\n" +"X-Launchpad-Export-Date: 2012-09-17 04:38+0000\n" "X-Generator: Launchpad (build 15944)\n" #. module: l10n_multilang diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index 8f2cccb110b..0e39eab89a8 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-21 16:16+0000\n" -"Last-Translator: Luciano Schirmer (IG-Tech) \n" +"PO-Revision-Date: 2012-09-16 11:51+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\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-09-07 04:56+0000\n" -"X-Generator: Launchpad (build 15914)\n" +"X-Launchpad-Export-Date: 2012-09-17 04:37+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -1200,7 +1201,7 @@ msgstr "Calcular" #. module: purchase #: view:stock.picking:0 msgid "Incoming Shipments Available" -msgstr "Entregas Disponíveis" +msgstr "Recebimentos Disponíveis" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat diff --git a/addons/purchase_double_validation/i18n/es_EC.po b/addons/purchase_double_validation/i18n/es_EC.po new file mode 100644 index 00000000000..6e219bbddcf --- /dev/null +++ b/addons/purchase_double_validation/i18n/es_EC.po @@ -0,0 +1,72 @@ +# Spanish (Ecuador) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:37+0000\n" +"PO-Revision-Date: 2012-09-17 04:20+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Ecuador) \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-17 04:38+0000\n" +"X-Generator: Launchpad (build 15944)\n" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "Purchase Application Configuration" +msgstr "Configuración de la aplicación de compras" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "Define minimum amount after which puchase is needed to be validated." +msgstr "" +"Defina la mínima cantidad a partir de la cual la compra requiere ser " +"validada." + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "title" +msgstr "título" + +#. module: purchase_double_validation +#: field:purchase.double.validation.installer,config_logo:0 +msgid "Image" +msgstr "Imagen" + +#. module: purchase_double_validation +#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount +#: view:purchase.double.validation.installer:0 +msgid "Configure Limit Amount for Purchase" +msgstr "Configurar monto límite de compra" + +#. module: purchase_double_validation +#: view:board.board:0 +#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting +msgid "Purchase Order Waiting Approval" +msgstr "Orden de compra esperando aprobación" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "res_config_contents" +msgstr "Configurar Contenidos" + +#. module: purchase_double_validation +#: help:purchase.double.validation.installer,limit_amount:0 +msgid "Maximum amount after which validation of purchase is required." +msgstr "Importe maximo a partir del cual se requiere validar la compra." + +#. module: purchase_double_validation +#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer +msgid "purchase.double.validation.installer" +msgstr "Instalador Componente Doble validación en Compra" + +#. module: purchase_double_validation +#: field:purchase.double.validation.installer,limit_amount:0 +msgid "Maximum Purchase Amount" +msgstr "Importe máximo de compra" From a0f23eb60b5cbd352bc5dbecd81bc2e098607df3 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Mon, 17 Sep 2012 10:10:17 +0200 Subject: [PATCH 165/187] [FIX] anonymization: raise a good descriptive error when the state is 'unstable' bzr revid: olt@tinyerp.com-20120917081017-s15mm36ppvs4lfxc --- addons/anonymization/anonymization.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 47e168a12b8..6b6db168a4f 100644 --- a/addons/anonymization/anonymization.py +++ b/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 ? - raise + msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \ + " 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) From fabf4971aaaebb03d3bc7c582b5acb68082c0a2c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 10:14:51 +0200 Subject: [PATCH 166/187] [FIX] timesheet_sheet should not crash anymmore when tests are performed at 23:59 bzr revid: fp@tinyerp.com-20120917081451-ugk1qi0le22kn44n --- addons/hr_attendance/hr_attendance.py | 2 +- .../test/test_hr_timesheet_sheet.yml | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index d3bc79bda1a..8fdd2928fe6 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/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 = { diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index 99705b07a39..070079a4b80 100644 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml @@ -13,7 +13,7 @@ product_id: product.product_product_consultant journal_id: hr_timesheet.analytic_journal - - I create my current timesheet for employee "Quentin Paolinon". + I create a timesheet for employee "Quentin Paolinon". - !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: date_current: !eval time.strftime('%Y-%m-%d') @@ -23,13 +23,17 @@ user_id: base.user_demo employee_id: 'hr.employee_qdp' - - Now, at the time of login, I create Attendances and perform "Sign In" action. + Quentin "Sign In" at around 9am. - - !python {model: hr_timesheet_sheet.sheet}: | - self.attendance_action_change(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {}) - task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0] - task_ids = self.browse(cr, uid, task_work, context) - assert task_ids.state == "draft", "I State In Timesheet" + !record {model: hr.attendance, id: hr_attendance_1}: + action: sign_in + employee_id: 'hr.employee_qdp' + name: !eval datetime.now().strftime('%Y-%m-%d 09:%M:%S') +- + I test that Quentin in signed in +- + !assert {model: hr.employee, id: hr.employee_qdp}: + - state == 'present' - I want to check attendance and work of yesterday. I click on <- button. - @@ -57,10 +61,10 @@ - At the time of logout, I create attendance and perform "Sign Out". - - !record {model: hr.attendance, id: hr_attendance_1}: + !record {model: hr.attendance, id: hr_attendance_2}: action: sign_out employee_id: 'hr.employee_qdp' - name: !eval (datetime.now() + timedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S') + name: !eval datetime.now().strftime('%Y-%m-%d 17:30:00') - I create Timesheet Entry for time spend on today work. - @@ -103,10 +107,10 @@ general_account_id: account.a_expense journal_id: hr_timesheet.analytic_journal - - I set an allowed difference of 25 hours + I set an allowed difference of 1 hour - !record {model: res.company, id: base.main_company}: - timesheet_max_difference: 25.00 + timesheet_max_difference: 1.00 - I tried again to confirm the timesheet after modification. - From 46f7aa283bcc4173718e0b1c518ef17ba4c5449a Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 17 Sep 2012 11:41:12 +0200 Subject: [PATCH 167/187] [IMP] code cleaning bzr revid: abo@openerp.com-20120917094112-uahrew8q0jz6aqo3 --- addons/account/wizard/account_move_journal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index d1353049b72..d87e4d04a0c 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -92,14 +92,14 @@ class account_move_journal(osv.osv_memory): journal = False if journal_id: - journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name'] + journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).name journal_string = _("Journal: %s") % tools.ustr(journal) else: journal_string = _("Journal: All") period = False if period_id: - period = period_pool.browse(cr, uid, [period_id], context=context)[0]['name'] + period = period_pool.browse(cr, uid, period_id, context=context).name period_string = _("Period: %s") % tools.ustr(period) open_string = _("Open") From 29ff1bf82aba1274641bf35d5f3cf53bb751ffa4 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 17 Sep 2012 16:33:46 +0530 Subject: [PATCH 168/187] [IMP] Improve code for return value of selection field. bzr revid: bth@tinyerp.com-20120917110346-0daw7ho3y31zbpu3 --- addons/web_graph/controllers/graph.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py index f6c1343c042..1da5e3bc91f 100644 --- a/addons/web_graph/controllers/graph.py +++ b/addons/web_graph/controllers/graph.py @@ -53,6 +53,9 @@ class GraphView(View): if fields[field]['type']=='many2one': data = data and data[1] if tick: + if fields[field]['type']=='selection': + d = dict(fields[field]['selection']) + data = d[data] return ticks.setdefault(data, len(ticks)) return data or 0 From 06852d994b287e3af74a629a8feb55ae6b797f79 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 17 Sep 2012 14:09:26 +0200 Subject: [PATCH 169/187] [FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr --- addons/point_of_sale/point_of_sale.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 95b54b6baed..590718b48f0 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -314,9 +314,13 @@ class pos_session(osv.osv): # define some cash journal if no payment method exists if not pos_config.journal_ids: - cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context) + journal_proxy = self.pool.get('account.journal') + cashids = journal_proxy.search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context) if not cashids: - cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user','=',True)], context=context) + cashids = journal_proxy.search(cr, uid, [('type', '=', 'cash')], context=context) + if not cashids: + cashids = journal_proxy.search(cr, uid, [('journal_user','=',True)], context=context) + jobj.write(cr, uid, [pos_config.id], {'journal_ids': [(6,0, cashids)]}) From 1d8007f03c5de0f3a660b4eb61542b1582f8eebd Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 17 Sep 2012 14:28:21 +0200 Subject: [PATCH 170/187] [FIX] an error from the last merge bzr revid: abo@openerp.com-20120917122821-0kfcipo5nw5gps08 --- .../crm_fundraising_view.xml.THIS | 224 ------------------ .../project_timesheet_data.xml.THIS | 20 -- 2 files changed, 244 deletions(-) delete mode 100644 addons/crm_fundraising/crm_fundraising_view.xml.THIS delete mode 100644 addons/project_timesheet/project_timesheet_data.xml.THIS diff --git a/addons/crm_fundraising/crm_fundraising_view.xml.THIS b/addons/crm_fundraising/crm_fundraising_view.xml.THIS deleted file mode 100644 index 961ba2d6d3e..00000000000 --- a/addons/crm_fundraising/crm_fundraising_view.xml.THIS +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - Fundraising Categories - crm.case.categ - form - - [('object_id.model', '=', 'crm.fundraising')] - - Manage and define the fund raising categories you want to be maintained in the system. - - - - - - - - Fundraising Stages - crm.case.stage - form - - {'search_default_fundraising':1} - Create and manage fund raising activity categories you want to be maintained in the system. - - - - - - CRM - Funds Tree - crm.fundraising - tree - - - - - - - - - - - - - - - - - - CRM - Funds Form - crm.fundraising - form - -
-
-
- - -
- -
-
- - - - - - - CRM - Funds Calendar - crm.fundraising - calendar - - - - - - - - - - - - - CRM - Funds Graph - crm.fundraising - graph - - - - - - - - - - - - CRM - Funds Search - crm.fundraising - search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/project_timesheet/project_timesheet_data.xml.THIS b/addons/project_timesheet/project_timesheet_data.xml.THIS deleted file mode 100644 index fc6597595ae..00000000000 --- a/addons/project_timesheet/project_timesheet_data.xml.THIS +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - From 2a4aaeba31b685d5771f134ef2806d2e3dbb7a43 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 17 Sep 2012 16:01:38 +0200 Subject: [PATCH 171/187] [FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao --- addons/point_of_sale/point_of_sale_view.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 80abb5444db..eefdcc6dd6e 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -896,8 +896,8 @@ - - + @@ -906,7 +906,8 @@ - + @@ -916,7 +917,7 @@ -
+
@@ -933,7 +934,7 @@
- + From 62cda268febf432ad530899340beb14527e5332a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 16:06:30 +0200 Subject: [PATCH 172/187] [IMP] invert Save and new, Save and Close bzr revid: fp@tinyerp.com-20120917140630-sxk5cuiaadfc8wn4 --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e34f3827dcf..5c58c3a1d3c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1237,8 +1237,8 @@ - + or From abf3d2bd53c3bdc8e0c8191ab3b1c78c0c36d34b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 16:47:40 +0200 Subject: [PATCH 173/187] [IMP] product explanation about the business flow bzr revid: fp@tinyerp.com-20120917144740-2hsb04t8dpzxzuue --- addons/mail/data/mail_group_data.xml | 2 +- addons/mrp/mrp_view.xml | 11 +++++++++-- addons/product/product_view.xml | 24 ++++++++++++++++++++++-- addons/project_mrp/project_mrp_view.xml | 11 +++++++++-- addons/purchase/purchase_view.xml | 14 ++++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 53720926a5c..11d0ee7d04b 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -7,7 +7,7 @@ Discussion about best sales practices and deals. - All Employees + Whole Company Discussion about best sales practices and deals. diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index ec66b5692c0..d05893cf778 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -956,9 +956,16 @@ product.product - - + + False + +

+ When you sell this product, OpenERP will trigger a manufacturing + order using the bill of materials assigned to this product. + The delivery order will be ready once the production is done. +

+ diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 13474351744..d04e6f17fe8 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -106,11 +106,31 @@ + - - + +

+ When you sell this service, nothing special will be trigered + to deliver the customer. +

+

+ When you sell this product, OpenERP will use the available inventory + for the delivery order. +
+ If there are not enough quantities available, the delivery order + will wait for new products. You should create others rules + (orderpoints, manual purchase orders) to fulfill the inventory. +

+

+ When you sell this product, a delivery order will be created. + OpenERP will consider that the required quantities are always + available as it's a consumable (the stock on hand may become negative). +

+ + + diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml index ca1e1f893e7..51de9dd5cf3 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/project_mrp/project_mrp_view.xml @@ -36,9 +36,16 @@ product.product - - + + False + +

+ When you sell this service to a customer, a task will be + created to follow up the job to do. This task will appear + in the project related to the contract of the sale order. +

+ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 53f27245e7e..796fd1351a9 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -572,6 +572,20 @@ + +

+ When you sell this service to a customer, a draft purchase order + will be created in order to subcontract the job + to + . +

+

+ When you sell this product, OpenERP will trigger a draft + purchase order to buy the required quantities to the supplier. + The delivery order will be ready after having received the + products. +

+ From 091b2d4892444b291d48a3c48e014f05543961d2 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 17 Sep 2012 16:53:45 +0200 Subject: [PATCH 174/187] [FIX] typo bzr revid: abo@openerp.com-20120917145345-atyfzfq6juls0siu --- addons/event/event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index e2ff2e67e87..0bf0e9e743b 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -166,7 +166,7 @@
-

From to -

-
@@ -951,6 +953,7 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''" + t-att-maxlength="widget.field.size" >