From 5032dad17d3bf4d74fd9ac07804881df6e70dafa Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 18 Feb 2013 18:55:59 +0100 Subject: [PATCH 01/56] [FIX] module: install_from_urls: restrict to administrators. Urls must come from apps server. lp bug: https://launchpad.net/bugs/1129299 fixed bzr revid: chs@openerp.com-20130218175559-ygo0goytspg119bl --- openerp/addons/base/module/module.py | 16 ++++++++++++++-- openerp/addons/base/static/src/js/apps.js | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index a0d1eedef2b..73c61812ee0 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -30,6 +30,7 @@ import shutil import tempfile import urllib import urllib2 +import urlparse import zipfile import zipimport @@ -39,6 +40,7 @@ except ImportError: from StringIO import StringIO # NOQA import openerp +import openerp.exceptions from openerp import modules, pooler, tools, addons from openerp.modules.db import create_categories from openerp.tools.parse_version import parse_version @@ -655,6 +657,11 @@ class module(osv.osv): return res def install_from_urls(self, cr, uid, urls, context=None): + if not self.pool['res.users'].has_group(cr, uid, 'base.group_system'): + raise openerp.exceptions.AccessDenied() + + apps_server = urlparse.urlparse(self.get_apps_server(cr, uid, context=context)) + OPENERP = 'openerp' tmp = tempfile.mkdtemp() _logger.debug('Install from url: %r', urls) @@ -663,6 +670,11 @@ class module(osv.osv): for module_name, url in urls.items(): if not url: continue # nothing to download, local version is already the last one + + up = urlparse.urlparse(url) + if up.scheme != apps_server.scheme or up.netloc != apps_server.netloc: + raise openerp.exceptions.AccessDenied() + try: _logger.info('Downloading module `%s` from OpenERP Apps', module_name) content = urllib2.urlopen(url).read() @@ -727,8 +739,8 @@ class module(osv.osv): finally: shutil.rmtree(tmp) - def install_by_names(self, cr, uid, names, context=None): - raise NotImplementedError('# TODO') + def get_apps_server(self, cr, uid, context=None): + return tools.config.get('apps_server', 'https://apps.openerp.com/apps') def _update_dependencies(self, cr, uid, mod_browse, depends=None): if depends is None: diff --git a/openerp/addons/base/static/src/js/apps.js b/openerp/addons/base/static/src/js/apps.js index a55c89a0483..7a77e827a94 100644 --- a/openerp/addons/base/static/src/js/apps.js +++ b/openerp/addons/base/static/src/js/apps.js @@ -62,8 +62,8 @@ openerp.base = function(instance) { if (instance.base.apps_client) { return check_client_available(instance.base.apps_client); } else { - var ICP = new instance.web.Model('ir.config_parameter'); - return ICP.call('get_param', ['apps.server', 'https://apps.openerp.com/apps']).then(function(u) { + var Mod = new instance.web.Model('ir.module.module'); + return Mod.call('get_apps_server').then(function(u) { var link = $(_.str.sprintf('', u))[0]; var host = _.str.sprintf('%s//%s', link.protocol, link.host); var dbname = link.pathname; From a1f11cf0cd19a9599bfe6a7e9a5e05bd0380d423 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Mon, 11 Mar 2013 14:24:33 +0100 Subject: [PATCH 02/56] [FIX] pto in invoice template should not cover the whole document lp bug: https://launchpad.net/bugs/971713 fixed bzr revid: stefan@therp.nl-20130311132433-rfz85yz831u1o1s9 --- .../account/report/account_print_invoice.rml | 28 +++++----- addons/sale/report/sale_order.rml | 52 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 4ffa7a33f9d..579b6f0c10a 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -138,21 +138,8 @@ - [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] - - - - Description - Taxes - Quantity - Unit Price - Disc.(%) - Price - - - @@ -217,6 +204,19 @@ + + + + + Description + Taxes + Quantity + Unit Price + Disc.(%) + Price + + + @@ -264,6 +264,7 @@ + @@ -371,6 +372,5 @@ - diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index a00d2d4e3ef..43e517394e5 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -126,33 +126,8 @@ - [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] - - - - - Description - - - Tax - - - Quantity - - - Unit Price - - - Disc.(%) - - - Price - - - - @@ -236,6 +211,31 @@ + + + + + + Description + + + VAT + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price + + + + @@ -283,6 +283,7 @@ + @@ -338,6 +339,5 @@ - From 014f1ddc2a202a3249ae501ce96d02e3a1603f9d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 18 Jul 2013 14:35:26 +0200 Subject: [PATCH 03/56] [FIX] account: Chart Installer: new way to get apps server bzr revid: chs@openerp.com-20130718123526-4xqacoe63c9qqufp --- addons/account/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/installer.py b/addons/account/installer.py index 9ad20129587..357ec11dec3 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -47,7 +47,7 @@ class account_installer(osv.osv_memory): # try get the list on apps server try: - apps_server = self.pool.get('ir.config_parameter').get_param(cr, uid, 'apps.server', 'https://apps.openerp.com') + apps_server = self.pool.get('ir.module.module').get_apps_server(cr, uid, context=context) up = urlparse.urlparse(apps_server) url = '{0.scheme}://{0.netloc}/apps/charts?serie={1}'.format(up, serie) From 65caa33162d85c154ade2bcde29a3756221d5ae5 Mon Sep 17 00:00:00 2001 From: "Amit Dodiya (OpenERP)" Date: Mon, 28 Oct 2013 18:18:22 +0530 Subject: [PATCH 04/56] [FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account bzr revid: ado@tinyerp.com-20131028124822-we80argd26aozxg7 --- addons/account/wizard/account_invoice_refund.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 37ab5f18af8..eec37490963 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -156,9 +156,11 @@ class account_invoice_refund(osv.osv_memory): if mode in ('cancel', 'modify'): movelines = inv.move_id.line_id to_reconcile_ids = {} + move_line_ids = [] for line in movelines: if line.account_id.id == inv.account_id.id: - to_reconcile_ids[line.account_id.id] = [line.id] + move_line_ids.append(line.id) + to_reconcile_ids[line.account_id.id] = move_line_ids if line.reconcile_id: line.reconcile_id.unlink() wf_service.trg_validate(uid, 'account.invoice', \ From f9d143c216f36ada7b160b76a298d5cfc1613b65 Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Thu, 3 Apr 2014 12:38:44 +0530 Subject: [PATCH 05/56] [FIX]Fixed the issue of duplicated one2many lines, weired behavior when you add one2many line and then add another line withour filling required field and then click on save, then remove added one2many line for which we didn't filled required data and then save it, you will get duplicated lines. bzr revid: msh@tinyerp.com-20140403070844-6ogpdursukue2zoh --- addons/web/static/src/js/view_form.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index edb44e7ea06..c5cc4989d4a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -620,6 +620,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }); } return $.when(); + }).fail(function() { + self.save_list.pop(); + return $.when(); }); }; return iterate(); From 091de4eb755b05bf1b6e2019fa84580ff0e1ad8d Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (OpenERP)" Date: Fri, 4 Apr 2014 12:32:54 +0530 Subject: [PATCH 06/56] [FIX] account_budget: Added missing 1 day in the(to the elapsed days and total days) calculation of 'Theoretical Amount' in order to have correct amount value for it. (Maintenance Case: 606232) bzr revid: rgo@tinyerp.com-20140404070254-ey27l4kq6d1vypq9 --- addons/account_budget/account_budget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index a88c468fff1..daec4ea0a2f 100644 --- a/addons/account_budget/account_budget.py +++ b/addons/account_budget/account_budget.py @@ -164,7 +164,7 @@ class crossovered_budget_lines(osv.osv): elapsed = strToDate(date_to) - strToDate(date_to) if total.days: - theo_amt = float(elapsed.days / float(total.days)) * line.planned_amount + theo_amt = float((elapsed.days + 1) / float(total.days + 1)) * line.planned_amount else: theo_amt = line.planned_amount From 6027657e3e20ade8a939da00bc2b3d5d2316c7b3 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 7 Apr 2014 17:00:27 +0200 Subject: [PATCH 07/56] [FIX] auth_oauth: redirect to url before sign in bzr revid: dle@openerp.com-20140407150027-z46yxuh3a9uqoz26 --- addons/auth_oauth/controllers/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 6d28813507c..fddf439aa1d 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -68,7 +68,8 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): def get_state(self, provider): return dict( d=request.session.db, - p=provider['id'] + p=provider['id'], + r=request.httprequest.full_path ) @http.route() @@ -114,8 +115,11 @@ class OAuthController(http.Controller): cr.commit() action = state.get('a') menu = state.get('m') + redirect = state.get('r') url = '/web' - if action: + if redirect: + url = redirect + elif action: url = '/web#action=%s' % action elif menu: url = '/web#menu_id=%s' % menu From d62c9cea680f4f50e7a66729e1b2e1e0ef186397 Mon Sep 17 00:00:00 2001 From: Anael Closson Date: Mon, 7 Apr 2014 17:45:10 +0200 Subject: [PATCH 08/56] [FIX] OPW 606045 - view_form: add a m2m tag from search_create_popup doesn't add tag to field bzr revid: acl@openerp.com-20140407154510-5vxckvf1vpsvl96e --- addons/web/static/src/js/view_form.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index fd838686ba9..7f451d324b2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4306,7 +4306,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in if (data.id) { self.add_id(data.id); } else { - ignore_blur = true; + self.ignore_blur = true; data.action(); } this.trigger('setSuggestions', {result : []}); @@ -4346,7 +4346,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in if (this.get("effective_readonly")) return; var self = this; - var ignore_blur = false; + self.ignore_blur = false; self.$text = this.$("textarea"); self.$text.textext(self.initialize_texttext()).bind('getSuggestions', function(e, data) { var _this = this; @@ -4366,11 +4366,11 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in self.$text .focusin(function () { self.trigger('focused'); - ignore_blur = false; + self.ignore_blur = false; }) .focusout(function() { self.$text.trigger("setInputData", ""); - if (!ignore_blur) { + if (!self.ignore_blur) { self.trigger('blurred'); } }).keydown(function(e) { @@ -4448,6 +4448,10 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in width: width, minHeight: height }); + }, + _search_create_popup: function() { + self.ignore_blur = true; + return instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments); }, }); From ff768827017a4a655c1727597dc6be28e2d72db6 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 7 Apr 2014 17:59:19 +0200 Subject: [PATCH 09/56] [FIX] auth_oauth: avoid infinite loop while trying to sign in bzr revid: dle@openerp.com-20140407155919-vm32q6nvcit59026 --- addons/auth_oauth/controllers/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index fddf439aa1d..08319b982fd 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -2,6 +2,7 @@ import functools import logging import simplejson +import urlparse import werkzeug.utils from werkzeug.exceptions import BadRequest @@ -117,7 +118,8 @@ class OAuthController(http.Controller): menu = state.get('m') redirect = state.get('r') url = '/web' - if redirect: + if redirect and not redirect.startswith('/auth_oauth/signin') and \ + (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query): url = redirect elif action: url = '/web#action=%s' % action From 7dc732af6cc21d3e3f8f850433ffc629f4436e95 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 8 Apr 2014 07:07:58 +0000 Subject: [PATCH 10/56] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140408070758-jpj1hkcbia6f8630 --- addons/hr/i18n/am.po | 20 ++++++++-------- addons/stock/i18n/zh_TW.po | 49 +++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po index ef3a8d4cd65..478a8bc34dd 100644 --- a/addons/hr/i18n/am.po +++ b/addons/hr/i18n/am.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-05 07:23+0000\n" +"PO-Revision-Date: 2014-04-07 13:39+0000\n" "Last-Translator: biniyam \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n" +"X-Launchpad-Export-Date: 2014-04-08 07:07+0000\n" "X-Generator: Launchpad (build 16976)\n" #. module: hr @@ -534,27 +534,27 @@ msgstr "" #: view:hr.job:0 #: field:hr.job,state:0 msgid "Status" -msgstr "" +msgstr "ሁኔታው" #. module: hr #: field:hr.employee,otherid:0 msgid "Other Id" -msgstr "" +msgstr "የተለየ መለያ" #. module: hr #: model:process.process,name:hr.process_process_employeecontractprocess0 msgid "Employee Contract" -msgstr "" +msgstr "የሰራተኛው ውል" #. module: hr #: view:hr.config.settings:0 msgid "Contracts" -msgstr "" +msgstr "ውሎች" #. module: hr #: help:hr.job,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "የመልእክትና ግንኙነት ታሪኮች" #. module: hr #: field:hr.employee,ssnid:0 @@ -564,17 +564,17 @@ msgstr "" #. module: hr #: field:hr.job,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "ተከታይ ነው" #. module: hr #: field:hr.config.settings,module_hr_recruitment:0 msgid "Manage the recruitment process" -msgstr "" +msgstr "የቅጥሩን አካሄድ መቆጣጠር" #. module: hr #: view:hr.employee:0 msgid "Active" -msgstr "" +msgstr "ግልፅ" #. module: hr #: view:hr.config.settings:0 diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 51050def38b..cb40a5afe03 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-04-03 11:14+0000\n" +"PO-Revision-Date: 2014-04-08 06:46+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n" +"X-Launchpad-Export-Date: 2014-04-08 07:07+0000\n" "X-Generator: Launchpad (build 16976)\n" #. module: stock @@ -4032,7 +4032,7 @@ msgstr "本次提貨無須發票" #, python-format msgid "" "You have manually created product lines, please delete them to proceed" -msgstr "" +msgstr "您有手動建立產品細項，請先刪除以繼續處理。" #. module: stock #: model:stock.location,name:stock.stock_location_shop0 @@ -4063,6 +4063,13 @@ msgid "" "* Fixed Location: The chained location is taken from the next field: Chained " "Location if Fixed." msgstr "" +"Determines whether this location is chained to another location, i.e. any " +"incoming product in this location \n" +"決定這個倉位是否鏈結到另外一個倉位，也就是說任何在這個的倉位入庫產品下一步會被移到連鎖倉位。連\n" +"鎖倉位是根據類別決定：\n" +"* 無：無連鎖倉位。\n" +"* 客戶：連鎖倉位將設為提貨單上的業務夥伴的「客戶倉位」欄位。\n" +"* 固定庫位：連鎖倉位為下一個欄位「如果連鎖庫位為固定」的設定。" #. module: stock #: code:addons/stock/stock.py:1882 @@ -4214,6 +4221,8 @@ msgid "" "If cost price is decreased, stock variation account will be creadited and " "stock input account will be debited." msgstr "" +"如果成本價格增加，庫存變動科目為借方，出庫科目為貸方，其值等於 ( 差異金額 * 存貨數量)。\n" +"如果成本價格減少，庫存變動科目為貸方，入庫科目為借方。" #. module: stock #: code:addons/stock/stock.py:2860 @@ -4406,7 +4415,7 @@ msgstr "您不能移除 %s 狀態的提貨單" msgid "" "This stock location will be used, instead of the default one, as the " "destination location for goods you send to this partner" -msgstr "" +msgstr "此倉位將會替代預設倉位，作為當您送貨至此業務夥伴的目標倉位。" #. module: stock #: view:stock.change.product.qty:0 @@ -4419,7 +4428,7 @@ msgstr "套用(_A)" #: field:stock.picking.in,max_date:0 #: field:stock.picking.out,max_date:0 msgid "Max. Expected Date" -msgstr "" +msgstr "最大預計日期" #. module: stock #: field:stock.picking,auto_picking:0 @@ -4433,12 +4442,12 @@ msgstr "自動提貨" #: report:stock.picking.list.in:0 #: report:stock.picking.list.out:0 msgid "Customer Address :" -msgstr "" +msgstr "客戶地址：" #. module: stock #: field:stock.location,chained_auto_packing:0 msgid "Chaining Type" -msgstr "" +msgstr "倉位鏈結類型" #. module: stock #: view:report.stock.inventory:0 @@ -4464,7 +4473,7 @@ msgstr "行事曆檢視" #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move #: report:stock.inventory.move:0 msgid "Stock Inventory" -msgstr "" +msgstr "庫存盤點" #. module: stock #: help:report.stock.inventory,state:0 @@ -4484,12 +4493,12 @@ msgstr "" #. module: stock #: view:stock.inventory.merge:0 msgid "Do you want to merge theses inventories?" -msgstr "" +msgstr "您想要合併這些庫存盤點？" #. module: stock #: view:stock.picking.out:0 msgid "Date of Delivery" -msgstr "" +msgstr "出貨日期" #. module: stock #: field:stock.location,posy:0 @@ -4502,18 +4511,18 @@ msgstr "貨架 (Y)" msgid "" "Please define inventory valuation account on the product category: \"%s\" " "(id: %d)" -msgstr "" +msgstr "請設定此產品分類的庫存估價科目：「%s」（id: %d）" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot_revision msgid "Serial Number Revision" -msgstr "" +msgstr "序號版本" #. module: stock #: code:addons/stock/product.py:100 #, python-format msgid "Specify valuation Account for Product Category: %s." -msgstr "" +msgstr "為產品分類指定估價科目：%s" #. module: stock #: help:stock.config.settings,module_claim_from_delivery:0 @@ -4521,12 +4530,14 @@ msgid "" "Adds a Claim link to the delivery order.\n" " This installs the module claim_from_delivery." msgstr "" +"為送貨單添加一個索賠鏈接。\n" +"這將會安裝 claim_from_delivery 模組，" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:212 #, python-format msgid "Please specify at least one non-zero quantity." -msgstr "" +msgstr "請指定至少一個不為零的數量" #. module: stock #: field:stock.fill.inventory,set_stock_zero:0 @@ -4536,7 +4547,7 @@ msgstr "設為零" #. module: stock #: model:res.groups,name:stock.group_stock_user msgid "User" -msgstr "" +msgstr "使用者" #. module: stock #: field:stock.config.settings,module_stock_location:0 @@ -4569,7 +4580,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Check Availability" -msgstr "" +msgstr "檢查可用數量" #. module: stock #: selection:report.stock.inventory,month:0 @@ -4580,7 +4591,7 @@ msgstr "一月" #. module: stock #: constraint:stock.move:0 msgid "You cannot move products from or to a location of the type view." -msgstr "" +msgstr "不能將類型檢視的倉位作為調動的來源或目標倉位" #. module: stock #: help:stock.config.settings,group_stock_production_lot:0 @@ -4595,7 +4606,7 @@ msgstr "" #, python-format msgid "" "No product in this location. Please select a location in the product form." -msgstr "" +msgstr "該倉位沒有產品。請由產品表單選擇倉位。" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open @@ -4682,7 +4693,7 @@ msgstr "前綴" #: view:stock.move:0 #: view:stock.move.split:0 msgid "Split in Serial Numbers" -msgstr "" +msgstr "序號分拆" #. module: stock #: help:product.template,property_stock_account_input:0 From a16b0c79079c045206f81b2d02edf729673eeb97 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 8 Apr 2014 14:01:41 +0200 Subject: [PATCH 11/56] [IMP] web: select input on add record in list editable bzr revid: dle@openerp.com-20140408120141-f1fx2e9e8vqatccx --- addons/web/static/src/js/view_list_editable.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 53ea069cee6..c4aac5565ab 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -123,10 +123,19 @@ openerp.web.list_editable = function (instance) { * as an editable row at the top or bottom of the list) */ do_add_record: function () { + var self = this; if (this.editable()) { this.$el.find('table:first').show(); this.$el.find('.oe_view_nocontent').remove(); - this.start_edition(); + this.start_edition().then(function(){ + var fields = self.editor.form.fields; + self.editor.form.fields_order.some(function(field){ + if (fields[field].$el.is(':visible')){ + fields[field].$el.find("input").select(); + return true; + } + }); + }); } else { this._super(); } From 4646107e1ed89cd897823f46e7a6dfbe76e7e3a2 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 8 Apr 2014 16:14:13 +0200 Subject: [PATCH 12/56] [FIX] account_invoice: print invoice report, pto missplaced around the whole report instead of just the invoice lines bzr revid: dle@openerp.com-20140408141413-xqotylt1wlgktgpx --- .../account/report/account_print_invoice.rml | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 6914adfaf20..f45d40a9d6c 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -135,21 +135,9 @@ - + [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] - - - - Description - Taxes - Quantity - Unit Price - Disc.(%) - Price - - - @@ -214,6 +202,19 @@ + + + + + Description + Taxes + Quantity + Unit Price + Disc.(%) + Price + + + @@ -261,6 +262,7 @@ + @@ -368,6 +370,5 @@ - From 5c5a3c4887033e08f5b3e6e0a611d5f38d48a443 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Tue, 8 Apr 2014 17:49:26 +0200 Subject: [PATCH 13/56] [FIX] website: snippet parallax bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl --- addons/website/static/src/js/website.snippets.editor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index d9ef69d8218..befe7faeb53 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1472,6 +1472,9 @@ this.$target.find(".parallax") .css("background-position", '') .removeAttr("data-scroll-background-offset"); + }, + _drag_and_drop: function(){ + this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); } }); From 2cf1dad2a9a01d21b2abddd19c3a976e6a9789ef Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Tue, 8 Apr 2014 18:11:07 +0200 Subject: [PATCH 14/56] [FIX] Allow to pass qty in add_to_cart button (number and set_numer) bzr revid: jke@openerp.com-20140408161107-0x7uxn68olvsjnnt --- addons/website_sale/controllers/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 78ae0beb7a2..18be643af72 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -383,6 +383,8 @@ class Ecommerce(http.Controller): def add_cart(self, product_id, remove=None, **kw): request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid, product_id=int(product_id), + number=kw.get('number',1), + set_number=kw.get('set_number',-1), context=request.context) return request.redirect("/shop/mycart/") From bd7a58adb3af6ab1310560a787985908c50385b8 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Tue, 8 Apr 2014 18:24:32 +0200 Subject: [PATCH 15/56] [FIX] Website sale : cast quantity as flaot when forced by post input. bzr revid: jke@openerp.com-20140408162432-21vbw3of9jd4c1sz --- addons/website_sale/controllers/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 18be643af72..4ef5229c6d4 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -383,8 +383,8 @@ class Ecommerce(http.Controller): def add_cart(self, product_id, remove=None, **kw): request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid, product_id=int(product_id), - number=kw.get('number',1), - set_number=kw.get('set_number',-1), + number=float(kw.get('number',1)), + set_number=float(kw.get('set_number',-1)), context=request.context) return request.redirect("/shop/mycart/") From 41d172ea6dd0fb3825116a37565876bfd88420ae Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 8 Apr 2014 20:09:20 +0200 Subject: [PATCH 16/56] [FIX] product, stock: set active field in default product view, instead of inherited view of stock module The active field was placed in the Delays section, which does not make sense Besides, we should be able to disable products by default, not when stock is installed. bzr revid: dle@openerp.com-20140408180920-jpl50ups6ro1z4qp --- addons/product/product_view.xml | 1 + addons/stock/product_view.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 4946a71f80b..c547a611cd4 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -118,6 +118,7 @@ + days - From 0811d2933748ddfcc766d06eac72d7f2dec96bf7 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 9 Apr 2014 07:06:27 +0000 Subject: [PATCH 17/56] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140409070627-o5ns6nniq2dc1lme --- addons/hr/i18n/am.po | 104 +++--- addons/hr_evaluation/i18n/sv.po | 137 ++++---- addons/hr_holidays/i18n/sv.po | 87 ++--- addons/portal_crm/i18n/it.po | 542 ++++++++++++++++++++++++++++++++ addons/stock/i18n/zh_TW.po | 2 +- 5 files changed, 723 insertions(+), 149 deletions(-) create mode 100644 addons/portal_crm/i18n/it.po diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po index 478a8bc34dd..8fcfd7d61f4 100644 --- a/addons/hr/i18n/am.po +++ b/addons/hr/i18n/am.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-07 13:39+0000\n" +"PO-Revision-Date: 2014-04-08 13:09+0000\n" "Last-Translator: biniyam \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-08 07:07+0000\n" +"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n" "X-Generator: Launchpad (build 16976)\n" #. module: hr @@ -579,7 +579,7 @@ msgstr "ግልፅ" #. module: hr #: view:hr.config.settings:0 msgid "Human Resources Management" -msgstr "" +msgstr "የሰውሀይል አስተዳደር" #. module: hr #: view:hr.config.settings:0 @@ -589,17 +589,17 @@ msgstr "" #. module: hr #: field:hr.employee,bank_account_id:0 msgid "Bank Account Number" -msgstr "" +msgstr "የባንክ ሂሳብ ቁጥር" #. module: hr #: view:hr.department:0 msgid "Companies" -msgstr "" +msgstr "ድርጅት" #. module: hr #: field:hr.job,message_summary:0 msgid "Summary" -msgstr "" +msgstr "ማጠቃለያ" #. module: hr #: model:process.transition,note:hr.process_transition_contactofemployee0 @@ -631,7 +631,7 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Citizenship & Other Info" -msgstr "" +msgstr "ዜግነት እና የተለያዩ መረጃዎች" #. module: hr #: constraint:hr.department:0 @@ -641,17 +641,17 @@ msgstr "" #. module: hr #: field:hr.employee,address_id:0 msgid "Working Address" -msgstr "" +msgstr "የስራ አድራሻ" #. module: hr #: view:hr.employee:0 msgid "Public Information" -msgstr "" +msgstr "ይፋዊ መረጃ" #. module: hr #: field:hr.employee,marital:0 msgid "Marital Status" -msgstr "" +msgstr "የጋብቻ ሁኔታ" #. module: hr #: model:ir.model,name:hr.model_ir_actions_act_window @@ -661,17 +661,17 @@ msgstr "" #. module: hr #: field:hr.employee,last_login:0 msgid "Latest Connection" -msgstr "" +msgstr "የቅርብ ተጠሪ" #. module: hr #: field:hr.employee,image:0 msgid "Photo" -msgstr "" +msgstr "ምስል" #. module: hr #: view:hr.config.settings:0 msgid "Cancel" -msgstr "" +msgstr "መሰረዝይ" #. module: hr #: model:ir.actions.act_window,help:hr.open_module_tree_department @@ -690,13 +690,13 @@ msgstr "" #. module: hr #: help:hr.config.settings,module_hr_timesheet:0 msgid "This installs the module hr_timesheet." -msgstr "" +msgstr "የጊዜ ሰሌዳን ይጭናል" #. module: hr #: help:hr.job,expected_employees:0 msgid "" "Expected number of employees for this job position after new recruitment." -msgstr "" +msgstr "ከመጀመርያው የቅጥር ሂደት በኋላ የሚጠበቀው የሰው ሀይል ብዛት" #. module: hr #: model:ir.actions.act_window,help:hr.view_department_form_installer @@ -715,33 +715,33 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Personal Information" -msgstr "" +msgstr "የግል መረጃ" #. module: hr #: field:hr.employee,city:0 msgid "City" -msgstr "" +msgstr "ከተማ" #. module: hr #: field:hr.employee,passport_id:0 msgid "Passport No" -msgstr "" +msgstr "የድንበርየለሽ መታወቂያ ቁጥር" #. module: hr #: field:hr.employee,mobile_phone:0 msgid "Work Mobile" -msgstr "" +msgstr "ተንቀሳቃሽ የስራ ስልክ" #. module: hr #: selection:hr.job,state:0 msgid "Recruitement in Progress" -msgstr "" +msgstr "የቅጥር ሂደት ያለበት ደረጃ" #. module: hr #: field:hr.config.settings,module_account_analytic_analysis:0 msgid "" "Allow invoicing based on timesheets (the sale application will be installed)" -msgstr "" +msgstr "በግዜው ሰሌዳ ደረሰኝ ፍቀድ" #. module: hr #: code:addons/hr/hr.py:221 @@ -752,37 +752,37 @@ msgstr "" #. module: hr #: view:hr.employee.category:0 msgid "Employees Categories" -msgstr "" +msgstr "የሰራተኞች የስራ መደብ" #. module: hr #: field:hr.employee,address_home_id:0 msgid "Home Address" -msgstr "" +msgstr "የቤት አድራሻ" #. module: hr #: field:hr.config.settings,module_hr_timesheet:0 msgid "Manage timesheets" -msgstr "" +msgstr "የጊዜ ሰሌዳውን አደራጅ" #. module: hr #: model:ir.actions.act_window,name:hr.open_payroll_modules msgid "Payroll" -msgstr "" +msgstr "የደሞዝ መክፈያ ቅጽ" #. module: hr #: selection:hr.employee,marital:0 msgid "Single" -msgstr "" +msgstr "ያላገባ" #. module: hr #: field:hr.job,name:0 msgid "Job Name" -msgstr "" +msgstr "የስራው መደብ ስም" #. module: hr #: view:hr.job:0 msgid "In Position" -msgstr "" +msgstr "የስራ ሹመት" #. module: hr #: help:hr.config.settings,module_hr_payroll:0 @@ -792,27 +792,27 @@ msgstr "" #. module: hr #: field:hr.config.settings,module_hr_contract:0 msgid "Record contracts per employee" -msgstr "" +msgstr "የእያንዳንዱን የሰራተኛ የቅጥር ውል ሙላ" #. module: hr #: view:hr.department:0 msgid "department" -msgstr "" +msgstr "የስራ ክፍል" #. module: hr #: field:hr.employee,country_id:0 msgid "Nationality" -msgstr "" +msgstr "ዜግነት" #. module: hr #: view:hr.config.settings:0 msgid "Additional Features" -msgstr "" +msgstr "ተጨማሪ ግልጋሎቶች" #. module: hr #: field:hr.employee,notes:0 msgid "Notes" -msgstr "" +msgstr "ማስታወሻዎች" #. module: hr #: model:ir.actions.act_window,name:hr.action2 @@ -822,19 +822,19 @@ msgstr "" #. module: hr #: field:hr.employee,resource_id:0 msgid "Resource" -msgstr "" +msgstr "ሀብት" #. module: hr #: field:hr.department,complete_name:0 #: field:hr.employee,name_related:0 #: field:hr.employee.category,complete_name:0 msgid "Name" -msgstr "" +msgstr "ስም" #. module: hr #: field:hr.employee,gender:0 msgid "Gender" -msgstr "" +msgstr "ፆታ" #. module: hr #: view:hr.employee:0 @@ -845,27 +845,27 @@ msgstr "" #: model:ir.actions.act_window,name:hr.open_view_employee_list_my #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my msgid "Employees" -msgstr "" +msgstr "ሰራተኞች" #. module: hr #: help:hr.employee,sinid:0 msgid "Social Insurance Number" -msgstr "" +msgstr "የጤና መድን ቁጥር" #. module: hr #: field:hr.department,name:0 msgid "Department Name" -msgstr "" +msgstr "የስራ ክፍሉ ስም" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet msgid "Reports" -msgstr "" +msgstr "አጠቃላይ መግለጫ" #. module: hr #: field:hr.config.settings,module_hr_payroll:0 msgid "Manage payroll" -msgstr "" +msgstr "የደሞዝ መክፍያ ቅፅን መቆጣጠር" #. module: hr #: view:hr.config.settings:0 @@ -876,7 +876,7 @@ msgstr "" #. module: hr #: selection:hr.job,state:0 msgid "No Recruitment" -msgstr "" +msgstr "ምንም ቅጥር የለም" #. module: hr #: help:hr.employee,ssnid:0 @@ -891,12 +891,12 @@ msgstr "" #. module: hr #: field:hr.employee,login:0 msgid "Login" -msgstr "" +msgstr "ግባ" #. module: hr #: field:hr.job,expected_employees:0 msgid "Total Forecasted Employees" -msgstr "" +msgstr "የሜጠበቀው የሰራተኞች ብዛት" #. module: hr #: help:hr.job,state:0 @@ -908,13 +908,13 @@ msgstr "" #. module: hr #: model:ir.model,name:hr.model_res_users msgid "Users" -msgstr "" +msgstr "ተጠቃሚዎች" #. module: hr #: model:ir.actions.act_window,name:hr.action_hr_job #: model:ir.ui.menu,name:hr.menu_hr_job msgid "Job Positions" -msgstr "" +msgstr "የሰራ መደብ" #. module: hr #: model:ir.actions.act_window,help:hr.open_board_hr @@ -939,12 +939,12 @@ msgstr "" #: view:hr.employee:0 #: field:hr.employee,coach_id:0 msgid "Coach" -msgstr "" +msgstr "ተቆጣጣሪ" #. module: hr #: sql_constraint:hr.job:0 msgid "The name of the job position must be unique per company!" -msgstr "" +msgstr "የስራው መደብ ስም በየድርጅቱ የተለያየ መሆን አለበት" #. module: hr #: help:hr.config.settings,module_hr_expense:0 @@ -961,19 +961,19 @@ msgstr "" #: view:hr.employee:0 #: field:hr.employee,parent_id:0 msgid "Manager" -msgstr "" +msgstr "አስተዳዳሪ" #. module: hr #: selection:hr.employee,marital:0 msgid "Widower" -msgstr "" +msgstr "የፈታ" #. module: hr #: field:hr.employee,child_ids:0 msgid "Subordinates" -msgstr "" +msgstr "የበላይ አካል" #. module: hr #: view:hr.config.settings:0 msgid "Apply" -msgstr "" +msgstr "ማመልከት" diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po index 77baff54e3c..be108bb7424 100644 --- a/addons/hr_evaluation/i18n/sv.po +++ b/addons/hr_evaluation/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-31 16:59+0000\n" +"PO-Revision-Date: 2014-04-08 09:41+0000\n" "Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: hr_evaluation #: help:hr_evaluation.plan.phase,send_anonymous_manager:0 @@ -25,19 +25,19 @@ msgstr "Skicka en anonym sammanfattning till chefen" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Start Appraisal" -msgstr "Starta Bedömning" +msgstr "Starta utvärdering" #. module: hr_evaluation #: view:hr.evaluation.interview:0 #: view:hr.evaluation.report:0 #: view:hr_evaluation.plan:0 msgid "Group By..." -msgstr "Gruppera efter..." +msgstr "Gruppera på..." #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Cancel Appraisal" -msgstr "" +msgstr "Avbryt utvärdering" #. module: hr_evaluation #: field:hr.evaluation.interview,request_id:0 @@ -48,30 +48,30 @@ msgstr "Request_id" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 msgid "March" -msgstr "Mars" +msgstr "mars" #. module: hr_evaluation #: field:hr.evaluation.report,delay_date:0 msgid "Delay to Start" -msgstr "Fördröjning till Start" +msgstr "Tid till start" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal that are in waiting appreciation state" -msgstr "Bedömning som väntar" +msgstr "Utvärdering som väntar på erkännande" #. module: hr_evaluation #: view:hr_evaluation.plan:0 #: field:hr_evaluation.plan,company_id:0 #: field:hr_evaluation.plan.phase,company_id:0 msgid "Company" -msgstr "Företag" +msgstr "Bolag" #. module: hr_evaluation #: field:hr.evaluation.interview,evaluation_id:0 #: field:hr_evaluation.plan.phase,survey_id:0 msgid "Appraisal Form" -msgstr "Bedömningsformulär" +msgstr "Utvärderingsformulär" #. module: hr_evaluation #: view:hr.evaluation.report:0 @@ -83,7 +83,7 @@ msgstr "Dag" #: view:hr_evaluation.plan:0 #: field:hr_evaluation.plan,phase_ids:0 msgid "Appraisal Phases" -msgstr "Bedömningsfaser" +msgstr "Utvärderingsetapper" #. module: hr_evaluation #: view:hr.evaluation.interview:0 @@ -96,19 +96,19 @@ msgid "" "This number of months will be used to schedule the first evaluation date of " "the employee when selecting an evaluation plan. " msgstr "" -"Det antal månader ska användas för att schemalägga den första " -"Utvärderingsdatumet för den anställde, när man väljer en Utvärderingsplan. " +"Det antal månader som skall användas för att schemalägga det första " +"utvärderingsdatumet för den anställde, när man väljer en utvärderingsplan. " #. module: hr_evaluation #: view:hr.employee:0 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree msgid "Appraisals" -msgstr "" +msgstr "Utvärderingar" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 msgid "(eval_name)s:Appraisal Name" -msgstr "(Eval_name): Bedömnings namn" +msgstr "(Eval_name): Utvärderingsnamn" #. module: hr_evaluation #: field:hr.evaluation.interview,message_ids:0 @@ -119,17 +119,17 @@ msgstr "Meddelanden" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 msgid "Mail Body" -msgstr "Meddelande" +msgstr "Meddelandetext" #. module: hr_evaluation #: field:hr_evaluation.plan.phase,wait:0 msgid "Wait Previous Phases" -msgstr "Invänta tidigare faser" +msgstr "Invänta tidigare etapper" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation msgid "Employee Appraisal" -msgstr "Bedömning av anställd" +msgstr "Utvärdering av personal" #. module: hr_evaluation #: selection:hr.evaluation.report,state:0 @@ -148,7 +148,7 @@ msgstr "Uppfyller inte förväntningarna" #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr msgid "Appraisal" -msgstr "Bedömning" +msgstr "Utvärdering" #. module: hr_evaluation #: help:hr.evaluation.interview,message_unread:0 @@ -169,7 +169,7 @@ msgstr "Slutdatum" #. module: hr_evaluation #: field:hr_evaluation.plan,month_first:0 msgid "First Appraisal in (months)" -msgstr "Första Bedömning i (månader)" +msgstr "Första utvärdering i (månader)" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -215,7 +215,7 @@ msgstr "" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal that are in Plan In Progress state" -msgstr "Bedömning som pågår" +msgstr "Planerad och pågående utvärdering" #. module: hr_evaluation #: help:hr.evaluation.interview,message_summary:0 @@ -230,7 +230,7 @@ msgstr "" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Reset to Draft" -msgstr "Återställ till Utkast" +msgstr "Återställ till utkast" #. module: hr_evaluation #: field:hr.evaluation.report,deadline:0 @@ -252,12 +252,12 @@ msgstr "Pågående Utvärderingar" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_survey_request msgid "survey.request" -msgstr "undersöknings.begäran" +msgstr "survey.request" #. module: hr_evaluation #: view:hr.evaluation.interview:0 msgid "Cancel Survey" -msgstr "" +msgstr "Avbryt undersökning" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -294,7 +294,7 @@ msgstr "Olästa meddelanden" #: field:hr_evaluation.evaluation,employee_id:0 #: model:ir.model,name:hr_evaluation.model_hr_employee msgid "Employee" -msgstr "Anställd" +msgstr "Medarbetare" #. module: hr_evaluation #: selection:hr_evaluation.evaluation,state:0 @@ -318,12 +318,12 @@ msgid "" "Check this box if you want to send mail to employees coming under this phase" msgstr "" "Markera denna ruta om du vill skicka e-post till anställda som omfattas av " -"denna fas" +"denna etapp" #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "Creation Date" -msgstr "Skapades" +msgstr "Registeringsdatum" #. module: hr_evaluation #: help:hr_evaluation.plan.phase,send_answer_manager:0 @@ -391,7 +391,7 @@ msgstr "Status" #. module: hr_evaluation #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer msgid "Review Appraisal Plans" -msgstr "Recension Bedömning Planer" +msgstr "Granska utvärderingsplaner" #. module: hr_evaluation #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer @@ -408,6 +408,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att definiera en ny utvärderingsplan .\n" +"

\n" +" Du kan definiera utvärderingsplaner (ex: första intervju " +"efter 6\n" +" månader, därefter varje år). Sedan kan varje anställd " +"kopplas till\n" +" en utvärderingsplan så att OpenERP automatiskt kan " +"generera\n" +" intervjubegäran till chefer och / eller underordnade.\n" +"

\n" +" " #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -422,12 +434,12 @@ msgstr "Handlingsplan" #. module: hr_evaluation #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config msgid "Periodic Appraisal" -msgstr "Regelbunden Bedömning" +msgstr "Periodisk utvärdering" #. module: hr_evaluation #: field:hr_evaluation.plan,month_next:0 msgid "Periodicity of Appraisal (months)" -msgstr "Periodicitet av Bedömning (månader)" +msgstr "Periodicitet av utvärdering (månader)" #. module: hr_evaluation #: selection:hr.evaluation.report,rating:0 @@ -455,7 +467,7 @@ msgstr "Alla svar" #: view:hr.evaluation.interview:0 #: view:hr_evaluation.evaluation:0 msgid "Answer Survey" -msgstr "" +msgstr "Svara på undersökningen" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -486,7 +498,7 @@ msgstr "E-postinställningar" #. module: hr_evaluation #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders msgid "Appraisal Reminders" -msgstr "BedömningsPåminnelser" +msgstr "Utvärderingspåminnelser" #. module: hr_evaluation #: help:hr_evaluation.plan.phase,wait:0 @@ -534,7 +546,7 @@ msgstr "Pågående" #: field:hr_evaluation.plan.phase,plan_id:0 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan msgid "Appraisal Plan" -msgstr "BedömningsPlan" +msgstr "Utvärderingsplan" #. module: hr_evaluation #: view:hr.evaluation.interview:0 @@ -560,7 +572,7 @@ msgstr "Betydligt under förväntningarna" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Validate Appraisal" -msgstr "Validera Bedömning" +msgstr "Granska utvärdering" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -604,7 +616,7 @@ msgstr "Skicka en anonym sammanfattning till den anställde" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase msgid "Appraisal Plan Phase" -msgstr "BedömningPlan fas" +msgstr "Utvärderingsplane etapp" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -653,12 +665,12 @@ msgstr "Väntar Värdering" #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all msgid "Appraisal Analysis" -msgstr "BedömningsAnalys" +msgstr "Utvärderingsanalys" #. module: hr_evaluation #: field:hr_evaluation.evaluation,date:0 msgid "Appraisal Deadline" -msgstr "Tidsfrist Bedömning" +msgstr "Frist för utvärdering" #. module: hr_evaluation #: field:hr.evaluation.report,rating:0 @@ -684,12 +696,12 @@ msgstr "Datum Tidsfrist" #. module: hr_evaluation #: help:hr_evaluation.evaluation,rating:0 msgid "This is the appreciation on which the evaluation is summarized." -msgstr "" +msgstr "Detta är sammanfattningen av utvärderingens slutliga bedömning." #. module: hr_evaluation #: selection:hr_evaluation.plan.phase,action:0 msgid "Top-Down Appraisal Requests" -msgstr "Uppifrån och ner Begäran om Bedömning" +msgstr "Begäran av utvärdering från ledningen" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 @@ -715,7 +727,7 @@ msgstr "Klar" #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree msgid "Appraisal Plans" -msgstr "BedömningsPlaner" +msgstr "Utvärderingsplaner" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview @@ -758,8 +770,8 @@ msgid "" "The date of the next appraisal is computed by the appraisal plan's dates " "(first appraisal + periodicity)." msgstr "" -"Datumet för nästa Bedömning beräknas genom Bedömningsplanens datum (första " -"Bedömning + periodicitet)." +"Datumet för nästa utvärdering beräknas genom planeringens datum (första " +"utvärderingen + periodicitet)." #. module: hr_evaluation #: field:hr.evaluation.report,overpass_delay:0 @@ -778,13 +790,13 @@ msgstr "" #. module: hr_evaluation #: selection:hr_evaluation.plan.phase,action:0 msgid "Self Appraisal Requests" -msgstr "Egen Begäran om Bedömning" +msgstr "Utvärdering på egen begäran" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 #: field:hr_evaluation.evaluation,survey_request_ids:0 msgid "Appraisal Forms" -msgstr "BedömningsBlanketter" +msgstr "Utvärderingsblankett" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -808,6 +820,14 @@ msgid "" "

\n" " " msgstr "" +"

Klicka för att skapa en ny " +"utvärdering.

Varje anställd kan tilldelas en utvärderingsplan. En " +"sådan plan definierar frekvensen och ditt sätt att hantera din periodiska " +"personalutvärdering. Du kommer att kunna fastställa åtgärder och bifoga " +"intervjuer till varje steg. OpenERP hanterar alla typer av utvärderingar: " +"bottom-up, top-down, självutvärdering och slutlig utvärdering av " +"projektledaren.

\n" +" " #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 @@ -827,7 +847,7 @@ msgstr "Fas" #. module: hr_evaluation #: selection:hr_evaluation.plan.phase,action:0 msgid "Bottom-Up Appraisal Requests" -msgstr "Nerifrån och upp Begäran om Bedömning" +msgstr "Begäran av utvärdering från golvet" #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -838,7 +858,7 @@ msgstr "Februari" #: view:hr.evaluation.interview:0 #: view:hr_evaluation.evaluation:0 msgid "Interview Appraisal" -msgstr "Intervju Bedömning" +msgstr "Utvärderingsintervju" #. module: hr_evaluation #: field:survey.request,is_evaluation:0 @@ -849,12 +869,12 @@ msgstr "Är Bedömning?" #: code:addons/hr_evaluation/hr_evaluation.py:320 #, python-format msgid "You cannot start evaluation without Appraisal." -msgstr "Du kan inte starta Utvärdering utan Bedömning." +msgstr "Du kan inte starta kartläggning utan utvärdering." #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Appraisal Summary..." -msgstr "" +msgstr "Utvärderingssummering" #. module: hr_evaluation #: field:hr.evaluation.interview,user_to_review_id:0 @@ -868,6 +888,8 @@ msgid "" "You cannot change state, because some appraisal(s) are in waiting answer or " "draft state." msgstr "" +"Du kan inte ändra status, eftersom vissa utvärderingssvar är att vänta eller " +"bara är preleminära." #. module: hr_evaluation #: selection:hr.evaluation.report,month:0 @@ -877,7 +899,7 @@ msgstr "April" #. module: hr_evaluation #: view:hr_evaluation.plan.phase:0 msgid "Appraisal Plan Phases" -msgstr "Bedömning Plan faser" +msgstr "Utvärderingsplan etapper" #. module: hr_evaluation #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree @@ -894,18 +916,25 @@ msgid "" "

\n" " " msgstr "" +"

Klicka för att skapa en ny " +"intervjubegäran i samband med en personlig utvärdering.

" +"Intervjuförfrågningar brukar genereras automatiskt av OpenERP enligt en " +"anställds utvärderingsplan. Varje användare tar emot automatiska e-" +"postmeddelanden och önskemål för att utvärdera sina kollegor regelbundet. " +"

\n" +" " #. module: hr_evaluation #: help:hr.evaluation.interview,message_ids:0 #: help:hr_evaluation.evaluation,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Meddelande- och kommunikationshistorik" #. module: hr_evaluation #: view:hr.evaluation.interview:0 #: view:hr_evaluation.evaluation:0 msgid "Search Appraisal" -msgstr "Sök Bedömning" +msgstr "Sök utvärdering" #. module: hr_evaluation #: field:hr_evaluation.plan.phase,sequence:0 @@ -939,7 +968,7 @@ msgstr "År" #. module: hr_evaluation #: field:hr_evaluation.evaluation,note_summary:0 msgid "Appraisal Summary" -msgstr "Bedömning Sammanfattning" +msgstr "Utvärderingssammanfattning" #. module: hr_evaluation #: field:hr.employee,evaluation_date:0 @@ -949,7 +978,7 @@ msgstr "Nästa datum för Bedömande" #. module: hr_evaluation #: view:hr_evaluation.evaluation:0 msgid "Action Plan..." -msgstr "" +msgstr "Åtgärdsplan..." #~ msgid "Cancel" #~ msgstr "Avbryt" diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po index 6bbc5a77e5b..f195124b98f 100644 --- a/addons/hr_holidays/i18n/sv.po +++ b/addons/hr_holidays/i18n/sv.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-03 07:21+0000\n" +"PO-Revision-Date: 2014-04-08 16:15+0000\n" "Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n" +"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n" "X-Generator: Launchpad (build 16976)\n" #. module: hr_holidays @@ -45,12 +45,12 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,remaining_leaves:0 msgid "Maximum Leaves Allowed - Leaves Already Taken" -msgstr "Maximal tillåten ledighet - Ledigheten är redan förbrukad" +msgstr "Maximal tillåten ledighet - Semestern är redan förbrukad" #. module: hr_holidays #: view:hr.holidays:0 msgid "Leaves Management" -msgstr "Ledighetshantering" +msgstr "Semesterplanering" #. module: hr_holidays #: view:hr.holidays:0 @@ -60,7 +60,7 @@ msgstr "Gruppera på..." #. module: hr_holidays #: field:hr.holidays,holiday_type:0 msgid "Allocation Mode" -msgstr "Läge för Ledighetstilldelning" +msgstr "Läge för semestertilldelning" #. module: hr_holidays #: field:hr.employee,leave_date_from:0 @@ -77,7 +77,7 @@ msgstr "Avdelning" #: model:ir.actions.act_window,name:hr_holidays.request_approve_allocation #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_allocation msgid "Allocation Requests to Approve" -msgstr "Frånvaroönskemål att godkänna" +msgstr "Semesterönskemål att godkänna" #. module: hr_holidays #: help:hr.holidays,category_id:0 @@ -110,6 +110,8 @@ msgid "" "The default duration interval between the start date and the end date is 8 " "hours. Feel free to adapt it to your needs." msgstr "" +"Normalt tidsintervall mellan startdatum och slutdatum är 8 timmar. Känn dig " +"fri att anpassa det till dina behov." #. module: hr_holidays #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused @@ -144,7 +146,7 @@ msgstr "Ljusgrön" #. module: hr_holidays #: field:hr.employee,current_leave_id:0 msgid "Current Leave Type" -msgstr "Aktuell ledighetstyp" +msgstr "Aktuell frånvarutyp" #. module: hr_holidays #: view:hr.holidays:0 @@ -163,7 +165,7 @@ msgstr "Godkänd" #. module: hr_holidays #: view:hr.holidays:0 msgid "Search Leave" -msgstr "Sök Ledighet" +msgstr "Sök frånvaro" #. module: hr_holidays #: view:hr.holidays:0 @@ -175,7 +177,7 @@ msgstr "Vägra" #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays msgid "Leaves" -msgstr "Ledighet" +msgstr "Frånvaro" #. module: hr_holidays #: field:hr.holidays,message_ids:0 @@ -196,14 +198,14 @@ msgstr "Fel!" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays msgid "Leave Requests to Approve" -msgstr "LedighetsFörfrågningar att Godkänna" +msgstr "Semesteransökan att godkänna" #. module: hr_holidays #: view:hr.holidays.summary.dept:0 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal msgid "Leaves by Department" -msgstr "Ledighet per avdelning" +msgstr "Frånvaro per avdelning" #. module: hr_holidays #: field:hr.holidays,manager_id2:0 @@ -224,8 +226,8 @@ msgid "" "Choose 'Allocation Request' if you want to increase the number of leaves " "available for someone" msgstr "" -"Välj 'Ledighetsförfrågan' om någon vill ta en ledig dag. \n" -"Välj 'Tilldela ledighet' om du vill öka antalet ledigheter för någon" +"Välj 'Semesterförfrågan' om någon vill ta en ledig dag. \n" +"Välj 'Tilldela semster' om du vill öka antalet semesterdagar för någon" #. module: hr_holidays #: view:hr.holidays.status:0 @@ -257,7 +259,7 @@ msgstr "" #: field:hr.holidays.summary.dept,holiday_type:0 #: model:ir.model,name:hr_holidays.model_hr_holidays_status msgid "Leave Type" -msgstr "Ledighetstyp" +msgstr "Frånvarotyp" #. module: hr_holidays #: help:hr.holidays,message_summary:0 @@ -292,7 +294,7 @@ msgstr "Frånvaromöten" #. module: hr_holidays #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl msgid "Legal Leaves 2013" -msgstr "Lagstadgad ledighet 2013" +msgstr "Lagstadgad semester 2013" #. module: hr_holidays #: selection:hr.holidays.summary.dept,holiday_type:0 @@ -315,7 +317,7 @@ msgstr "Sjukfrånvaro" #: code:addons/hr_holidays/hr_holidays.py:489 #, python-format msgid "Leave Request for %s" -msgstr "Ledighetsbegäran för %s" +msgstr "Semsterönskemål för %s" #. module: hr_holidays #: xsl:holidays.summary:0 @@ -370,7 +372,7 @@ msgstr "Röd" #. module: hr_holidays #: view:hr.holidays.remaining.leaves.user:0 msgid "Leaves by Type" -msgstr "Ledighetstyp" +msgstr "Frånvaro per typ" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -422,11 +424,11 @@ msgid "" "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of " "the employees if the configuration does not allow to use this field." msgstr "" -"Funktionen bakom fältet 'Kvarvarande Semester' kan endast användas när det " -"bara finns en ledighetstyp med alternativet 'Tillåt att överskrida gränsen' " +"Funktionen bakom fältet 'Kvarvarande semester' kan endast användas när det " +"bara finns en frånvarotyp med alternativet 'Tillåt att överskrida gränsen' " "ej är markerad. (%s hittades). Annars är uppdateringen tvetydig eftersom vi " -"inte kan besluta om vilken ledighetstyp uppdateringen måste göras för. \n" -"Du kanske föredrar att använda de klassiska menyer 'Ledighetsbegäran' och " +"inte kan besluta om vilken frånvarotyp uppdateringen måste göras för. \n" +"Du kanske föredrar att använda de klassiska menyer 'Semesterbegäran' och " "'Tilldela Ledighet' som ligger i 'Personal \\ Frånvaro' för att hantera " "semesterdagar för de anställda om konfigurationen inte tillåter att använda " "detta fält." @@ -434,7 +436,7 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays.status:0 msgid "Search Leave Type" -msgstr "Sök LedighetsTyp" +msgstr "Sök frånvarotyp" #. module: hr_holidays #: selection:hr.employee,current_leave_state:0 @@ -457,6 +459,8 @@ msgid "" "Filters only on allocations and requests that belong to an holiday type that " "is 'active' (active field is True)" msgstr "" +"Filtrera endast om fördelningen och önskemål som hör till en fråmvarotyp som " +"är \"aktiv\" (aktiva fältet är sant)" #. module: hr_holidays #: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal @@ -469,10 +473,10 @@ msgid "" " " msgstr "" "

\n" -" Du kan tilldela återstående lagstadgad ledighetför varje " +" Du kan tilldela återstående lagstadgad semester för varje " "anställd, OpenERP\n" " kommer automatiskt att skapa och validera " -"ledighetsförfrågningar.\n" +"semesterförfrågningar.\n" "

\n" " " @@ -514,7 +518,7 @@ msgstr "Olästa meddelanden" #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new msgid "Leave Requests" -msgstr "LedighetsFörfrågningar" +msgstr "Semesterönskemål" #. module: hr_holidays #: field:hr.holidays.status,limit:0 @@ -555,12 +559,12 @@ msgid "" " " msgstr "" "

\n" -" Klicka för att skapa en ny ledighetsbegäran.\n" +" Klicka för att skapa en nytt semesterönskemål.\n" "

\n" -" När du har spelat in din ledighetsförfrågan, skickas det\n" -" till en chef för validering. Se till att ställa rätt " +" När du har registrerat dina semesterönskemål, skickas det\n" +" till en chef för granskning. Se till att välja rätt " "frånvarotyp\n" -" typ (återhämtning, helgdagar, sjukdom) och den exakta\n" +" (semesterdag, helgdagar, sjukdom) och den exakta\n" " antal öppna dagar relaterade till din frånvaro.\n" "

\n" " " @@ -576,8 +580,7 @@ msgid "" "This value is given by the sum of all holidays requests with a positive " "value." msgstr "" -"Detta värde kommer av summan av alla ledighetsförfrågningar med positivt " -"värde." +"Detta värde är en summering av alla semesterönskemål med positivt värde." #. module: hr_holidays #: help:hr.holidays.status,limit:0 @@ -712,7 +715,7 @@ msgstr "Obetald" #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation msgid "Leaves Summary" -msgstr "Ledighetssummering" +msgstr "Summerad frånvaro" #. module: hr_holidays #: view:hr.holidays:0 @@ -732,12 +735,12 @@ msgstr "Ljusblå" #. module: hr_holidays #: view:hr.holidays:0 msgid "My Department Leaves" -msgstr "Min avdelnings ledighet" +msgstr "Min avdelnings frånvaro" #. module: hr_holidays #: field:hr.employee,current_leave_state:0 msgid "Current Leave Status" -msgstr "Aktuell Ledighetsstatus" +msgstr "Aktuell frånvarostatus" #. module: hr_holidays #: field:hr.holidays,type:0 @@ -772,7 +775,7 @@ msgstr "Ljusgul" #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree msgid "Leaves Analysis" -msgstr "Ledighetsanalys" +msgstr "Frånvaroanalys" #. module: hr_holidays #: view:hr.holidays.summary.dept:0 @@ -800,7 +803,7 @@ msgstr "" #: view:hr.holidays:0 #: selection:hr.holidays,type:0 msgid "Allocation Request" -msgstr "Ledighetsönskemål" +msgstr "Semesterönskemål" #. module: hr_holidays #: help:hr.holidays,holiday_type:0 @@ -812,7 +815,7 @@ msgstr "" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves msgid "Leave Detail" -msgstr "Ledighet Detalj" +msgstr "Frånvarodetaljer" #. module: hr_holidays #: field:hr.holidays,double_validation:0 @@ -842,7 +845,7 @@ msgstr "Detaljer" #: view:hr.holidays:0 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month msgid "My Leaves" -msgstr "Min Ledighet" +msgstr "Min frånvaro" #. module: hr_holidays #: field:hr.holidays.summary.dept,depts:0 @@ -992,7 +995,7 @@ msgstr "" #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays msgid "Allocation Requests" -msgstr "Ledighetsönskemål" +msgstr "Semesterönskemål" #. module: hr_holidays #: xsl:holidays.summary:0 @@ -1006,9 +1009,9 @@ msgid "" "to create allocation/leave request. Total based on all the leave types " "without overriding limit." msgstr "" -"Totalt antal lagstadgad ledighet för den anställde, ändra detta värde för " -"att skapa frånvaro / ledighetsbegäran. Totalt baserat på alla frånvarotyper " -"utan tvingande gräns." +"Total lagstadgad semester för den anställde, ändra detta värde för att skapa " +"frånvaro / semesterönskemål. Totalt baserat på alla frånvarotyper utan " +"tvingande gräns." #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 diff --git a/addons/portal_crm/i18n/it.po b/addons/portal_crm/i18n/it.po new file mode 100644 index 00000000000..268c7fb6f8f --- /dev/null +++ b/addons/portal_crm/i18n/it.po @@ -0,0 +1,542 @@ +# Italian translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2014-04-08 15:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n" +"X-Generator: Launchpad (build 16976)\n" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,type:0 +msgid "Lead" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,title:0 +msgid "Title" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,probability:0 +msgid "Success Rate (%)" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Contact us" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_action:0 +msgid "Next Action Date" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,fax:0 +msgid "Fax" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,zip:0 +msgid "Zip" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,message_unread:0 +msgid "Unread Messages" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,company_id:0 +msgid "Company" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,user_id:0 +msgid "Salesperson" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Thank you for your interest, we'll respond to your request shortly." +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,priority:0 +msgid "Highest" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,mobile:0 +msgid "Mobile" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,description:0 +msgid "Notes" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,color:0 +msgid "Color Index" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_name:0 +msgid "Customer Name" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,state:0 +msgid "Cancelled" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,channel_id:0 +msgid "Communication channel (mail, direct, phone, ...)" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,type_id:0 +msgid "Campaign" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,ref:0 +msgid "Reference" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_action_next:0 +#: field:portal_crm.crm_contact_us,title_action:0 +msgid "Next Action" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: portal_crm +#: model:ir.actions.act_window,name:portal_crm.action_contact_us +msgid "Contact Us" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,name:0 +msgid "Subject" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,opt_out:0 +msgid "Opt-Out" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,priority:0 +msgid "Priority" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,state_id:0 +msgid "State" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,partner_id:0 +msgid "Linked partner (optional). Usually created when converting the lead." +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,payment_mode:0 +msgid "Payment Mode" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,state:0 +msgid "New" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,type:0 +msgid "Type" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,email_from:0 +msgid "Email" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,channel_id:0 +msgid "Channel" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,priority:0 +msgid "Lowest" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,create_date:0 +msgid "Creation Date" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Content..." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,opt_out:0 +msgid "" +"If opt-out is checked, this contact has refused to receive emails for mass " +"mailing and marketing campaign. Filter 'Available for Mass Mailing' allows " +"users to filter the leads when performing mass mailing." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,type:0 +msgid "Type is used to separate Leads and Opportunities" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,categ_ids:0 +msgid "Categories" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,stage_id:0 +msgid "Stage" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,user_login:0 +msgid "User Login" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,contact_name:0 +msgid "Contact Name" +msgstr "" + +#. module: portal_crm +#: model:ir.ui.menu,name:portal_crm.portal_company_contact +msgid "Contact" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Your name..." +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_address_email:0 +msgid "Partner Contact Email" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,planned_revenue:0 +msgid "Expected Revenue" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,task_ids:0 +msgid "Tasks" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Contact form" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,company_currency:0 +msgid "Currency" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,write_date:0 +msgid "Update Date" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Your email..." +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_deadline:0 +msgid "Expected Closing" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,ref2:0 +msgid "Reference 2" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,user_email:0 +msgid "User Email" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_open:0 +msgid "Opened" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,state:0 +msgid "In Progress" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,partner_name:0 +msgid "" +"The name of the future partner company that will be created while converting " +"the lead into opportunity" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,planned_cost:0 +msgid "Planned Costs" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,date_deadline:0 +msgid "Estimate of the date on which the opportunity will be won." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,priority:0 +msgid "Low" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_closed:0 +#: selection:portal_crm.crm_contact_us,state:0 +msgid "Closed" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,state:0 +msgid "Pending" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,state:0 +msgid "Status" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,priority:0 +msgid "Normal" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,email_cc:0 +msgid "Global CC" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,street2:0 +msgid "Street2" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,id:0 +msgid "ID" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,phone:0 +msgid "Phone" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,active:0 +msgid "Active" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,day_open:0 +msgid "Days to Open" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,day_close:0 +msgid "Days to Close" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,company_ids:0 +msgid "Companies" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Subject..." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,section_id:0 +msgid "" +"When sending mails, the default email address is taken from the sales team." +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,partner_address_name:0 +msgid "Partner Contact Name" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Your phone number..." +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Close" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,email_from:0 +msgid "Email address of the contact" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,city:0 +msgid "City" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Submit" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,function:0 +msgid "Function" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,referred:0 +msgid "Referred By" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,type:0 +msgid "Opportunity" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Name" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,country_id:0 +msgid "Country" +msgstr "" + +#. module: portal_crm +#: view:portal_crm.crm_contact_us:0 +msgid "Thank you" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,state:0 +msgid "" +"The Status is set to 'Draft', when a case is created. If the case is in " +"progress the Status is set to 'Open'. When the case is over, the Status is " +"set to 'Done'. If the case needs to be reviewed then the Status is set to " +"'Pending'." +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: portal_crm +#: help:portal_crm.crm_contact_us,type_id:0 +msgid "" +"From which campaign (seminar, marketing campaign, mass mailing, ...) did " +"this contact come from?" +msgstr "" + +#. module: portal_crm +#: selection:portal_crm.crm_contact_us,priority:0 +msgid "High" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,section_id:0 +msgid "Sales Team" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,street:0 +msgid "Street" +msgstr "" + +#. module: portal_crm +#: field:portal_crm.crm_contact_us,date_action_last:0 +msgid "Last Action" +msgstr "" + +#. module: portal_crm +#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us +msgid "Contact form for the portal" +msgstr "" diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index cb40a5afe03..055503a2c02 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.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: 2014-04-08 07:07+0000\n" +"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n" "X-Generator: Launchpad (build 16976)\n" #. module: stock From 3993d1ce2f0caf846a80666e4d1440f5ba8f2ac3 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Wed, 9 Apr 2014 09:28:13 +0200 Subject: [PATCH 18/56] [FIX] website: snippet parallax. Error when the user activate a snippet parallax already inserted bzr revid: chm@openerp.com-20140409072813-43fqwcr7j6i0zl0e --- addons/website/static/src/js/website.snippets.editor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index befe7faeb53..ad96b4c6c49 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1441,6 +1441,9 @@ start : function () { var self = this; this._super(); + if (!self.$target.data("snippet-view")) { + this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); + } this.scroll(); this.$target.on('snippet-style-change snippet-style-preview', function () { self.$target.data("snippet-view").set_values(); @@ -1472,9 +1475,6 @@ this.$target.find(".parallax") .css("background-position", '') .removeAttr("data-scroll-background-offset"); - }, - _drag_and_drop: function(){ - this.$target.data("snippet-view", new website.snippet.animationRegistry.parallax(this.$target)); } }); From a93972841828f5c0c6be470d5538b558509aca49 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 9 Apr 2014 10:13:49 +0200 Subject: [PATCH 19/56] [FIX] setup.py: pywebdav 0.9.8 breaks the API by renaming the DAV module bzr revid: odo@openerp.com-20140409081349-53jbd1k9vfp0uzom --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b53c9a47b31..a6d5702e632 100644 --- a/setup.py +++ b/setup.py @@ -131,7 +131,7 @@ setuptools.setup( 'python-ldap', # optional 'python-openid', 'pytz', - 'pywebdav', + 'pywebdav <= 0.9.4', 'pyyaml', 'reportlab', # windows binary pypi.python.org/pypi/reportlab 'simplejson', From 6e52ba24876b3d58be2cb3a6165b23b7f76ab700 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 9 Apr 2014 10:14:59 +0200 Subject: [PATCH 20/56] [FIX] setup.py: babel.dates.format_timedelta required, added in 1.0 bzr revid: odo@openerp.com-20140409081459-07uyfgfk03jevch4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 05178fb12ac..c776b910a8c 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ setuptools.setup( #include_package_data = True, install_requires = [ 'pychart', # not on pypi, use: pip install http://download.gna.org/pychart/PyChart-1.39.tar.gz - 'babel', + 'babel >= 1.0', 'docutils', 'feedparser', 'gdata', From b00a7562f9d9c74b077df6d4ebf5c9fc840c0dc9 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 9 Apr 2014 11:34:22 +0200 Subject: [PATCH 21/56] [FIX] web: impossible to click on attach button, for many2many_binary This fix is related to revision 4169 revid:mat@openerp.com-20140407120612-mjb08yts2oa4k4jz bzr revid: dle@openerp.com-20140409093422-imrg2hqozf46kj8d --- addons/web/static/src/css/base.css | 1 - addons/web/static/src/css/base.sass | 1 - addons/web/static/src/xml/base.xml | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 34d6084eb9c..7c2bc81b9e3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2488,7 +2488,6 @@ } .openerp .oe_hidden_input_file { position: relative; - overflow-x: hidden; } .openerp .oe_hidden_input_file input.oe_form_binary_file { z-index: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f57a002eb3c..1c02018da9d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1976,7 +1976,6 @@ $sheet-padding: 16px // Position: relative is used for the hidden input[type=file] // Do not remove it anymore ! position: relative - overflow-x: hidden input.oe_form_binary_file z-index: 0 line-height: 0 diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 3c7e9eea500..10840087acc 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1240,6 +1240,7 @@ + overflow-x: hidden