diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 4512e841687..e91a31d08e5 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -1142,7 +1142,7 @@ msgstr "替代使用的科目" msgid "" "Account used as counterpart for the journal entry, for taxes eligible based " "on payments." -msgstr "" +msgstr "科目与凭证相对应，适用于基于付款的税收。" #. module: account #: model:ir.actions.server,name:account.ir_cron_reverse_entry_ir_actions_server @@ -5906,6 +5906,11 @@ msgid "" "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n" "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed " msgstr "" +"手动：通过现金、支票或除 Odoo 以外的其他方法获取报酬。\n" +" 电子方式：在客户线上购买或订阅时（支付令），在已保存的卡中请求交易，通过付款受让人自动获取报酬。\n" +" 支票：通过支票支付账单并从 Odoo 中打印账单。\n" +" 批量存款：几个客户同时支票付款时，可生成批量存款提交到银行中。当在 Odoo 编码银行对账单时，建议您协调批量存款与交易之间的关系。要启用批量存款，必须安装 module account_batch_deposit。\n" +"SEPA 信用转账：SEPA 信用转账文件中的支付账单应提交给银行。要启用 sepa 信用转账，必须安装 module account_sepa。" #. module: account #: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids @@ -7285,7 +7290,7 @@ msgstr "损益表" #, python-format msgid "" "Programming error: wizard action executed without active_ids in context." -msgstr "" +msgstr "编程错误:在上下文环境中没有active_id的向导操作。" #. module: account #: model:ir.ui.view,arch_db:account.view_account_chart_template_form @@ -9329,7 +9334,7 @@ msgstr "这个标签将放在报告上用来显示根据比较筛选条件计算 #, python-format msgid "" "This method should only be called to process a single invoice's payment." -msgstr "" +msgstr "这个方法只被用来处理单个发票的支付。" #. module: account #. openerp-web @@ -9389,7 +9394,7 @@ msgstr "该付款条款江北用来代替采购订单或者供应商账单中默 msgid "" "This payment term will be used instead of the default one for sales orders " "and customer invoices" -msgstr "" +msgstr "对于销售订单和客户发票而言，该付款期限将代替默认期限。" #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_line_account_id @@ -9814,7 +9819,7 @@ msgstr "使用批量存款" #. module: account #: model:ir.ui.view,arch_db:account.res_config_settings_view_form msgid "Use depreciation boards, automate amortization entries" -msgstr "" +msgstr "使用折旧版，将摊销项自动化" #. module: account #: model:ir.ui.view,arch_db:account.res_config_settings_view_form @@ -9829,6 +9834,9 @@ msgid "" " with the current invoice. A new draft invoice will be created\n" " so that you can edit it." msgstr "" +"如果您想取消发票并创建新增 \n" +" 的一个，使用该选项。创建、验证信用证，并与当前的发票相一致。创建新增发票草案 \n" +"，以便您进行编辑。" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_refund @@ -10289,7 +10297,7 @@ msgstr "一旦设置之后，你无法清空银行账户" msgid "" "You cannot have a receivable/payable account that is not reconcilable. " "(account code: %s)" -msgstr "" +msgstr "您不能有不可调和的应收账款/应付账款。（账号：%s）" #. module: account #. openerp-web diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index fd2fef466fb..d280b6cb850 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -27,7 +27,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): res = [] total = [] cr = self.env.cr - user_company = self.env.user.company_id.id + company_ids = self.env.context.get('company_ids', (self.env.user.company_id.id,)) move_state = ['draft', 'posted'] if target_move == 'posted': move_state = ['posted'] @@ -41,7 +41,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): if reconciled_after_date: reconciliation_clause = '(l.reconciled IS FALSE OR l.id IN %s)' arg_list += (tuple(reconciled_after_date),) - arg_list += (date_from, user_company) + arg_list += (date_from, tuple(company_ids)) query = ''' SELECT DISTINCT l.partner_id, UPPER(res_partner.name) FROM account_move_line AS l left join res_partner on l.partner_id = res_partner.id, account_account, account_move am @@ -51,7 +51,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): AND (account_account.internal_type IN %s) AND ''' + reconciliation_clause + ''' AND (l.date <= %s) - AND l.company_id = %s + AND l.company_id IN %s ORDER BY UPPER(res_partner.name)''' cr.execute(query, arg_list) @@ -76,8 +76,8 @@ class ReportAgedPartnerBalance(models.AbstractModel): AND (COALESCE(l.date_maturity,l.date) > %s)\ AND ((l.partner_id IN %s) OR (l.partner_id IS NULL)) AND (l.date <= %s) - AND l.company_id = %s''' - cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, user_company)) + AND l.company_id IN %s''' + cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, tuple(company_ids))) aml_ids = cr.fetchall() aml_ids = aml_ids and [x[0] for x in aml_ids] or [] for line in self.env['account.move.line'].browse(aml_ids): @@ -117,7 +117,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): else: dates_query += ' <= %s)' args_list += (periods[str(i)]['stop'],) - args_list += (date_from, user_company) + args_list += (date_from, tuple(company_ids)) query = '''SELECT l.id FROM account_move_line AS l, account_account, account_move am @@ -127,7 +127,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): AND ((l.partner_id IN %s) OR (l.partner_id IS NULL)) AND ''' + dates_query + ''' AND (l.date <= %s) - AND l.company_id = %s''' + AND l.company_id IN %s''' cr.execute(query, args_list) partners_amount = {} aml_ids = cr.fetchall() diff --git a/addons/base_automation/i18n/de.po b/addons/base_automation/i18n/de.po index dcd253f76e2..becc0d45cf4 100644 --- a/addons/base_automation/i18n/de.po +++ b/addons/base_automation/i18n/de.po @@ -110,43 +110,43 @@ msgstr "Automation" #: model:ir.cron,cron_name:base_automation.ir_cron_data_base_automation_check #: model:ir.cron,name:base_automation.ir_cron_data_base_automation_check msgid "Base Action Rule: check and execute" -msgstr "" +msgstr "Basisaktionsregel: Überprüfen und Ausführen" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_recursive #: model:ir.actions.server,name:base_automation.test_rule_recursive_ir_actions_server msgid "Base Automation: test recursive rule" -msgstr "" +msgstr "Basisautomatisierung: rekursive Regel testen" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_on_create #: model:ir.actions.server,name:base_automation.test_rule_on_create_ir_actions_server msgid "Base Automation: test rule on create" -msgstr "" +msgstr "Basisautomatisierung: Testregel für Erstellen" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_on_recompute #: model:ir.actions.server,name:base_automation.test_rule_on_recompute_ir_actions_server msgid "Base Automation: test rule on recompute" -msgstr "" +msgstr "Basisautomatisierung: Testregel für Erneut berechnen" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_on_line #: model:ir.actions.server,name:base_automation.test_rule_on_line_ir_actions_server msgid "Base Automation: test rule on secondary model" -msgstr "" +msgstr "Basisautomatisierung: Testregel für sekundäres Modell" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_on_write #: model:ir.actions.server,name:base_automation.test_rule_on_write_ir_actions_server msgid "Base Automation: test rule on write" -msgstr "" +msgstr "Basisautomatisierung: Testregel für Schreiben" #. module: base_automation #: model:base.automation,name:base_automation.test_rule_on_write_check_context #: model:ir.actions.server,name:base_automation.test_rule_on_write_check_context_ir_actions_server msgid "Base Automation: test rule on write check context" -msgstr "" +msgstr "Basisautomatisierung: Testregel für Kontext für Kontrolllesen" #. module: base_automation #: selection:base.automation,trigger:0 @@ -566,6 +566,11 @@ msgid "" " opportunity which still has status pending after 14 days might\n" " trigger an automatic reminder email." msgstr "" +"Verwenden Sie automatisierte Aktionen, um automatisch Aktionen für\n" +" verschiedene Bildschirme zu veranlassen. Beispiel: Ein von einem bestimmten Benutzer erstellter Lead kann\n" +"automatisch auf einen bestimmten Verkaufskanal eingestellt werden oder\n" +"eine Chance, die nach 14 Tagen immer noch den Status „ausstehend“ innehat, führt zur\n" +"Auslösung einer automatischen Erinnerungs-E-Mail." #. module: base_automation #: model:ir.model.fields,field_description:base_automation.field_base_automation_line_test_user_id @@ -601,6 +606,8 @@ msgid "" "When should the condition be triggered.\n" " If present, will be checked by the scheduler. If empty, will be checked at creation and update." msgstr "" +"Wann die Bedingung ausgelöst werden sollte.\n" +" Falls vorhanden, wird der Zeitplaner die Überprüfung vornehmen. Falls leer, wird bei der Erstellung und Aktualisierung eine Überprüfung vorgenommen." #. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation_active diff --git a/addons/base_gengo/i18n/de.po b/addons/base_gengo/i18n/de.po index 3ed8583a686..01b66159a8c 100644 --- a/addons/base_gengo/i18n/de.po +++ b/addons/base_gengo/i18n/de.po @@ -3,22 +3,23 @@ # * base_gengo # # Translators: -# Martin Trigaux , 2017 # darenkster , 2017 +# Martin Trigaux, 2017 # Tina Rittmüller , 2017 # Martin K , 2017 # Henry Mineehen , 2017 -# Anja Funk , 2017 # Ermin Trevisan , 2017 # Ralf Hilgenstock , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 +# Anja Funk , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Niki Waibel , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,7 +75,7 @@ msgstr "" #. module: base_gengo #: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from msgid "Click here to Configure Gengo Parameters" -msgstr "" +msgstr "Klicken Sie hier, um Gengo-Parameter zu konfigurieren" #. module: base_gengo #: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form @@ -137,7 +138,7 @@ msgstr "Öffentlicher Schlüssel in Gengo" #. module: base_gengo #: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from msgid "Gengo Public or Private keys are wrong or missing." -msgstr "" +msgstr "Öffentliche oder private Gengo-Schlüssel sind falsch oder fehlen." #. module: base_gengo #: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from @@ -186,14 +187,14 @@ msgstr "Gengo: Manuelle Erstellung einer Anfrage" #: model:ir.cron,cron_name:base_gengo.gengo_sync_send_request_scheduler #: model:ir.cron,name:base_gengo.gengo_sync_send_request_scheduler msgid "Gengo: Sync translation (Request)" -msgstr "" +msgstr "Gengo: Übersetzung synchronisieren (Anforderung)" #. module: base_gengo #: model:ir.actions.server,name:base_gengo.gengo_sync_receive_request_scheduler_ir_actions_server #: model:ir.cron,cron_name:base_gengo.gengo_sync_receive_request_scheduler #: model:ir.cron,name:base_gengo.gengo_sync_receive_request_scheduler msgid "Gengo: Sync translation (Response)" -msgstr "" +msgstr "Gengo: Übersetzung synchronisieren (Antwort)" #. module: base_gengo #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_id @@ -302,7 +303,7 @@ msgstr "" #. module: base_gengo #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_authorized_credentials msgid "The private and public keys are valid" -msgstr "" +msgstr "Die privaten und öffentlichen Schlüssel sind gültig" #. module: base_gengo #: model:ir.model.fields,help:base_gengo.field_res_company_gengo_comment diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py index 0a585934af8..43d2e81ca33 100644 --- a/addons/base_gengo/wizard/base_gengo_translations.py +++ b/addons/base_gengo/wizard/base_gengo_translations.py @@ -62,9 +62,9 @@ class BaseGengoTranslations(models.TransientModel): 'type': 'ir.actions.act_window', 'view_type': 'form', 'view_mode': 'form', - 'res_model': 'res.company', - 'res_id': self.env.user.company_id.id, + 'res_model': 'res.config.settings', 'target': 'current', + 'context': {'module' : 'general_settings'}, } @api.model diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po index b26afd39ca1..8881de4a18d 100644 --- a/addons/base_import/i18n/de.po +++ b/addons/base_import/i18n/de.po @@ -4,22 +4,23 @@ # # Translators: # darenkster , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Thomas Neu , 2017 # Ermin Trevisan , 2017 # Henry Mineehen , 2017 # Rudolf Schnapka , 2017 # Tina Rittmüller , 2017 -# Niki Waibel , 2017 -# Renzo Meister , 2017 -# Andi , 2017 +# Niki Waibel, 2017 +# Renzo Meister, 2017 +# Andi, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-13 14:36+0000\n" "PO-Revision-Date: 2017-12-13 14:36+0000\n" -"Last-Translator: Andi , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,13 +64,13 @@ msgstr "Abbrechen" #: code:addons/base_import/models/base_import.py:596 #, python-format msgid "Column %s contains incorrect values (value: %s)" -msgstr "" +msgstr "Spalte %s enthält fehlerhafte Werte (Wert: %s)" #. module: base_import #: code:addons/base_import/models/base_import.py:627 #, python-format msgid "Column %s contains incorrect values. Error in line %d: %s" -msgstr "" +msgstr "Spalte %s enthält fehlerhafte Werte. Fehler in der Zeile %d: %s" #. module: base_import #. openerp-web @@ -189,7 +190,7 @@ msgstr "Zeichensatz:" #: code:addons/base_import/models/base_import.py:629 #, python-format msgid "Error Parsing Date [%s:L%d]: %s" -msgstr "" +msgstr "Fehler bei der Analyse des Datums [%s:L%d]: %s" #. module: base_import #: code:addons/base_import/models/base_import.py:227 @@ -398,7 +399,7 @@ msgstr "Datei Laden" #: code:addons/base_import/static/src/xml/base_import.xml:61 #, python-format msgid "Map your columns to import" -msgstr "" +msgstr "Ordnen Sie die Spalten zum Importieren zu" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import_res_model @@ -481,7 +482,7 @@ msgstr "Trennzeichen:" #: code:addons/base_import/static/src/xml/base_import.xml:77 #, python-format msgid "Show fields of relation fields (advanced)" -msgstr "" +msgstr "Felder mit Relationsfeldern anzeigen (erweitert)" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue @@ -507,7 +508,7 @@ msgstr "Tabulator" #: code:addons/base_import/static/src/xml/base_import.xml:91 #, python-format msgid "Test Import" -msgstr "" +msgstr "Test Import" #. module: base_import #. openerp-web diff --git a/addons/base_import_module/i18n/de.po b/addons/base_import_module/i18n/de.po index 6f17a1ef922..70ab32bf714 100644 --- a/addons/base_import_module/i18n/de.po +++ b/addons/base_import_module/i18n/de.po @@ -3,23 +3,24 @@ # * base_import_module # # Translators: -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Ralf Hilgenstock , 2017 # Tina Rittmüller , 2017 # Anja Funk , 2017 -# Martin Trigaux , 2017 -# Wolfgang Taferner , 2017 +# Martin Trigaux, 2017 +# Wolfgang Taferner, 2017 # darenkster , 2017 # Henry Mineehen , 2017 # Ermin Trevisan , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-10-24 09:00+0000\n" -"Last-Translator: Renzo Meister , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgstr "Schließen" #: code:addons/base_import_module/controllers/main.py:31 #, python-format msgid "Could not select database '%s'" -msgstr "" +msgstr "Datenbank „%s“ konnte nicht ausgewählt werden" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_create_uid @@ -96,7 +97,7 @@ msgstr "App importieren" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_import_message msgid "Import Message" -msgstr "" +msgstr "Mitteilung importieren" #. module: base_import_module #: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import @@ -145,13 +146,13 @@ msgstr "Modul .ZIP Datei" #: code:addons/base_import_module/models/ir_module.py:102 #, python-format msgid "No file sent." -msgstr "" +msgstr "Keine Datei gesendet." #. module: base_import_module #: code:addons/base_import_module/controllers/main.py:25 #, python-format msgid "Only administrators can upload a module" -msgstr "" +msgstr "Nur Administratoren können ein Modul hochladen" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import @@ -173,7 +174,7 @@ msgstr "Status" #: code:addons/base_import_module/models/ir_module.py:47 #, python-format msgid "Studio customizations require Studio" -msgstr "" +msgstr "Studio-Anpassungen erfordern Studio" #. module: base_import_module #: code:addons/base_import_module/models/ir_module.py:42 diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po index da95fb384b4..ca0e35d67d6 100644 --- a/addons/base_setup/i18n/de.po +++ b/addons/base_setup/i18n/de.po @@ -60,7 +60,7 @@ msgstr "Ermöglicht die Arbeit mit unterschiedlichen Währungen" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_voip msgid "Asterisk (VoIP)" -msgstr "" +msgstr "Sternchen (VoIP)" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_drive @@ -70,23 +70,25 @@ msgstr "Hängen Sie Google Dokumente an jeden beliebigen Datensatz an" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Automate inter-company transactions" -msgstr "" +msgstr "Automatisieren Sie unternehmensinterne Transaktionen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Business Documents" -msgstr "" +msgstr "Geschäftsunterlagen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "" "By default, new users get highest access rights for all installed apps." msgstr "" +"Standardmäßig erhalten neue Benutzer die höchsten Zugriffsrechte für alle " +"installierten Apps." #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Change Document Template" -msgstr "" +msgstr "Dokumentvorlage ändern" #. module: base_setup #: code:addons/base_setup/models/res_config_settings.py:100 @@ -97,7 +99,7 @@ msgstr "Wählen Sie Ihr Dokumentenlayout" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Choose your document's header and footer layout" -msgstr "" +msgstr "Wählen Sie das Kopf- und Fußzeilenlayout Ihres Dokuments" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_pad @@ -107,7 +109,7 @@ msgstr "Plattform für Zusammenarbeit" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Common Contact Book" -msgstr "" +msgstr "Gemeinsames Kontaktbuch" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form @@ -125,11 +127,16 @@ msgid "" "Configure company rules to automatically create SO/PO when one of your " "company sells/buys to another of your company." msgstr "" +"Konfigurieren Sie Unternehmensregeln, um automatisch Verkaufsaufträge oder " +"Bestellungen zu erstellen, wenn jemand aus Ihrem Unternehmen Güter an eine " +"andere Firma verkauft/bzw. bei einer anderen Firma einkauft." #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Create and attach Google Drive documents to any record" msgstr "" +"Sie können in jedem Datensatz Google Drive-Dokumente erstellen und " +"hinzufügen" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_custom_report_footer @@ -152,17 +159,17 @@ msgstr "Dokumenten Vorlage" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Edit Header" -msgstr "" +msgstr "Kopfzeile bearbeiten" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_external_email_server msgid "External Email Servers" -msgstr "" +msgstr "Externe E-Mail-Server" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Extract and analyze Odoo data from Google Spreadsheet" -msgstr "" +msgstr "Extrahieren und analysieren Sie Odoo-Daten über Google Tabellen" #. module: base_setup #: model:ir.model.fields,help:base_setup.field_res_config_settings_report_footer @@ -183,7 +190,7 @@ msgstr "Allgemeine Einstellungen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Gengo Translations" -msgstr "" +msgstr "Gengo Translations" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form @@ -203,7 +210,7 @@ msgstr "Google Spreadsheet" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Import & Export" -msgstr "" +msgstr "Importieren und Exportieren" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form @@ -213,13 +220,13 @@ msgstr "Integration" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Inter-Company Transactions" -msgstr "" +msgstr "Unternehmensinterne Transaktionen" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_ldap #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "LDAP Authentication" -msgstr "" +msgstr "LDAP-Authentifizierung" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_inter_company_rules @@ -234,7 +241,7 @@ msgstr "Multi-Unternehmen Verwaltung" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Manage multiple legal entities with separate accounting" -msgstr "" +msgstr "Verwalten Sie mehrere Rechtspersonen mit separater Buchhaltung" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_group_multi_currency @@ -244,12 +251,12 @@ msgstr "Mehrere Währungen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Multi-company" -msgstr "" +msgstr "Mehrere Unternehmen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "OAuth Authentication" -msgstr "" +msgstr "OAuth-Authentifizierung" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_paperformat_id @@ -259,17 +266,17 @@ msgstr "Papierformat" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Preview Document" -msgstr "" +msgstr "Vorschaudokument" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Set custom access rights for new users" -msgstr "" +msgstr "Benutzerdefinierte Zugangsberechtigungen für neue Benutzer festlegen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Set the paper format of printed documents" -msgstr "" +msgstr "Das Papierformat für gedruckte Dokumente festlegen" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_general_configuration @@ -295,7 +302,7 @@ msgstr "" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Synchronize your calendar with Google Calendar" -msgstr "" +msgstr "Ihren Kalender mit Google Kalender abgleichen" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form @@ -305,32 +312,32 @@ msgstr "Vorlage" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_base_gengo msgid "Translate Your Website with Gengo" -msgstr "" +msgstr "Übersetzen Sie Ihre Website mit Gengo" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Translate your website with Gengo" -msgstr "" +msgstr "Übersetzen Sie Ihre Website mit Gengo" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Use LDAP credentials to log in" -msgstr "" +msgstr "Melden Sie sich mit LDAP-Anmeldedaten an" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Use external accounts to log in (Google, Facebook, etc.)" -msgstr "" +msgstr "Melden Sie sich über externe Konten an (Google, Facebook, usw.)" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_oauth msgid "Use external authentication providers (OAuth)" -msgstr "" +msgstr "Verwenden Sie externe Authentifizierungsanbieter (OAuth)" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form msgid "Use external pads in Odoo Notes" -msgstr "" +msgstr "Verwenden Sie externe Pads in Odoo Notes" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form diff --git a/addons/base_sparse_field/i18n/de.po b/addons/base_sparse_field/i18n/de.po index b4185a00c95..90ad2d44f1a 100644 --- a/addons/base_sparse_field/i18n/de.po +++ b/addons/base_sparse_field/i18n/de.po @@ -3,20 +3,21 @@ # * base_sparse_field # # Translators: -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Tina Rittmüller , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # darenkster , 2017 # Henry Mineehen , 2017 -# Renzo Meister , 2017 -# Wolfgang Taferner , 2017 +# Renzo Meister, 2017 +# Wolfgang Taferner, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Wolfgang Taferner , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +110,7 @@ msgstr "Zuletzt aktualisiert am" #. module: base_sparse_field #: selection:sparse_fields.test,selection:0 msgid "One" -msgstr "" +msgstr "Eins" #. module: base_sparse_field #: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_partner @@ -141,9 +142,9 @@ msgstr "Serialisierungsfeld `%s` für Ersatzfeld `%s` nicht gefunden!" #. module: base_sparse_field #: selection:sparse_fields.test,selection:0 msgid "Two" -msgstr "" +msgstr "Zwei" #. module: base_sparse_field #: model:ir.model,name:base_sparse_field.model_sparse_fields_test msgid "sparse_fields.test" -msgstr "" +msgstr "sparse_fields.test" diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po index 4974913bf72..2535342a0f1 100644 --- a/addons/base_vat/i18n/de.po +++ b/addons/base_vat/i18n/de.po @@ -3,17 +3,18 @@ # * base_vat # # Translators: -# Anja Funk , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Tina Rittmüller , 2017 -# Andi , 2017 +# Andi, 2017 +# Anja Funk , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Andi , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,6 +38,10 @@ msgid "" "If this checkbox is ticked, you will not be able to save a contact if its " "VAT number cannot be verified by the European VIES service." msgstr "" +"Wenn dieses Kontrollkästchen angekreuzt ist, können Sie einen Kontakt nur " +"dann speichern, wenn die MwSt-Nummer über das MwSt-" +"Informationsaustauschsystem der Europäischen Kommission überprüft werden " +"kann." #. module: base_vat #: code:addons/base_vat/models/res_partner.py:134 diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po index c6cf803d4ea..b46ee913d19 100644 --- a/addons/board/i18n/de.po +++ b/addons/board/i18n/de.po @@ -4,18 +4,19 @@ # # Translators: # Ermin Trevisan , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Anja Funk , 2017 # Henry Mineehen , 2017 # darenkster , 2017 # Tina Rittmüller , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Tina Rittmüller , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +62,7 @@ msgstr "Zu meinem Dashboard hinzufügen" #: code:addons/board/static/src/js/dashboard.js:335 #, python-format msgid "Are you sure you want to remove this item?" -msgstr "" +msgstr "Sind Sie sicher, dass Sie diesen Eintrag löschen wollen ?" #. module: board #: model:ir.model,name:board.model_board_board diff --git a/addons/bus/static/src/js/bus.js b/addons/bus/static/src/js/bus.js index 25a8b86903f..73b69013389 100644 --- a/addons/bus/static/src/js/bus.js +++ b/addons/bus/static/src/js/bus.js @@ -76,7 +76,8 @@ bus.Bus = Widget.extend({ this.last_partners_presence_check = now; } var data = {channels: self.channels, last: self.last, options: options}; - session.rpc('/longpolling/poll', data, {shadow : true}).then(function(result) { + // The backend has a maximum cycle time of 50 seconds so give +10 seconds + session.rpc('/longpolling/poll', data, {shadow : true, timeout: 60000}).then(function(result) { self.on_notification(result); if(!self.stop){ self.poll(); diff --git a/addons/calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po index 38de9af129d..e555db09550 100644 --- a/addons/calendar/i18n/zh_CN.po +++ b/addons/calendar/i18n/zh_CN.po @@ -622,7 +622,7 @@ msgstr "全天，%s" #. module: calendar #: sql_constraint:calendar.contacts:0 msgid "An user cannot have twice the same contact." -msgstr "" +msgstr "用户不能重复创建联系人。" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_attendee @@ -1461,7 +1461,7 @@ msgstr "这" msgid "" "The activity is linked to a meeting. Deleting it will remove the meeting as " "well. Do you want to proceed ?" -msgstr "" +msgstr "活动与会议相关联。删除该活动也会删除相关会议。是否要继续？" #. module: calendar #: model:ir.actions.act_window,help:calendar.action_calendar_event diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po index 52128e5d2ce..fe5710dc5f5 100644 --- a/addons/crm/i18n/zh_CN.po +++ b/addons/crm/i18n/zh_CN.po @@ -688,7 +688,7 @@ msgstr "创建" #. module: crm #: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified msgid "Create & Edit" -msgstr "" +msgstr "创建和编辑" #. module: crm #: model:ir.model.fields,field_description:crm.field_crm_lead_create_date diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 235d6854f93..83f3197a5b1 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -34,16 +34,6 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - Leads with assigned activities - - [('activity_ids.user_id','=',user.id)] - - - - - - All Leads diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po index 6d5ff08e951..6875de9df24 100644 --- a/addons/event/i18n/zh_CN.po +++ b/addons/event/i18n/zh_CN.po @@ -502,7 +502,7 @@ msgstr "

" #. module: event #: model:mail.template,subject:event.event_reminder msgid "${object.event_id.name}: ${object.get_date_range_str()}" -msgstr "" +msgstr "${object.event_id.name}: ${object.get_date_range_str()}" #. module: event #: model:ir.ui.view,arch_db:event.view_event_kanban @@ -539,7 +539,7 @@ msgstr "有效" msgid "" "Add a navigation menu to your event web pages with schedule, tracks, a track" " proposal form, etc." -msgstr "" +msgstr "将导航菜单添加到您的活动网页，其中含有时间表、跟踪，跟踪建议表格等" #. module: event #: selection:event.mail,interval_type:0 @@ -563,7 +563,7 @@ msgstr "已归档" msgid "" "Are you sure you want to cancel this event? All the linked attendees will be" " cancelled as well." -msgstr "" +msgstr "是否确定要取消这个活动？所有链接的参与者也将被取消。" #. module: event #: model:ir.ui.view,arch_db:event.res_config_settings_view_form @@ -612,17 +612,17 @@ msgstr "与会者" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_auto_confirm msgid "Autoconfirm Registrations" -msgstr "" +msgstr "自动确认注册" #. module: event #: model:ir.model.fields,field_description:event.field_event_type_auto_confirm msgid "Automatically Confirm Registrations" -msgstr "" +msgstr "自动确认注册" #. module: event #: model:ir.model.fields,field_description:event.field_event_type_use_mail_schedule msgid "Automatically Send Emails" -msgstr "" +msgstr "自动发送电子邮件" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_seats_available @@ -689,7 +689,7 @@ msgstr "类别" #. module: event #: model:ir.actions.act_window,help:event.act_event_registration_from_event msgid "Click to add a new attendee." -msgstr "" +msgstr "点击添加新的参与者。" #. module: event #: model:ir.actions.act_window,help:event.action_event_view @@ -1144,7 +1144,7 @@ msgstr "限制的" #. module: event #: model:ir.model.fields,field_description:event.field_event_type_has_seats_limitation msgid "Limited Seats" -msgstr "" +msgstr "有限名额" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_address_id @@ -1267,7 +1267,7 @@ msgstr "参与者数目" #: model:ir.model.fields,help:event.field_res_partner_event_count #: model:ir.model.fields,help:event.field_res_users_event_count msgid "Number of events the partner has participated." -msgstr "" +msgstr "合作伙伴已参与的活动数量。" #. module: event #: model:ir.actions.act_window,help:event.action_event_view @@ -1287,12 +1287,12 @@ msgstr "在线" #: model:ir.model.fields,field_description:event.field_event_event_is_online #: model:ir.model.fields,field_description:event.field_event_type_is_online msgid "Online Event" -msgstr "" +msgstr "在线活动" #. module: event #: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_sale msgid "Online Ticketing" -msgstr "" +msgstr "在线票务" #. module: event #: model:ir.ui.view,arch_db:event.view_event_type_form @@ -1300,13 +1300,15 @@ msgid "" "Online events like webinars do not require a specific location\n" " and are hosted online." msgstr "" +"网络研讨会等在线活动不需要特定的位置\n" +"，并进行在线托管。" #. module: event #: model:ir.model.fields,help:event.field_event_type_is_online msgid "" "Online events like webinars do not require a specific location and are " "hosted online." -msgstr "" +msgstr "网络研讨会等在线活动不需要特定的位置，并进行在线托管。" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_organizer_id diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po index d7a84ef44e6..06e13e53d0a 100644 --- a/addons/fetchmail/i18n/zh_CN.po +++ b/addons/fetchmail/i18n/zh_CN.po @@ -6,13 +6,14 @@ # Jeffery CHEN Fan , 2016 # liAnGjiA , 2017 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,7 +192,7 @@ msgstr "登录信息" #: model:ir.cron,cron_name:fetchmail.ir_cron_mail_gateway_action #: model:ir.cron,name:fetchmail.ir_cron_mail_gateway_action msgid "Mail: Fetchmail Service" -msgstr "" +msgstr "邮件：Fetchmail 服务" #. module: fetchmail #: model:ir.actions.act_window,name:fetchmail.act_server_history diff --git a/addons/gamification_sale_crm/i18n/es.po b/addons/gamification_sale_crm/i18n/es.po index dba46352a75..d617d50c40f 100644 --- a/addons/gamification_sale_crm/i18n/es.po +++ b/addons/gamification_sale_crm/i18n/es.po @@ -3,16 +3,17 @@ # * gamification_sale_crm # # Translators: -# Pedro M. Baeza , 2017 -# Martin Trigaux , 2017 +# Pedro M. Baeza , 2016 +# Martin Trigaux, 2016 # Christopher Ormaza , 2017 +# JOSE ALEJANDRO ECHEVERRI VALENCIA , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Christopher Ormaza , 2017\n" +"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +72,7 @@ msgstr "Tiempo para calificar una iniciativa" #. module: gamification_sale_crm #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds msgid "Total Customer Credit Notes" -msgstr "" +msgstr "Total Notas Crédito del Cliente" #. module: gamification_sale_crm #: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_sale1 diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index a7dead17eba..629d1ec2160 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -506,7 +506,7 @@ class HrExpenseSheet(models.Model): @api.onchange('employee_id') def _onchange_employee_id(self): - self.address_id = self.employee_id.address_home_id + self.address_id = self.employee_id.sudo().address_home_id self.department_id = self.employee_id.department_id self.user_id = self.employee_id.expense_manager_id diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index c8b919b13bf..5828e566c4c 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -63,7 +63,7 @@ - + diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py index e6d83fffe7a..e50ba97a7a2 100644 --- a/addons/hr_holidays/models/hr.py +++ b/addons/hr_holidays/models/hr.py @@ -223,7 +223,12 @@ class Employee(models.Model): def write(self, values): res = super(Employee, self).write(values) - if 'parent_id' in values: + if 'parent_id' in values or 'department_id' in values: holidays = self.env['hr.holidays'].search([('state', 'in', ['draft', 'confirm']), ('employee_id', 'in', self.ids)]) - holidays.write({'manager_id': values['parent_id']}) + hr_vals = {} + if values.get('parent_id') is not None: + hr_vals['manager_id'] = values['parent_id'] + if values.get('department_id') is not None: + hr_vals['department_id'] = values['department_id'] + holidays.write(hr_vals) return res diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 047d11302b9..1cf1ee9b17f 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -88,6 +88,7 @@ class HolidaysRequest(models.Model): @api.onchange('employee_id') def _onchange_employee_id(self): self.manager_id = self.employee_id and self.employee_id.parent_id + self.department_id = self.employee_id and self.employee_id.department_id @api.multi @api.depends('number_of_days_temp') diff --git a/addons/hr_payroll_account/models/hr_payroll_account.py b/addons/hr_payroll_account/models/hr_payroll_account.py index e76173d45a4..da168912095 100644 --- a/addons/hr_payroll_account/models/hr_payroll_account.py +++ b/addons/hr_payroll_account/models/hr_payroll_account.py @@ -158,7 +158,6 @@ class HrContract(models.Model): class HrPayslipRun(models.Model): _inherit = 'hr.payslip.run' - _description = 'Payslip Run' journal_id = fields.Many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True, default=lambda self: self.env['account.journal'].search([('type', '=', 'general')], limit=1)) diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po index ecfa4c0cd67..9811cec9573 100644 --- a/addons/hr_recruitment/i18n/fr.po +++ b/addons/hr_recruitment/i18n/fr.po @@ -691,6 +691,9 @@ msgid "" " If you install the document management modules, all resumes are indexed automatically,\n" " so that you can easily search through their content." msgstr "" +"Les postulants et leur CV sont créés automatiquement lorsqu'un e-mail est envoyé. \n" +"Si vous installez les modules de gestion des documents, tous les CV sont automatiquement indexés,\n" +"ainsi vous pouvez parcourir facilement leur contenu." #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban @@ -789,7 +792,7 @@ msgstr "Catégorie de candidat" #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config msgid "Click here to create a new job position." -msgstr "" +msgstr "Cliquez ici pour créer un poste." #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee @@ -883,7 +886,7 @@ msgstr "Créer un employé" #: model:ir.actions.act_window,name:hr_recruitment.create_job_simple #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form msgid "Create a Job Position" -msgstr "" +msgstr "Créer un poste" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_source_tree @@ -894,7 +897,7 @@ msgstr "Créer un alias" #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_sources msgid "" "Create some aliases that will allow you to track where applicants come from." -msgstr "" +msgstr "Créez des alias pour connaître la provenance des candidats." #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_create_uid @@ -1260,11 +1263,12 @@ msgstr "Poste" #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations msgid "Job Application Confirmation: ${object.job_id.name | safe}" msgstr "" +"Confirmation de la candidature à un poste : ${object.job_id.name | safe}" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_pivot_view_job msgid "Job Applications" -msgstr "" +msgstr "Candidatures à un poste" #. module: hr_recruitment #: model:utm.campaign,name:hr_recruitment.utm_campaign_job @@ -1274,7 +1278,7 @@ msgstr "Campagne d'offres " #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form msgid "Job Email" -msgstr "" +msgstr "E-mail du poste" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_job_id @@ -1317,7 +1321,7 @@ msgstr "Publication d'offres d'emploi" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_job_id msgid "Job Specific" -msgstr "" +msgstr "Détails du poste" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search @@ -1501,7 +1505,7 @@ msgstr "Nombre de documents joints" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_delay_close msgid "Number of days to close" -msgstr "" +msgstr "Nombre de jours pour clôturer" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_applications @@ -1524,7 +1528,7 @@ msgstr "" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey msgid "Offer" -msgstr "" +msgstr "Offre" #. module: hr_recruitment #: model:res.groups,name:hr_recruitment.group_hr_recruitment_user @@ -1537,6 +1541,8 @@ msgid "" "Once a job position is created, you can track related applications\n" " and manage the recruitment process." msgstr "" +"Une fois qu'un poste est créé, vous pouvez suivre les candidatures associées\n" +" et gérer le processus de recrutement." #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config @@ -1597,7 +1603,7 @@ msgstr "" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id msgid "Person responsible of validating the employee's contracts." -msgstr "" +msgstr "Responsable de la validation des contrats des employés." #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone @@ -1702,7 +1708,7 @@ msgstr "Refusée" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job msgid "Reopen Application" -msgstr "" +msgstr "Rouvrir la candidature" #. module: hr_recruitment #: model:ir.ui.menu,name:hr_recruitment.report_hr_recruitment @@ -1814,6 +1820,8 @@ msgstr "Origines des candidats" #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id msgid "Specific job that uses this stage. Other jobs will not use this stage." msgstr "" +"Poste spécifique qui utilise cette étape. D'autres postes ne pourront pas " +"utiliser cette étape." #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_stage_id @@ -1944,6 +1952,9 @@ msgid "" "These aliases can be emails or urls for every source. When the applicant " "arrives here through one of these you'll know where he came from." msgstr "" +"Ces alias peuvent être des e-mails ou des URL pour chaque source. Lorsque le" +" candidat arrive sur cette page via l'un de ces moyens, vous saurez d'où il " +"vient." #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_email_cc @@ -1974,6 +1985,10 @@ msgid "" " files so that you can search keywords from the content of these\n" " files." msgstr "" +"Ce menu vous aide à parcourir des CV et des lettres de\n" +" motivation. Odoo indexe automatiquement les fichiers .PDF, .DOC, DOCX, .TXT\n" +" afin que vous puissiez rechercher des mots-clés depuis le contenu de ces\n" +" fichiers." #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_fold @@ -1997,6 +2012,8 @@ msgid "" "Try to send an email to this address, it will create an application " "automatically." msgstr "" +"Essayez d'envoyer un e-mail à cette adresse. Cela créera automatiquement une" +" application." #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search @@ -2028,6 +2045,10 @@ msgid "" "process. Select the form to use in the job position detail form. This relies" " on Survey app." msgstr "" +"Utilisez des formulaires d'entretien adaptés à chaque poste pendant le " +"processus de recrutement. Sélectionnez le formulaire à utiliser dans le " +"formulaire d'informations sur le poste. Cela dépend de l'application " +"Enquêtes." #. module: hr_recruitment #. openerp-web @@ -2085,12 +2106,12 @@ msgstr "" #. module: hr_recruitment #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest msgid "Your Application: ${object.job_id.name | safe}" -msgstr "" +msgstr "Votre candidature : ${object.job_id.name | safe}" #. module: hr_recruitment #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse msgid "Your Job Application: ${object.job_id.name | safe}" -msgstr "" +msgstr "Votre candidature à un poste : ${object.job_id.name | safe}" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po index e84fe094872..8f8a27f7e02 100644 --- a/addons/hr_recruitment/i18n/zh_CN.po +++ b/addons/hr_recruitment/i18n/zh_CN.po @@ -668,6 +668,9 @@ msgid "" " If you install the document management modules, all resumes are indexed automatically,\n" " so that you can easily search through their content." msgstr "" +"申请人及其简历附件将在发送电子邮件时自动创建。\n" +" 如果您安装了文件管理模块，所有简历将自动检索，\n" +" 这样便可通过简历内容轻松搜索。" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban @@ -766,7 +769,7 @@ msgstr "申请人类别" #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config msgid "Click here to create a new job position." -msgstr "" +msgstr "点击此处创建新职位。" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee @@ -848,7 +851,7 @@ msgstr "创建" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form msgid "Create & Edit" -msgstr "" +msgstr "创建和编辑" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job @@ -870,7 +873,7 @@ msgstr "生产别名" #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_sources msgid "" "Create some aliases that will allow you to track where applicants come from." -msgstr "" +msgstr "创建一些用于跟踪申请人来自何处的别名。" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_create_uid @@ -903,7 +906,7 @@ msgstr "创建周" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_action_activity msgid "Currently there are not any activity scheduled." -msgstr "" +msgstr "目前，未计划任何活动。" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_day_close @@ -1163,7 +1166,7 @@ msgstr "HR 部门" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_hr_responsible_id msgid "HR Responsible" -msgstr "" +msgstr "人力资源主管" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban @@ -1222,12 +1225,12 @@ msgstr "工作" #. module: hr_recruitment #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations msgid "Job Application Confirmation: ${object.job_id.name | safe}" -msgstr "" +msgstr "职位申请确认：${object.job_id.name | safe}" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_pivot_view_job msgid "Job Applications" -msgstr "" +msgstr "职位申请" #. module: hr_recruitment #: model:utm.campaign,name:hr_recruitment.utm_campaign_job @@ -1275,12 +1278,12 @@ msgstr "工作岗位" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form msgid "Job Posting" -msgstr "" +msgstr "职位发布" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_job_id msgid "Job Specific" -msgstr "" +msgstr "具体职位" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search @@ -1370,12 +1373,12 @@ msgstr "我的活动" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter msgid "My Applications" -msgstr "" +msgstr "我的申请" #. module: hr_recruitment #: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_action_activity msgid "My Next Activities" -msgstr "" +msgstr "我的下一个活动" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_name @@ -1449,7 +1452,7 @@ msgstr "无主题" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes msgid "No document yet." -msgstr "" +msgstr "还没有文件。" #. module: hr_recruitment #: selection:hr.applicant,priority:0 @@ -1464,7 +1467,7 @@ msgstr "附件数量" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_delay_close msgid "Number of days to close" -msgstr "" +msgstr "要关闭的天数" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_applications @@ -1483,7 +1486,7 @@ msgstr "Odoo帮助您在招聘过程跟踪申请人及跟进所有操作：会 #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey msgid "Offer" -msgstr "" +msgstr "录取通知书" #. module: hr_recruitment #: model:res.groups,name:hr_recruitment.group_hr_recruitment_user @@ -1496,6 +1499,8 @@ msgid "" "Once a job position is created, you can track related applications\n" " and manage the recruitment process." msgstr "" +"职位一经创建，您便可以跟踪相关申请\n" +" 并管理招聘流程。" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config @@ -1504,17 +1509,19 @@ msgid "" " and manage the recruitment process related to the job\n" " position." msgstr "" +"职位一经创建，您便可以跟踪申请人\n" +" 并管理与职位相关的招聘流程。" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search msgid "Ongoing" -msgstr "" +msgstr "正在进行" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_website_hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form msgid "Online Posting" -msgstr "" +msgstr "在线发布" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_job_alias_force_thread_id @@ -1552,7 +1559,7 @@ msgstr "" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id msgid "Person responsible of validating the employee's contracts." -msgstr "" +msgstr "确认员工合同的负责人。" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone @@ -1590,7 +1597,7 @@ msgstr "薪酬标准" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form msgid "Publish available jobs on your website" -msgstr "" +msgstr "在网站上发布现有职位" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_alias_force_thread_id @@ -1766,7 +1773,7 @@ msgstr "应聘者来源" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id msgid "Specific job that uses this stage. Other jobs will not use this stage." -msgstr "" +msgstr "使用此阶段的具体职位。其他职位将不使用此阶段。" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_stage_id @@ -1884,7 +1891,7 @@ msgstr "" msgid "" "These aliases can be emails or urls for every source. When the applicant " "arrives here through one of these you'll know where he came from." -msgstr "" +msgstr "这些别名可以是电子邮件或每个来源的 url。当申请人通过上述两种方式之一到这里时，您便会知道他来自哪里。" #. module: hr_recruitment #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_email_cc @@ -1932,7 +1939,7 @@ msgstr "今天的活动" msgid "" "Try to send an email to this address, it will create an application " "automatically." -msgstr "" +msgstr "尝试向此地址发送电子邮件，它会自动创建申请。" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search @@ -1955,7 +1962,7 @@ msgstr "更新日期" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form msgid "Use interview forms during recruitment process" -msgstr "" +msgstr "在招聘流程中使用面试表单" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form @@ -1963,7 +1970,7 @@ msgid "" "Use interview forms tailored to each job position during the recruitment " "process. Select the form to use in the job position detail form. This relies" " on Survey app." -msgstr "" +msgstr "在招聘流程中使用针对每个职位定制的面试表单。选择要在职位详细信息表单中使用的表单。具体取决于“调查”应用。" #. module: hr_recruitment #. openerp-web @@ -1997,7 +2004,7 @@ msgstr "关注者的电子邮件" #. module: hr_recruitment #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_employee msgid "Welcome ${object.name} " -msgstr "" +msgstr "欢迎 ${object.name}" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee @@ -2021,7 +2028,7 @@ msgstr "" #. module: hr_recruitment #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse msgid "Your Job Application: ${object.job_id.name | safe}" -msgstr "" +msgstr "您的职位申请：${object.job_id.name | safe}" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form diff --git a/addons/iap/i18n/fr.po b/addons/iap/i18n/fr.po index def2ea53822..bd6706b5c2b 100644 --- a/addons/iap/i18n/fr.po +++ b/addons/iap/i18n/fr.po @@ -3,17 +3,18 @@ # * iap # # Translators: +# Florian Hatat, 2017 # Eloïse Stilmant , 2017 # Bertrand LATOUR , 2017 # Fabien Pinckaers , 2017 -# Florian Hatat , 2017 +# fr trans , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 11:35+0000\n" "PO-Revision-Date: 2017-10-10 11:35+0000\n" -"Last-Translator: Florian Hatat , 2017\n" +"Last-Translator: fr trans , 2018\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,7 +86,7 @@ msgstr "ID" #: code:addons/iap/static/src/xml/iap_templates.xml:22 #, python-format msgid "In-App Purchases" -msgstr "" +msgstr "Achats intégrés" #. module: iap #. openerp-web diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml index 14ad3eaefa0..0f6bb86479f 100644 --- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml +++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml @@ -545,7 +545,6 @@ result = -contract.car_atn ref('hr_salary_rule_representation_fees'), ref('hr_payroll_rules_suppl_net'), ref('hr_payroll_rules_retained_net'), - ref('hr_salary_rule_commission_on_target'), ref('hr_salary_rule_pp_reduction_employees'), ])]" name="rule_ids"/> @@ -571,7 +570,6 @@ result = -contract.car_atn ref('hr_salary_rule_representation_fees'), ref('hr_payroll_rules_suppl_net'), ref('hr_payroll_rules_retained_net'), - ref('hr_salary_rule_commission_on_target'), ref('hr_salary_rule_pp_reduction_workers') ])]" name="rule_ids"/> diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py index bf8bab9ac6d..0d182afcc72 100644 --- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py +++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py @@ -116,8 +116,8 @@ class HrContract(models.Model): @api.depends('commission_on_target') def _compute_warrants_cost(self): for contract in self: - contract.warrants_cost = contract.commission_on_target * 1.326 / 1.05 * 12.0 - contract.warrant_value_employee = contract.warrants_cost * 0.54 + contract.warrants_cost = contract.commission_on_target * 1.05 * 12.0 + contract.warrant_value_employee = contract.commission_on_target * (1.00 - 0.535) * 12.0 @api.depends('wage', 'fuel_card', 'representation_fees', 'transport_employer_cost', 'internet', 'mobile', 'mobile_plus') @@ -230,7 +230,7 @@ class HrContract(models.Model): - 12.0 * contract.internet \ - 12.0 * (contract.mobile + contract.mobile_plus) \ - 12.0 * contract.transport_employer_cost \ - - (1.326 / 1.05 * 12.0) * contract.commission_on_target \ + - contract.warrants_cost \ - 220.0 * contract.meal_voucher_paid_by_employer gross = remaining_for_gross / (13.0 + 13.0 * 0.3507 + 0.92) return gross diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po index 69822687d5c..a8813b84df6 100644 --- a/addons/lunch/i18n/es.po +++ b/addons/lunch/i18n/es.po @@ -116,6 +116,8 @@ msgid "" "Alerts are used to warn employee from possible issues concerning the lunch orders.\n" " To create a lunch alert you have to define its recurrence, the time interval during which the alert should be executed and the message to display." msgstr "" +"Las alertas se utilizan para avisar a los empleados de posibles problemas relacionados con los pedidos de la comida.\n" +" Para crear una alerta para la comida tiene que indicar las repeticiones, el intervalo de tiempo durante el que esta tenga que ejecutarse y el mensaje para mostrar." #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_amount @@ -136,7 +138,7 @@ msgstr "Archivado" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_balance_visible msgid "Balance Visible" -msgstr "" +msgstr "Saldo visible" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_start_hour @@ -146,7 +148,7 @@ msgstr "Entre" #. module: lunch #: model:ir.ui.view,arch_db:lunch.view_lunch_alert_kanban msgid "Between:" -msgstr "" +msgstr "Entre:" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search_2 @@ -156,7 +158,7 @@ msgstr "Por empleado" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search msgid "By Order" -msgstr "" +msgstr "Por pedido" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search @@ -203,7 +205,7 @@ msgstr "Movimiento de caja" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_cash_move_balance msgid "Cash Move Balance" -msgstr "" +msgstr "Saldo de caja" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id @@ -517,22 +519,22 @@ msgstr "Pedido de comida" #. module: lunch #: model:ir.actions.server,name:lunch.action_server_lunch_archive_product msgid "Lunch: Archive/Restore products" -msgstr "" +msgstr "Comida: Archivar/Restaurar los productos" #. module: lunch #: model:ir.actions.server,name:lunch.lunch_order_line_action_cancel msgid "Lunch: Cancel meals" -msgstr "" +msgstr "Comida: Cancelar las comidas" #. module: lunch #: model:ir.actions.server,name:lunch.lunch_order_line_action_order msgid "Lunch: Order meals" -msgstr "" +msgstr "Comida: Pedir las comidas" #. module: lunch #: model:ir.actions.server,name:lunch.lunch_order_line_action_confirm msgid "Lunch: Receive meals" -msgstr "" +msgstr "Comida: Recibir las comidas" #. module: lunch #: model:ir.ui.menu,name:lunch.menu_lunch_admin @@ -607,19 +609,20 @@ msgstr "Nota" #: code:addons/lunch/models/lunch.py:225 #, python-format msgid "Only your lunch manager cancels the orders." -msgstr "" +msgstr "Solo el responsable de las comidas puede cancelar los pedidos." #. module: lunch #: code:addons/lunch/models/lunch.py:194 #, python-format msgid "Only your lunch manager processes the orders." -msgstr "" +msgstr "Solo responsable de las comidas puede hacer los pedidos." #. module: lunch #: code:addons/lunch/models/lunch.py:214 #, python-format msgid "Only your lunch manager sets the orders as received." msgstr "" +"Solo el responsable de las comidas puede indicar los pedidos como recibidos." #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_order_id @@ -671,12 +674,12 @@ msgstr "Pagos" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_ids msgid "Previous Order" -msgstr "" +msgstr "Pedido anterior" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_widget msgid "Previous Order Widget" -msgstr "" +msgstr "Widget del pedido anterior" #. module: lunch #: model:ir.ui.menu,name:lunch.lunch_order_menu_tree diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po index 2e26bf050ea..947465fb012 100644 --- a/addons/mail/i18n/es.po +++ b/addons/mail/i18n/es.po @@ -313,7 +313,7 @@ msgstr "" #: code:addons/mail/static/src/xml/activity.xml:49 #, python-format msgid ", due on" -msgstr "" +msgstr ", vencido a fecha" #. module: mail #. openerp-web @@ -327,21 +327,21 @@ msgstr "-------- Mostrar mensajes antiguos--------" #: code:addons/mail/static/src/xml/systray.xml:78 #, python-format msgid "0 Future" -msgstr "" +msgstr "0 futuro" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/systray.xml:74 #, python-format msgid "0 Late" -msgstr "" +msgstr "0 tarde" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/systray.xml:76 #, python-format msgid "0 Today" -msgstr "" +msgstr "0 hoy" #. module: mail #: code:addons/mail/models/mail_channel.py:678 @@ -688,7 +688,7 @@ msgstr "Actividad" #. module: mail #: model:ir.model,name:mail.model_mail_activity_mixin msgid "Activity Mixin" -msgstr "" +msgstr "Mezcla de actividades" #. module: mail #: model:ir.model,name:mail.model_mail_activity_type @@ -739,6 +739,8 @@ msgstr "Añadir seguidores" #, python-format msgid "Add Followers can only be done on a mail thread model" msgstr "" +"Añadir seguidores solo puede hacerse en un modelo de hilos de correo " +"electrónico" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature @@ -1102,7 +1104,7 @@ msgstr "Canal" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids msgid "Channel Message" -msgstr "" +msgstr "Mensaje del canal" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type @@ -1645,7 +1647,7 @@ msgstr "Hecho" #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup #, python-format msgid "Done & Schedule Next" -msgstr "" +msgstr "¡Hecho! Prepare el próximo" #. module: mail #. openerp-web @@ -1673,7 +1675,7 @@ msgstr "Fecha vencimiento" #: code:addons/mail/static/src/js/activity.js:37 #, python-format msgid "Due in %d days" -msgstr "" +msgstr "Vencido en %d días" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -3017,7 +3019,7 @@ msgstr "Registrar o planificar una actividad" #: model:ir.model.fields,field_description:mail.field_mail_message_mail_activity_type_id #: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_activity_type_id msgid "Mail Activity Type" -msgstr "" +msgstr "Tipo de actividad del correo electrónico" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form @@ -3071,7 +3073,7 @@ msgstr "Opción de envío por correo" #: code:addons/mail/static/src/xml/activity.xml:59 #, python-format msgid "Mark Done" -msgstr "" +msgstr "Marcar como hecho" #. module: mail #. openerp-web @@ -4052,7 +4054,7 @@ msgstr "Abrir chat" #: code:addons/mail/static/src/xml/extended_chat_window.xml:15 #, python-format msgid "Open in Discuss" -msgstr "" +msgstr "Abrir para debate" #. module: mail #: model:ir.model.fields,field_description:mail.field_res_partner_opt_out @@ -4434,7 +4436,7 @@ msgstr "Canales públicos" #: model:ir.cron,cron_name:mail.ir_cron_module_update_notification #: model:ir.cron,name:mail.ir_cron_module_update_notification msgid "Publisher: Update Notification" -msgstr "" +msgstr "Editor: Actualizar la notificación" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:179 @@ -4810,7 +4812,7 @@ msgstr "Configuración" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_shortcode_shortcode_type msgid "Shortcode Type" -msgstr "" +msgstr "Tipo de codigo corto" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form @@ -5059,7 +5061,7 @@ msgstr "Notificación del sistema" #. module: mail #: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities msgid "Technical field for UX purpose" -msgstr "" +msgstr "Campo técnico para fines UX" #. module: mail #: model:ir.actions.act_window,name:mail.wizard_email_template_preview @@ -5668,7 +5670,7 @@ msgstr "Quien puede seguir las actividades del grupo?" #: code:addons/mail/static/src/xml/activity.xml:75 #, python-format msgid "Write Feedback" -msgstr "" +msgstr "Escribir comentarios" #. module: mail #. openerp-web @@ -5791,7 +5793,7 @@ msgstr "Se ha dado de baja de %s." #: code:addons/mail/static/src/xml/client_action.xml:217 #, python-format msgid "You:" -msgstr "" +msgstr "Usted:" #. module: mail #. openerp-web @@ -5834,6 +5836,8 @@ msgid "" "done\n" " by" msgstr "" +"hecho\n" +" por" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po index 8e88042d498..94e1807945b 100644 --- a/addons/mail/i18n/zh_CN.po +++ b/addons/mail/i18n/zh_CN.po @@ -200,14 +200,14 @@ msgstr "(从" msgid "" "* Smiley are only used for HTML code to display an image * Text (default " "value) is used to substitute text with another text" -msgstr "" +msgstr "* 笑脸仅用于 HTML 代码显示图像 * 文本 (默认值) 是用于和其他文本代替文本" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/activity.xml:49 #, python-format msgid ", due on" -msgstr "" +msgstr "，应提交" #. module: mail #. openerp-web @@ -602,7 +602,7 @@ msgstr "添加关注者" #: code:addons/mail/models/ir_actions.py:36 #, python-format msgid "Add Followers can only be done on a mail thread model" -msgstr "" +msgstr "仅在邮件线程模型上可以添加关注者" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature @@ -773,7 +773,7 @@ msgstr "附件" msgid "" "Attachments are linked to a document through model / res_id and to the " "message through this field." -msgstr "" +msgstr "附件是通过模型 / res_id 连接到文档中并通过该字段链接到消息上。" #. module: mail #: selection:mail.alias,alias_contact:0 @@ -921,7 +921,7 @@ msgstr "抄送收件人（可以在这里使用占位符）" #: model:ir.model.fields,help:mail.field_mail_activity_activity_category #: model:ir.model.fields,help:mail.field_mail_activity_type_category msgid "Categories may trigger specific behavior like opening calendar view" -msgstr "" +msgstr "类别可能触发特定行为，例如，打开日历视图" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity_activity_category @@ -1463,7 +1463,7 @@ msgstr "相关单据的显示名称" msgid "" "Do not keep a copy of the email in the document communication history (mass " "mailing only)" -msgstr "" +msgstr "不要在文档通信历史中保存电子邮件副本（仅限群发邮件）" #. module: mail #: model:ir.model,name:mail.model_mail_followers @@ -1744,7 +1744,7 @@ msgstr "字段" #: code:addons/mail/models/ir_model.py:24 #, python-format msgid "Field \"Mail Thread\" cannot be changed to \"False\"." -msgstr "" +msgstr "字段“电子邮件线程”不能更改为“假”。" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc @@ -2026,7 +2026,7 @@ msgstr "正在关注中" #: model:ir.model.fields,help:mail.field_mail_activity_icon #: model:ir.model.fields,help:mail.field_mail_activity_type_icon msgid "Font awesome icon e.g. fa-tasks" -msgstr "" +msgstr "绝佳字体图标，例如，fa-task" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_from @@ -2333,7 +2333,7 @@ msgstr "如果选中”退出“，这个联系人拒绝接收群发邮件和市 msgid "" "If set, the queue manager will send the email after the date. If not set, " "the email will be send as soon as possible." -msgstr "" +msgstr "如果设置完毕，队列管理员将在指定日期之后发送电子邮件。如果未设置完毕，电子邮件将尽快发送。" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date @@ -2341,7 +2341,7 @@ msgstr "" msgid "" "If set, the queue manager will send the email after the date. If not set, " "the email will be send as soon as possible. Jinja2 placeholders may be used." -msgstr "" +msgstr "如果设置完毕，队列管理员将在指定日期之后发送电子邮件。如果未设置完毕，电子邮件将尽快发送。可以使用 Jinja2 占位符。" #. module: mail #: model:ir.model.fields,help:mail.field_res_config_settings_alias_domain @@ -3549,7 +3549,7 @@ msgstr "行动数量" msgid "" "Number of days before executing the action. It allows to plan the action " "deadline." -msgstr "" +msgstr "执行操作前的天数。允许计划操作截止日期。" #. module: mail #: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter @@ -3698,7 +3698,7 @@ msgstr "Odoo" #, python-format msgid "" "Odoo has now the permission to send you native notifications on this device." -msgstr "" +msgstr "Odoo 现在有权限在该设备上发送本地通知。" #. module: mail #. openerp-web @@ -3714,7 +3714,7 @@ msgstr "Odoo需要你的权限进行" msgid "" "Odoo will not have the permission to send native notifications on this " "device." -msgstr "" +msgstr "Odoo 没有权限在该设备上发送本地通知。" #. module: mail #. openerp-web @@ -3765,7 +3765,7 @@ msgstr "变更时" msgid "" "Once a message has been starred, you can come back and review it at any time" " here." -msgstr "" +msgstr "如果消息已生效，您可以返回并随时在此对它进行检查。" #. module: mail #. openerp-web @@ -4081,14 +4081,14 @@ msgstr "播放此视频" #: code:addons/mail/static/src/js/chatter_composer.js:158 #, python-format msgid "Please complete customer's informations" -msgstr "" +msgstr "请填写客户的信息" #. module: mail #. openerp-web #: code:addons/mail/static/src/js/many2many_tags_email.js:84 #, python-format msgid "Please complete customer's informations and email" -msgstr "" +msgstr "请填写客户的信息和电子邮件" #. module: mail #. openerp-web @@ -4104,6 +4104,9 @@ msgid "" "- Emails: notifications are sent to your email\n" "- Odoo: notifications appear in your Odoo Inbox" msgstr "" +"关于如何处理聊天通知的策略：\n" +"-电子邮件：发送通知到电子邮件中 \n" +"-Odoo：在 Odoo 收件箱中显示通知" #. module: mail #: model:ir.model.fields,help:mail.field_mail_alias_alias_contact @@ -4625,7 +4628,7 @@ msgstr "表情符" msgid "" "Specify a model if the activity should be specific to a model and not " "available when managing activities for other models." -msgstr "" +msgstr "如果活动应特定于某个模型并且在管理其他模型的活动时不可用，则指定一个模型。" #. module: mail #. openerp-web @@ -4703,6 +4706,10 @@ msgid "" "Today: Activity date is today\n" "Planned: Future activities." msgstr "" +"基于活动的状态 \n" +" 逾期：已经超过截止日期 \n" +" 现今：活动日期是当天 \n" +" 计划：未来的活动。" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_sub_model_object_field @@ -4804,7 +4811,7 @@ msgstr "模板" #. module: mail #: model:ir.model.fields,help:mail.field_mail_shortcode_substitution msgid "The escaped html code replacing the shortcut" -msgstr "" +msgstr "html 转义码替换快捷方式" #. module: mail #: model:ir.model.fields,help:mail.field_mail_alias_alias_model_id @@ -4855,18 +4862,18 @@ msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_mail_shortcode_source msgid "The shortcut which must be replaced in the Chat Messages" -msgstr "" +msgstr "在聊天信息中，必须替换掉的快捷方式" #. module: mail #: model:ir.model.fields,help:mail.field_mail_shortcode_unicode_source msgid "The source is replaced by this unicode character in the Chat Messages" -msgstr "" +msgstr "在聊天信息中，通过该统一字符替换源" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_model_id #: model:ir.model.fields,help:mail.field_mail_template_model_id msgid "The type of document this template can be used with" -msgstr "" +msgstr "该模板可使用的文档类型" #. module: mail #: model:ir.ui.view,arch_db:mail.message_origin_link @@ -4977,7 +4984,7 @@ msgstr "在该群组中讨论的话题 ..." msgid "" "Tracked values are stored in a separate model. This field allow to " "reconstruct the tracking and to generate statistics on the model." -msgstr "" +msgstr "在单独的模型中存储跟踪值。该字段允许重建跟踪，以便在模型中生成统计数据。" #. module: mail #: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility @@ -5022,13 +5029,13 @@ msgstr "UUID" #: code:addons/mail/models/mail_mail.py:235 #, python-format msgid "Unable to connect to SMTP Server" -msgstr "" +msgstr "无法连接到 SMTP 服务器" #. module: mail #: code:addons/mail/models/mail_message.py:31 #, python-format msgid "Unable to send email, please configure the sender's email address." -msgstr "" +msgstr "无法发送电子邮件，请设定发送人的电子邮件地址。" #. module: mail #. openerp-web @@ -5222,7 +5229,7 @@ msgstr "退订频道" #: code:addons/mail/models/mail_template.py:510 #, python-format msgid "Unsupported report type %s found." -msgstr "" +msgstr "发现不支持的报告类型 %。" #. module: mail #. openerp-web @@ -5293,6 +5300,8 @@ msgid "" "and Enterprise versions. Online users already benefit from a ready-to-use " "email server (@mycompany.odoo.com)." msgstr "" +"在社区和企业版本中，发送/接收电子邮件需要使用自己的电子邮件服务器。在线用户已受益于随时可用的电子邮件服务器 " +"(@mycompany.odoo.com)。" #. module: mail #: code:addons/mail/models/mail_thread.py:670 @@ -5316,6 +5325,9 @@ msgid "" " If you remove a follower, he won't be notified of any email or discussion on this document.\n" " Do you really want to remove this follower ?" msgstr "" +"警告！\n" +" 如果你删除了一个关注者，任何电子邮件或在此文档之上的讨论都不再通知这个关注者了。\n" +" 你真的想要删除这个关注者吗 ?" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field @@ -5337,7 +5349,7 @@ msgstr "如果关系型字段被选为第一个字段，这个字段显示这个 #: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility msgid "" "When set, every modification to this field will be tracked in the chatter." -msgstr "" +msgstr "当设置完毕时，在聊天中，将追踪对该字段的每一次修改。" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_is_log @@ -5475,14 +5487,14 @@ msgstr "你不再订阅%s。" #: code:addons/mail/static/src/xml/client_action.xml:217 #, python-format msgid "You:" -msgstr "" +msgstr "您：" #. module: mail #. openerp-web #: code:addons/mail/static/src/js/thread_field.js:83 #, python-format msgid "Your message has not been sent." -msgstr "" +msgstr "您的短信尚未发送。" #. module: mail #: code:addons/mail/models/ir_actions.py:30 @@ -5494,7 +5506,7 @@ msgstr "你的模板需要定义email_from" #: code:addons/mail/models/mail_thread.py:966 #, python-format msgid "alias %s: %s" -msgstr "" +msgstr "别名 %：%" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form @@ -5517,7 +5529,7 @@ msgstr "单据" msgid "" "done\n" " by" -msgstr "" +msgstr "由谁完成 \n" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup @@ -5548,7 +5560,7 @@ msgstr "由于" #. module: mail #: model:ir.ui.view,arch_db:mail.message_origin_link msgid "from:" -msgstr "" +msgstr "从:" #. module: mail #: model:mail.channel,name:mail.channel_all_employees @@ -5570,7 +5582,7 @@ msgstr "不正确配置的别名" #: code:addons/mail/models/mail_alias.py:278 #, python-format msgid "incorrectly configured alias (unknown reference record)" -msgstr "" +msgstr "错误地别名配置（未知参考记录）" #. module: mail #: model:ir.model,name:mail.model_ir_actions_server @@ -5591,20 +5603,20 @@ msgstr "mail.alias.mixin" #: code:addons/mail/models/mail_thread.py:943 #, python-format msgid "model %s does not accept document creation" -msgstr "" +msgstr "模型 % 不接受文档创建" #. module: mail #: code:addons/mail/models/mail_thread.py:938 #, python-format msgid "model %s does not accept document update" -msgstr "" +msgstr "模型 % 不接受文档更新" #. module: mail #: code:addons/mail/models/mail_thread.py:931 #, python-format msgid "" "model %s does not accept document update, fall back on document creation" -msgstr "" +msgstr "模型 % 不接受文档更新，将在文档创建中退回" #. module: mail #: model:ir.ui.view,arch_db:mail.message_origin_link @@ -5637,7 +5649,7 @@ msgstr "在" msgid "" "posting a message without model should be with a null res_id (private " "message), received %s" -msgstr "" +msgstr "发布无模型消息应使用无效 res_id（私人信息），收到 %" #. module: mail #: code:addons/mail/models/mail_thread.py:917 @@ -5674,13 +5686,13 @@ msgstr "记录：" #: code:addons/mail/models/mail_thread.py:935 #, python-format msgid "reply to missing document (%s,%s)" -msgstr "" +msgstr "对缺失文档的回复 (%,%)" #. module: mail #: code:addons/mail/models/mail_thread.py:928 #, python-format msgid "reply to missing document (%s,%s), fall back on new document creation" -msgstr "" +msgstr "对丢失文档的回复 (%,%)，在新文档创建中退回" #. module: mail #: model:ir.model,name:mail.model_res_config_settings @@ -5691,7 +5703,7 @@ msgstr "设置-基础设置" #: code:addons/mail/models/mail_thread.py:913 #, python-format msgid "resetting thread_id" -msgstr "" +msgstr "重新设置 thread_id" #. module: mail #: code:addons/mail/models/mail_channel.py:254 diff --git a/addons/mail/models/ir_model.py b/addons/mail/models/ir_model.py index 3a312cfe843..04529610f0e 100644 --- a/addons/mail/models/ir_model.py +++ b/addons/mail/models/ir_model.py @@ -74,6 +74,6 @@ class IrModelField(models.Model): def _instanciate_attrs(self, field_data): attrs = super(IrModelField, self)._instanciate_attrs(field_data) - if field_data.get('track_visibility'): + if attrs and field_data.get('track_visibility'): attrs['track_visibility'] = field_data['track_visibility'] return attrs diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index cde5924207d..8042cab9b1d 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -209,7 +209,7 @@ class Channel(models.Model): # http://blogs.technet.com/b/exchange/archive/2006/10/06/3395024.aspx headers['X-Auto-Response-Suppress'] = 'OOF' if self.alias_domain and self.alias_name: - headers['List-Id'] = '%s.%s' % (self.alias_name, self.alias_domain) + headers['List-Id'] = '<%s.%s>' % (self.alias_name, self.alias_domain) headers['List-Post'] = '' % (self.alias_name, self.alias_domain) # Avoid users thinking it was a personal message # X-Forge-To: will replace To: after SMTP envelope is determined by ir.mail.server @@ -503,7 +503,15 @@ class Channel(models.Model): partners_to_add = partners - channel.channel_partner_ids channel.write({'channel_last_seen_partner_ids': [(0, 0, {'partner_id': partner_id}) for partner_id in partners_to_add.ids]}) for partner in partners_to_add: - notification = _('

joined #%s
') % (self.id, self.name,) + if partner.id != self.env.user.partner_id.id: + notification = _('
%(author)s invited %(new_partner)s to #%(channel_name)s
') % { + 'author': self.env.user.display_name, + 'new_partner': partner.display_name, + 'channel_id': channel.id, + 'channel_name': channel.name, + } + else: + notification = _('
joined #%s
') % (channel.id, channel.name,) self.message_post(body=notification, message_type="notification", subtype="mail.mt_comment", author_id=partner.id) # broadcast the channel header to the added partner diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 724f78ed827..3c17f207ab3 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -11,7 +11,7 @@ from odoo.exceptions import UserError, AccessError from odoo.osv import expression _logger = logging.getLogger(__name__) -_image_dataurl = re.compile(r'(data:image/[a-z]+?);base64,([a-z0-9+/]{3,}=*)([\'"])', re.I) +_image_dataurl = re.compile(r'(data:image/[a-z]+?);base64,([a-z0-9+/\n]{3,}=*)\n*([\'"])', re.I) class Message(models.Model): diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index 729d24b6163..2a421f6fdcd 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -235,6 +235,10 @@ var Thread = Widget.extend({ } }, on_click_redirect: function (event) { + // ignore inherited branding + if ($(event.target).data('oe-field') !== undefined) { + return; + } var id = $(event.target).data('oe-id'); if (id) { event.preventDefault(); diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js index 533fe67f91b..80b7736552c 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -18,7 +18,7 @@ function _parse_and_transform(nodes, transform_function) { // Suggested URL Javascript regex of http://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url // Adapted to make http(s):// not required if (and only if) www. is given. So `should.notmatch` does not match. -var url_regexp = /\b(?:https?:\/\/|(www\.))[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,13}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi; +var url_regexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._\+~#=]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_\+.~#?&//=]*)/gi; function linkify(text, attrs) { attrs = attrs || {}; if (attrs.target === undefined) { @@ -28,7 +28,7 @@ function linkify(text, attrs) { return key + '="' + _.escape(value) + '"'; }).join(' '); return text.replace(url_regexp, function (url) { - var href = (!/^(f|ht)tps?:\/\//i.test(url)) ? "http://" + url : url; + var href = (!/^https?:\/\//i.test(url)) ? "http://" + url : url; return '' + url + ''; }); } diff --git a/addons/mail/static/tests/mail_utils_tests.js b/addons/mail/static/tests/mail_utils_tests.js new file mode 100644 index 00000000000..e8ec776a8d5 --- /dev/null +++ b/addons/mail/static/tests/mail_utils_tests.js @@ -0,0 +1,34 @@ +odoo.define('mail.mail_utils_tests', function (require) { +"use strict"; + +var utils = require('mail.utils'); + +QUnit.module('mail', {}, function () { + +QUnit.module('Mail utils'); + +QUnit.test('add_link utility function', function (assert) { + assert.expect(7); + + var testInputs = { + 'http://admin:password@example.com:8/%2020': true, + 'https://admin:password@example.com/test': true, + 'www.example.com:8/test': true, + 'https://127.0.0.5:8069': true, + 'www.127.0.0.5': false, + 'should.notmatch': false, + 'fhttps://test.example.com/test': false, + }; + + _.each(testInputs, function (willLinkify, content) { + var output = utils.parse_and_transform(content, utils.add_link); + if (willLinkify) { + assert.strictEqual(output.indexOf(' + diff --git a/addons/maintenance/i18n/es.po b/addons/maintenance/i18n/es.po index 3e9bc25105f..a0035667602 100644 --- a/addons/maintenance/i18n/es.po +++ b/addons/maintenance/i18n/es.po @@ -601,7 +601,7 @@ msgstr "Duración de mantenimiento" #. module: maintenance #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_maintenance_duration msgid "Maintenance Duration in hours." -msgstr "" +msgstr "Duración del mantenimiento en horas." #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form @@ -676,7 +676,7 @@ msgstr "Tipos de mantenimiento" #: model:ir.cron,cron_name:maintenance.maintenance_requests_cron #: model:ir.cron,name:maintenance.maintenance_requests_cron msgid "Maintenance: generate preventive maintenance requests" -msgstr "" +msgstr "Mantenimiento: generar solicitudes de mantenimiento preventivo" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_model @@ -741,27 +741,27 @@ msgstr "Nota" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count msgid "Number of Requests" -msgstr "" +msgstr "Número de solicitudes" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_block msgid "Number of Requests Blocked" -msgstr "" +msgstr "Número de solicitudes bloqueadas" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_date msgid "Number of Requests Scheduled" -msgstr "" +msgstr "Número de solicitudes programadas" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_unscheduled msgid "Number of Requests Unscheduled" -msgstr "" +msgstr "Número de solicitudes desbloqueadas" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_high_priority msgid "Number of Requests in High Priority" -msgstr "" +msgstr "Número de solicitudes en alta prioridad" #. module: maintenance #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_force_thread_id @@ -872,7 +872,7 @@ msgstr "Lista para la siguiente etapa" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban msgid "Record Colour" -msgstr "" +msgstr "Registro del color" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_force_thread_id @@ -924,12 +924,12 @@ msgstr "Solicitado por" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban msgid "Requested by :" -msgstr "" +msgstr "Solicitado por:" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_ids msgid "Requests" -msgstr "" +msgstr "Solicitudes" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id @@ -941,7 +941,7 @@ msgstr "Responsable" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban msgid "Responsible :" -msgstr "" +msgstr "Responsable:" #. module: maintenance #: model:maintenance.equipment,name:maintenance.equipment_monitor1 @@ -1051,7 +1051,7 @@ msgstr "Miembros del equipo" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form msgid "Team Name" -msgstr "" +msgstr "Nombre del equipo" #. module: maintenance #: model:ir.actions.act_window,name:maintenance.maintenance_team_action_settings @@ -1117,6 +1117,9 @@ msgid "" " an employee or department. You will manage allocations, issues\n" " and maintenance of equipment." msgstr "" +"Esta aplicación le ayuda a hacer un seguimiento de los equipos utilizados por los empleados.\n" +" Designe un portátil, una impresora o un teléfono y vincule cada equipo a\\un empleado o departamento. Gestionará las asignaciones, las incidencias\n" +" y el mantenimiento de los equipos." #. module: maintenance #: model:ir.actions.act_window,help:maintenance.hr_equipment_action_from_category_form @@ -1125,6 +1128,9 @@ msgid "" " Create some laptop, printer or phone and link each equipment to an employee or department.\n" " You will manage allocations, issues and maintenance of equipment." msgstr "" +"Esta aplicación le ayuda a hacer un seguimiento de los equipos utilizados por los empleados.\n" +" Designe un portátil, una impresora o un teléfono y vincule cada equipo a un empleado o departamento.\n" +" Gestionará las asignaciones, incidencias y mantenimiento de los equipos." #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban @@ -1168,7 +1174,7 @@ msgstr "Mensajes por leer" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban msgid "Unscheduled" -msgstr "" +msgstr "No programado" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search @@ -1183,7 +1189,7 @@ msgstr "" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search msgid "Upcoming Activities (All)" -msgstr "" +msgstr "Próximas actividades (todas)" #. module: maintenance #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form diff --git a/addons/mass_mailing/i18n/es.po b/addons/mass_mailing/i18n/es.po index da36471d535..f395832da28 100644 --- a/addons/mass_mailing/i18n/es.po +++ b/addons/mass_mailing/i18n/es.po @@ -260,7 +260,7 @@ msgstr "Activo" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing msgid "Allow A/B Testing" -msgstr "" +msgstr "Permitir pruebas A/B" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line @@ -668,7 +668,7 @@ msgstr "Duplicar" #. module: mass_mailing #: model:ir.actions.act_window,name:mass_mailing.action_view_mail_mail_statistics_mailing_list msgid "EMails Sent" -msgstr "" +msgstr "Correos electrónicos enviados" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_email @@ -726,7 +726,7 @@ msgstr "Excepción" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search msgid "Exclude Bounced" -msgstr "" +msgstr "Excluir los rebotados" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search @@ -830,6 +830,10 @@ msgid "" " lets you send different mailings to randomly selected recipients and test " "the effectiveness of the mailings, without causing duplicate messages." msgstr "" +"Si se revisa, se hará solo un envío a los destinatarios para toda la " +"campaña. Esto permite hacer diferentes envíos a unos destinatarios " +"seleccionados al azar y comprobar la efectividad de los mismos sin enviar " +"mensajes duplicados." #. module: mass_mailing #: code:addons/mass_mailing/models/mass_mailing.py:549 @@ -1126,7 +1130,7 @@ msgstr "Etiqueta de Correo Masivo" #: model:ir.cron,cron_name:mass_mailing.ir_cron_mass_mailing_queue #: model:ir.cron,name:mass_mailing.ir_cron_mass_mailing_queue msgid "Mass Mailing: Process queue" -msgstr "" +msgstr "Correos electrónicos masivos: cola del proceso" #. module: mass_mailing #: model:ir.actions.act_window,name:mass_mailing.action_create_ab_mass_mailings_from_campaign @@ -1230,7 +1234,7 @@ msgstr "Nombre" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search msgid "Name / Email" -msgstr "" +msgstr "Nombre / Correo electrónico" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge_new_list_name @@ -1265,7 +1269,7 @@ msgstr "" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_kanban msgid "Number of bounced email." -msgstr "" +msgstr "Número de correos electrónicos rebotados." #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_clicks_ratio @@ -1408,12 +1412,12 @@ msgstr "Modelo para los destinatarios" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_name msgid "Recipients Model Name" -msgstr "" +msgstr "Nombre del modelo de destinatarios" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_real msgid "Recipients Real Model" -msgstr "" +msgstr "Modelo real de los destinatarios" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1 @@ -1774,12 +1778,16 @@ msgstr "" msgid "" "This is useful if your marketing campaigns are composed of several emails" msgstr "" +"Esto es útil si sus campañas de marketing se componen de varios correos " +"electrónicos" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form msgid "" "This is useful if your marketing campaigns are composed of several emails." msgstr "" +"Esto es útil si sus campañas de marketing se componen de varios correos " +"electrónicos" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form @@ -1981,7 +1989,7 @@ msgstr "por ej. Newsletter del Consumidor" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_form msgid "e.g. John Smith" -msgstr "" +msgstr "p. ej.:o, John Smith" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po index f7ea2039ada..75997113933 100644 --- a/addons/mrp/i18n/es.po +++ b/addons/mrp/i18n/es.po @@ -308,7 +308,7 @@ msgstr "Activo" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_active_move_line_ids msgid "Active Move Line" -msgstr "" +msgstr "Línea de movimiento activo" #. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form @@ -322,6 +322,9 @@ msgid "" "finished products as well. Without this option you only do: A + B = C. With " "the option: A + B = C + D." msgstr "" +"Añadir subproductos a las facturas de los materiales. Esto se puede usar " +"para obtener varios productos terminados también. Sin esta opción solo " +"puedes hacer: A + B = C. Con la opción: A + B = C + D." #. module: mrp #: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form @@ -352,12 +355,12 @@ msgstr "" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_production_post_visible msgid "Allowed to Post Inventory" -msgstr "" +msgstr "Se permite el post inventario" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_production_unreserve_visible msgid "Allowed to Unreserve Inventory" -msgstr "" +msgstr "Se permite cancelar el inventario" #. module: mrp #: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard @@ -506,7 +509,7 @@ msgstr "" #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action msgid "Bills of Materials" -msgstr "" +msgstr "Facturas de materiales" #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action @@ -655,7 +658,7 @@ msgstr "Limpiar" #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action msgid "Click here" -msgstr "" +msgstr "Click Aquí" #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_production_action @@ -665,22 +668,22 @@ msgstr "Click aquí para crear una Órden de Producción." #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_unbuild msgid "Click here to create a Unbuild Order." -msgstr "" +msgstr "Haga clic aquí para crear la cancelación de un pedido." #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_routing_action msgid "Click here to create a new Routing." -msgstr "" +msgstr "Haga clic aquí para crear una nueva ruta." #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action msgid "Click here to create a new Work Center" -msgstr "" +msgstr "Haga clic aquí para crear un nuevo centro de trabajo" #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_message_action_main msgid "Click here to create a new Work Order Message." -msgstr "" +msgstr "Haga clic aquí para crear un nuevo mensaje de la orden de trabajo" #. module: mrp #: model:ir.actions.act_window,help:mrp.action_work_orders @@ -2447,7 +2450,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_document_ir_attachment_id msgid "Related attachment" -msgstr "" +msgstr "Adjunto relacionado" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_repair diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py index f17939525f8..5cdd1eace62 100644 --- a/addons/mrp/models/mrp_bom.py +++ b/addons/mrp/models/mrp_bom.py @@ -81,6 +81,11 @@ class MrpBom(models.Model): if self.product_tmpl_id: self.product_uom_id = self.product_tmpl_id.uom_id.id + @api.onchange('routing_id') + def onchange_routing_id(self): + for line in self.bom_line_ids: + line.operation_id = False + @api.multi def name_get(self): return [(bom.id, '%s%s' % (bom.code and '%s: ' % bom.code or '', bom.product_tmpl_id.display_name)) for bom in self] diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po index 56d04634923..259e2934df4 100644 --- a/addons/pad/i18n/es.po +++ b/addons/pad/i18n/es.po @@ -4,18 +4,19 @@ # # Translators: # oihane , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Pedro M. Baeza , 2016 # Carles Antoli , 2016 # Jesús Alan Ramos Rodríguez , 2017 -# Antonio Trueba , 2017 +# Antonio Trueba, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Antonio Trueba , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "Clave de la API del pad" #. module: pad #: model:ir.model.fields,field_description:pad.field_res_config_settings_pad_key msgid "Pad Api Key *" -msgstr "" +msgstr "Contraseña de la Api del pad" #. module: pad #: model:ir.model.fields,field_description:pad.field_res_company_pad_server diff --git a/addons/payment/controllers/portal.py b/addons/payment/controllers/portal.py index 4047ef7d30a..444d936429b 100644 --- a/addons/payment/controllers/portal.py +++ b/addons/payment/controllers/portal.py @@ -31,49 +31,110 @@ class WebsitePayment(http.Controller): currency_id = currency_id and int(currency_id) or user.company_id.currency_id.id currency = env['res.currency'].browse(currency_id) - # Try default one then fallback on first - acquirer_id = acquirer_id and int(acquirer_id) or \ - env['ir.default'].get('payment.transaction', 'acquirer_id', company_id=user.company_id.id) or \ - env['payment.acquirer'].search([('website_published', '=', True), ('company_id', '=', user.company_id.id)])[0].id - - acquirer = env['payment.acquirer'].with_context(submit_class='btn btn-primary pull-right', - submit_txt=_('Pay Now')).browse(acquirer_id) + acquirers = None + if acquirer_id: + acquirers = env['payment.acquirer'].browse(int(acquirer_id)) + if not acquirers: + acquirers = env['payment.acquirer'].search([('website_published', '=', True), ('company_id', '=', user.company_id.id)]) # auto-increment reference with a number suffix if the reference already exists reference = request.env['payment.transaction'].get_next_reference(reference) partner_id = user.partner_id.id if not user._is_public() else False - payment_form = acquirer.sudo().render(reference, float(amount), currency.id, values={'return_url': '/website_payment/confirm', 'partner_id': partner_id}) values = { 'reference': reference, - 'acquirer': acquirer, 'currency': currency, 'amount': float(amount), - 'payment_form': payment_form, + 'return_url': '/website_payment/confirm', + 'partner_id': partner_id, + 'bootstrap_formatting': True, + 'error_msg': kw.get('error_msg') } - # TODO: remove return when payment is implemented with refactored payments, i.e. use of - # payment.payment_tokens_list in the template. - # return request.render('payment.pay', values) - return request.render('website.404') - @http.route(['/website_payment/transaction'], type='json', auth="public", website=True) - def transaction(self, reference, amount, currency_id, acquirer_id): + values['s2s_acquirers'] = [acq for acq in acquirers if acq.payment_flow == 's2s'] + values['form_acquirers'] = [acq for acq in acquirers if acq.payment_flow == 'form'] + values['pms'] = request.env['payment.token'].search([('acquirer_id', 'in', [acq.id for acq in values['s2s_acquirers']])]) + + return request.render('payment.pay', values) + + def _get_existing_transaction(self, reference, amount, partner_id, currency_id, acquirer_id, tx_id): + PaymentTransaction = request.env['payment.transaction'] + tx = None + if tx_id: + tx = PaymentTransaction.sudo().browse(tx_id) + if not tx.exists() or tx.reference != reference or tx.acquirer_id.id != acquirer_id: + tx = None + + if not tx: + tx = PaymentTransaction.sudo().search([('reference', '=', reference), ('acquirer_id', '=', acquirer_id)]) + + if tx and (tx.state != 'draft' or tx.partner_id.id != partner_id or tx.amount != amount or tx.currency_id.id != currency_id): + tx = None + + return tx + + @http.route(['/website_payment/transaction///',], type='json', auth='public') + def transaction(self, acquirer_id, reference, amount, currency_id, **kwargs): partner_id = request.env.user.partner_id.id if not request.env.user._is_public() else False + acquirer = request.env['payment.acquirer'].browse(acquirer_id) + + tx = self._get_existing_transaction(reference, float(amount), partner_id, + int(currency_id), int(acquirer_id), request.session.get('website_payment_tx_id')) + + if not tx: + values = { + 'acquirer_id': int(acquirer_id), + 'reference': reference, + 'amount': float(amount), + 'currency_id': currency_id, + 'partner_id': partner_id, + } + + tx = request.env['payment.transaction'].sudo().create(values) + request.session['website_payment_tx_id'] = tx.id + + render_values = { + 'return_url': '/website_payment/confirm?tx_id=%d' % tx.id, + 'partner_id': partner_id, + } + + return acquirer.sudo().render(reference, float(amount), int(currency_id), values=render_values) + + @http.route(['/website_payment/token///'], type='http', auth='public', website=True) + def payment_token(self, pm_id, reference, amount, currency_id, return_url=None, **kwargs): + token = request.env['payment.token'].browse(int(pm_id)) + + if not token: + return request.redirect('/website_payment/pay?error_msg=%s' % _('Cannot setup the payment.')) + + partner_id = request.env.user.partner_id.id if not request.env.user._is_public() else False + values = { - 'acquirer_id': int(acquirer_id), + 'acquirer_id': token.acquirer_id.id, 'reference': reference, 'amount': float(amount), 'currency_id': int(currency_id), 'partner_id': partner_id, + 'payment_token_id': pm_id } tx = request.env['payment.transaction'].sudo().create(values) request.session['website_payment_tx_id'] = tx.id - return tx.id + + try: + res = tx.s2s_do_transaction() + except Exception as e: + return request.redirect('/website_payment/pay?error_msg=%s' % _('Payment transaction failed.')) + + valid_state = 'authorized' if tx.acquirer_id.capture_manually else 'done' + if not res or tx.state != valid_state: + return request.redirect('/website_payment/pay?error_msg=%s' % _('Payment transaction failed.')) + + return request.redirect(return_url if return_url else '/website_payment/confirm?tx_id=%d' % tx.id) @http.route(['/website_payment/confirm'], type='http', auth='public', website=True) def confirm(self, **kw): - tx_id = request.session.pop('website_payment_tx_id', False) + tx_id = int(kw.get('tx_id', 0)) or request.session.pop('website_payment_tx_id', 0) if tx_id: tx = request.env['payment.transaction'].browse(tx_id) if tx.state == 'done': diff --git a/addons/payment/i18n/es.po b/addons/payment/i18n/es.po index 09e5a722796..9fd67f13485 100644 --- a/addons/payment/i18n/es.po +++ b/addons/payment/i18n/es.po @@ -818,7 +818,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:218 #, python-format msgid "Missing values" -msgstr "" +msgstr "Valores faltantes" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_name @@ -846,7 +846,7 @@ msgstr "Nunca" #: code:addons/payment/static/src/js/payment_form.js:273 #, python-format msgid "No payment method selected" -msgstr "" +msgstr "No se ha seleccionado medio de pago" #. module: payment #: model:ir.model.fields,help:payment.field_account_payment_payment_token_id @@ -1050,7 +1050,7 @@ msgstr "Use el nombre del pedido como referencia comunicativa." #: model:ir.ui.view,arch_db:payment.confirm #: model:ir.ui.view,arch_db:payment.pay msgid "Processed by" -msgstr "" +msgstr "Procesado por" #. module: payment #: selection:payment.acquirer,environment:0 @@ -1101,7 +1101,7 @@ msgstr "Plantilla de formulario S2S" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token msgid "Save Cards" -msgstr "" +msgstr "Guardar las tarjetas" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list @@ -1296,6 +1296,8 @@ msgstr "" msgid "" "Transfer information will be provided after choosing the payment aquirer." msgstr "" +"La información de transferencia será mostrada una vez elija el medio de " +"pago." #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_type @@ -1325,7 +1327,7 @@ msgstr "Comisiones internacionales variables (en porcentaje)" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_token_verified msgid "Verified" -msgstr "" +msgstr "Verificado" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_website_published diff --git a/addons/payment/static/src/js/payment_transaction_portal.js b/addons/payment/static/src/js/payment_transaction_portal.js index 26c0fb35d1e..094149b6274 100644 --- a/addons/payment/static/src/js/payment_transaction_portal.js +++ b/addons/payment/static/src/js/payment_transaction_portal.js @@ -1,24 +1,2 @@ -odoo.define('payment.website_payment', function (require) { -"use strict"; - -require('web.dom_ready'); -var ajax = require('web.ajax'); - - if (!$('.o_website_payment').length) { - return $.Deferred().reject("DOM doesn't contain '.o_website_payment'"); - } - - // When clicking on payment button: create the tx using json then continue to the acquirer - var $payment = $(".o_website_payment_form"); - $payment.on("click", 'button[type="submit"],button[name="submit"]', function (ev) { - ev.preventDefault(); - ev.stopPropagation(); - $(ev.currentTarget).attr('disabled', true); - $(ev.currentTarget).prepend(' '); - var $form = $(ev.currentTarget).parents('form'); - var data =$("div[class~='o_website_payment_new_payment']").data(); - ajax.jsonRpc('/website_payment/transaction/', 'call', data).then(function (result) { - $form.submit(); - }); - }); -}); +// This file is kept to avoid breaking assets compilation on instance that didn't run "-u payment". +// TBE TODO: Remove me in master \ No newline at end of file diff --git a/addons/payment/views/payment_portal_templates.xml b/addons/payment/views/payment_portal_templates.xml index d2fa3c1c4cd..166cd429718 100644 --- a/addons/payment/views/payment_portal_templates.xml +++ b/addons/payment/views/payment_portal_templates.xml @@ -46,32 +46,22 @@

Payment

-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- - Processed by . -
-
+
+ +
+
+
+

Reference:

+

Amount:

+ + + + + +
+

No payment acquirer found.

+

Please configure a payment acquirer.

-
diff --git a/addons/payment_adyen/i18n/de.po b/addons/payment_adyen/i18n/de.po index e35f804245d..a1c84731fb3 100644 --- a/addons/payment_adyen/i18n/de.po +++ b/addons/payment_adyen/i18n/de.po @@ -4,15 +4,16 @@ # # Translators: # darenkster , 2017 -# Wolfgang Taferner , 2017 -# Martin Trigaux , 2017 +# Wolfgang Taferner, 2017 +# Martin Trigaux, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,19 +37,19 @@ msgstr "; keine Bestellung gefunden" #: code:addons/payment_adyen/models/payment.py:234 #, python-format msgid "Adyen: feedback error" -msgstr "" +msgstr "Ayden: Feedbackfehler" #. module: payment_adyen #: code:addons/payment_adyen/models/payment.py:196 #, python-format msgid "Adyen: invalid merchantSig, received %s, computed %s" -msgstr "" +msgstr "Ayden: ungültige Händlersignatur, erhalten %s, berechnet %s" #. module: payment_adyen #: code:addons/payment_adyen/models/payment.py:182 #, python-format msgid "Adyen: received data for reference %s" -msgstr "" +msgstr "Ayden: empfangene Daten für Referenz %s" #. module: payment_adyen #: code:addons/payment_adyen/models/payment.py:175 @@ -57,11 +58,13 @@ msgid "" "Adyen: received data with missing reference (%s) or missing pspReference " "(%s)" msgstr "" +"Ayden: erhaltene Daten mit fehlender Referenz (%s) oder fehlender " +"pspReferenz (%s)" #. module: payment_adyen #: model:ir.ui.view,arch_db:payment_adyen.acquirer_form_adyen msgid "How to configure your Adyen account?" -msgstr "" +msgstr "Wie können Sie Ihr Ayen-Konto konfigurieren?" #. module: payment_adyen #: model:ir.model.fields,field_description:payment_adyen.field_payment_acquirer_adyen_merchant_account diff --git a/addons/payment_authorize/i18n/de.po b/addons/payment_authorize/i18n/de.po index bc4de9c2ce0..4f6634f9892 100644 --- a/addons/payment_authorize/i18n/de.po +++ b/addons/payment_authorize/i18n/de.po @@ -40,11 +40,13 @@ msgid "" "Authorize.net Error Message(s):\n" " %s" msgstr "" +"Authorize.net Fehlermeldung(s):\n" +" %s" #. module: payment_authorize #: model:ir.model.fields,field_description:payment_authorize.field_payment_token_authorize_profile msgid "Authorize.net Profile ID" -msgstr "" +msgstr "Authorize.net Profil-ID" #. module: payment_authorize #: code:addons/payment_authorize/models/payment.py:167 @@ -53,6 +55,8 @@ msgid "" "Authorize: received data with missing reference (%s) or trans_id (%s) or " "fingerprint (%s)" msgstr "" +"Autorisieren: empfangene Daten mit fehlender Referenz (%s) oder trans_id " +"(%s) oder Fingerabdruck (%s)" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form @@ -67,17 +71,17 @@ msgstr "Kartennummer" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Name des Karteninhabers" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Läuft ab (MM / JJ)" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize msgid "How to get paid with Authorize.Net" -msgstr "" +msgstr "Wie Sie mit Authorize.Net bezahlt werden" #. module: payment_authorize #: model:ir.model,name:payment_authorize.model_payment_acquirer @@ -103,14 +107,14 @@ msgstr "Karten speichern" #: code:addons/payment_authorize/models/payment.py:372 #, python-format msgid "The Customer Profile creation in Authorize.NET failed." -msgstr "" +msgstr "Die Erstellung des Kundenprofils bei Autorize.NET ist fehlgeschlagen." #. module: payment_authorize #: model:ir.model.fields,help:payment_authorize.field_payment_token_authorize_profile msgid "" "This contains the unique reference for this partner/payment token " "combination in the Authorize.net backend" -msgstr "" +msgstr "Dies enthält die eindeutige Referenz" #. module: payment_authorize #: model:ir.model.fields,help:payment_authorize.field_payment_token_save_token diff --git a/addons/payment_authorize/i18n/es.po b/addons/payment_authorize/i18n/es.po index 34605d0269e..7aaa5e8c47d 100644 --- a/addons/payment_authorize/i18n/es.po +++ b/addons/payment_authorize/i18n/es.po @@ -3,18 +3,19 @@ # * payment_authorize # # Translators: -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Humberto Garza De Koster , 2016 # David Arnold , 2017 # RGB Consulting , 2017 # Luis M. Ontalba , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Luis M. Ontalba , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,17 +71,17 @@ msgstr "Número de la tarjeta" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Nombre del titular de la tarjeta" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Caducidad (MM / AA)" #. module: payment_authorize #: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize msgid "How to get paid with Authorize.Net" -msgstr "" +msgstr "Cómo recibir pagos con Authorize.Net" #. module: payment_authorize #: model:ir.model,name:payment_authorize.model_payment_acquirer @@ -100,7 +101,7 @@ msgstr "Proveedor" #. module: payment_authorize #: model:ir.model.fields,field_description:payment_authorize.field_payment_token_save_token msgid "Save Cards" -msgstr "" +msgstr "Guardar las tarjetas" #. module: payment_authorize #: code:addons/payment_authorize/models/payment.py:372 @@ -114,6 +115,8 @@ msgid "" "This contains the unique reference for this partner/payment token " "combination in the Authorize.net backend" msgstr "" +"Esto contiene la única referencia para esta combinación de empresa/pago de " +"token en el backend de Authorize.net" #. module: payment_authorize #: model:ir.model.fields,help:payment_authorize.field_payment_token_save_token diff --git a/addons/payment_buckaroo/i18n/de.po b/addons/payment_buckaroo/i18n/de.po index 74d27aae0c7..86cb71b618d 100644 --- a/addons/payment_buckaroo/i18n/de.po +++ b/addons/payment_buckaroo/i18n/de.po @@ -4,15 +4,16 @@ # # Translators: # darenkster , 2017 -# Martin Trigaux , 2017 -# Wolfgang Taferner , 2017 +# Martin Trigaux, 2017 +# Wolfgang Taferner, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Wolfgang Taferner , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,13 +37,13 @@ msgstr "; keine Bestellung gefunden" #: code:addons/payment_buckaroo/models/payment.py:148 #, python-format msgid "Buckaroo: invalid shasign, received %s, computed %s, for data %s" -msgstr "" +msgstr "Buckaroo: ungültiges Shasign, %s erhalten, %s berechnet, %s für Daten" #. module: payment_buckaroo #: code:addons/payment_buckaroo/models/payment.py:137 #, python-format msgid "Buckaroo: received data for reference %s" -msgstr "" +msgstr "Buckaroo: empfangene Daten für Referenz %s" #. module: payment_buckaroo #: code:addons/payment_buckaroo/models/payment.py:131 @@ -51,11 +52,13 @@ msgid "" "Buckaroo: received data with missing reference (%s) or pay_id (%s) or " "shasign (%s)" msgstr "" +"Buckaroo: empfangene Daten mit fehlender Referenz (%s) oder pay_id (%s) oder" +" Shasign (%s)" #. module: payment_buckaroo #: model:ir.ui.view,arch_db:payment_buckaroo.acquirer_form_buckaroo msgid "How to configure your Buckaroo account?" -msgstr "" +msgstr "Wie können Sie Ihr Buckaroo-Konto konfigurieren?" #. module: payment_buckaroo #: model:ir.model,name:payment_buckaroo.model_payment_acquirer diff --git a/addons/payment_ogone/i18n/de.po b/addons/payment_ogone/i18n/de.po index 80e3fe11c78..3ccb2356fb3 100644 --- a/addons/payment_ogone/i18n/de.po +++ b/addons/payment_ogone/i18n/de.po @@ -46,7 +46,7 @@ msgstr "API Benutzer Passwort" #. module: payment_ogone #: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer_ogone_alias_usage msgid "Alias Usage" -msgstr "" +msgstr "Alias Usage" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form @@ -61,17 +61,17 @@ msgstr "Kartennummer" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Name des Karteninhabers" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Läuft ab (MM / JJ)" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.acquirer_form_ogone msgid "How to configure your Ogone account?" -msgstr "" +msgstr "Wie können Sie Ihr Ogone-Konto konfigurieren?" #. module: payment_ogone #: model:ir.model.fields,help:payment_ogone.field_payment_acquirer_ogone_alias_usage @@ -79,18 +79,21 @@ msgid "" "If you want to use Ogone Aliases, this default Alias Usage will be presented" " to the customer as the reason you want to keep his payment data" msgstr "" +"Wenn Sie Ogone Aliases verwenden wollen, wird dieser Alias Usage-Standard " +"dem Kunden als Grund vorgelegt, warum Sie seine Zahlungsdaten speichern " +"wollen" #. module: payment_ogone #: code:addons/payment_ogone/models/payment.py:247 #, python-format msgid "Ogone: invalid shasign, received %s, computed %s, for data %s" -msgstr "" +msgstr "Ogone: ungültiges Shasign, %s erhalten, %s berechnet, %s für Daten" #. module: payment_ogone #: code:addons/payment_ogone/models/payment.py:236 #, python-format msgid "Ogone: received data for reference %s" -msgstr "" +msgstr "Ogone: empfangene Daten für Referenz %s" #. module: payment_ogone #: code:addons/payment_ogone/models/payment.py:229 @@ -99,6 +102,8 @@ msgid "" "Ogone: received data with missing reference (%s) or pay_id (%s) or shasign " "(%s)" msgstr "" +"Ogone: empfangene Daten mit fehlender Referenz (%s) oder pay_id (%s) oder " +"shasign (%s)" #. module: payment_ogone #: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer_ogone_pspid diff --git a/addons/payment_ogone/i18n/es.po b/addons/payment_ogone/i18n/es.po index 71f57083c4d..fb9f631ddf7 100644 --- a/addons/payment_ogone/i18n/es.po +++ b/addons/payment_ogone/i18n/es.po @@ -3,20 +3,21 @@ # * payment_ogone # # Translators: -# Martin Trigaux , 2017 -# Luis M. Ontalba , 2017 -# David Arnold , 2017 -# Alejandro Die Sanchis , 2017 -# RGB Consulting , 2017 -# Ivan Nieto , 2017 +# Martin Trigaux, 2016 +# Alejandro Die Sanchis , 2016 +# Ivan Nieto , 2016 # Gelo Joga Landoo , 2017 +# David Arnold , 2017 +# Luis M. Ontalba , 2017 +# RGB Consulting , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Gelo Joga Landoo , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,12 +65,12 @@ msgstr "Número de la tarjeta" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Nombre del titular de la tarjeta" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Caducidad (MM / AA)" #. module: payment_ogone #: model:ir.ui.view,arch_db:payment_ogone.acquirer_form_ogone diff --git a/addons/payment_paypal/i18n/de.po b/addons/payment_paypal/i18n/de.po index 4efe292f8d1..8d9270c3266 100644 --- a/addons/payment_paypal/i18n/de.po +++ b/addons/payment_paypal/i18n/de.po @@ -3,17 +3,18 @@ # * payment_paypal # # Translators: -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 # aNj , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Wolfgang Taferner , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,6 +48,8 @@ msgid "" "Payment Data Transfer allows you to receive notification of successful " "payments as they are made." msgstr "" +"Der Zahlungsdaten-Transfer ermöglicht es Ihnen, Benachrichtigungen für " +"erfolgreiche Zahlungen zu erhalten." #. module: payment_paypal #: model:ir.model,name:payment_paypal.model_payment_transaction @@ -71,7 +74,7 @@ msgstr "Paypal Händler-ID" #. module: payment_paypal #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_pdt_token msgid "Paypal PDT Token" -msgstr "" +msgstr "Paypal PDT-Token" #. module: payment_paypal #: code:addons/payment_paypal/models/payment.py:138 diff --git a/addons/payment_paypal/i18n/es.po b/addons/payment_paypal/i18n/es.po index 10ab91283ae..d0654b098f9 100644 --- a/addons/payment_paypal/i18n/es.po +++ b/addons/payment_paypal/i18n/es.po @@ -3,16 +3,17 @@ # * payment_paypal # # Translators: -# Martin Trigaux , 2017 -# Luis M. Ontalba , 2017 +# Martin Trigaux, 2016 # Gelo Joga Landoo , 2017 +# Luis M. Ontalba , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Gelo Joga Landoo , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,6 +47,8 @@ msgid "" "Payment Data Transfer allows you to receive notification of successful " "payments as they are made." msgstr "" +"La transferencia de datos de pago le permite recibir notificación de los " +"pagos realizados cuando estos se han hecho." #. module: payment_paypal #: model:ir.model,name:payment_paypal.model_payment_transaction diff --git a/addons/payment_paypal/i18n/zh_CN.po b/addons/payment_paypal/i18n/zh_CN.po index b1dae6c28fd..d7111abdbc3 100644 --- a/addons/payment_paypal/i18n/zh_CN.po +++ b/addons/payment_paypal/i18n/zh_CN.po @@ -3,14 +3,15 @@ # * payment_paypal # # Translators: -# Jeffery CHEN , 2016 +# Jeffery CHEN Fan , 2016 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Jeffery CHEN , 2016\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,7 @@ msgstr "付款收单方" msgid "" "Payment Data Transfer allows you to receive notification of successful " "payments as they are made." -msgstr "" +msgstr "付款数据传输允许您接收成功付款的通知。" #. module: payment_paypal #: model:ir.model,name:payment_paypal.model_payment_transaction @@ -68,7 +69,7 @@ msgstr "Paypal 销售商 ID" #. module: payment_paypal #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_pdt_token msgid "Paypal PDT Token" -msgstr "" +msgstr "Paypal 付款数据传输标记" #. module: payment_paypal #: code:addons/payment_paypal/models/payment.py:138 diff --git a/addons/payment_payumoney/i18n/de.po b/addons/payment_payumoney/i18n/de.po index 9f2b364a470..c497cd4fddd 100644 --- a/addons/payment_payumoney/i18n/de.po +++ b/addons/payment_payumoney/i18n/de.po @@ -4,14 +4,15 @@ # # Translators: # darenkster , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,36 +23,38 @@ msgstr "" #. module: payment_payumoney #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_key msgid "Merchant Key" -msgstr "" +msgstr "Händlerschlüssel" #. module: payment_payumoney #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_salt msgid "Merchant Salt" -msgstr "" +msgstr "Händler Salt" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:146 #, python-format msgid "PayUmoney: feedback error" -msgstr "" +msgstr "PayUmoney: Feedbackfehler" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:108 #, python-format msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s" msgstr "" +"PayUmoney: ungültiges Shasign, %s erhalten, %s berechnet, %s für Daten" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:102 #, python-format msgid "PayUmoney: received data for reference %s; multiple orders found" msgstr "" +"PayUmoney: empfangene Daten für Referenz %s; Mehrfachaufträge gefunden" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:99 #, python-format msgid "PayUmoney: received data for reference %s; no order found" -msgstr "" +msgstr "PayUmoney: empfangene Daten für Referenz %s; kein Auftrag gefunden" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:94 @@ -60,6 +63,8 @@ msgid "" "PayUmoney: received data with missing reference (%s) or pay_id (%s) or " "shashign (%s)" msgstr "" +"PayUmoney: empfangene Daten mit fehlender Referenz (%s) oder pay_id (%s) " +"oder shashign (%s)" #. module: payment_payumoney #: model:ir.model,name:payment_payumoney.model_payment_acquirer diff --git a/addons/payment_payumoney/i18n/es.po b/addons/payment_payumoney/i18n/es.po index 48536327833..3c19cdc14a8 100644 --- a/addons/payment_payumoney/i18n/es.po +++ b/addons/payment_payumoney/i18n/es.po @@ -3,15 +3,16 @@ # * payment_payumoney # # Translators: -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # David Arnold , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: David Arnold , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,31 +28,34 @@ msgstr "Clave del comerciante" #. module: payment_payumoney #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_salt msgid "Merchant Salt" -msgstr "" +msgstr "Merchant Salt" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:146 #, python-format msgid "PayUmoney: feedback error" -msgstr "" +msgstr "PayUmoney: error en el feedback" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:108 #, python-format msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s" -msgstr "" +msgstr "PayUmoney: shasign nulo, %s recibido, %s calculado, para datos %s" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:102 #, python-format msgid "PayUmoney: received data for reference %s; multiple orders found" msgstr "" +"PayUmoney: datos recibidos para la referencia %s, pedidos múltiples " +"encontrados" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:99 #, python-format msgid "PayUmoney: received data for reference %s; no order found" msgstr "" +"PayUmoney: datos recibidos para la referencia%s; ningún pedido encontrado" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:94 diff --git a/addons/payment_payumoney/i18n/zh_CN.po b/addons/payment_payumoney/i18n/zh_CN.po index 57cfce4f3df..f55405b2886 100644 --- a/addons/payment_payumoney/i18n/zh_CN.po +++ b/addons/payment_payumoney/i18n/zh_CN.po @@ -3,14 +3,15 @@ # * payment_payumoney # # Translators: -# Jeffery CHEN , 2016 +# Jeffery CHEN Fan , 2016 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Jeffery CHEN , 2016\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,25 +33,25 @@ msgstr "商家盐" #: code:addons/payment_payumoney/models/payment.py:146 #, python-format msgid "PayUmoney: feedback error" -msgstr "" +msgstr "PayUmoney：反馈出错" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:108 #, python-format msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s" -msgstr "" +msgstr "PayUmoney：无效的 shasign，对于数据 %s，已接收 %s，已计算 %s" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:102 #, python-format msgid "PayUmoney: received data for reference %s; multiple orders found" -msgstr "" +msgstr "PayUmoney：已接收参考 %s 的数据；已找到多个订单" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:99 #, python-format msgid "PayUmoney: received data for reference %s; no order found" -msgstr "" +msgstr "PayUmoney：已接收参考 %s 的数据；未找到订单" #. module: payment_payumoney #: code:addons/payment_payumoney/models/payment.py:94 @@ -58,7 +59,7 @@ msgstr "" msgid "" "PayUmoney: received data with missing reference (%s) or pay_id (%s) or " "shashign (%s)" -msgstr "" +msgstr "PayUmoney：已接收缺少参考 (%s)，或者 pay_id (%s) 或 shashign (%s) 的数据" #. module: payment_payumoney #: model:ir.model,name:payment_payumoney.model_payment_acquirer diff --git a/addons/payment_sips/i18n/de.po b/addons/payment_sips/i18n/de.po index 22db0e4ae4f..4d19e1c0fc9 100644 --- a/addons/payment_sips/i18n/de.po +++ b/addons/payment_sips/i18n/de.po @@ -4,15 +4,16 @@ # # Translators: # darenkster , 2017 -# Wolfgang Taferner , 2017 -# Martin Trigaux , 2017 +# Wolfgang Taferner, 2017 +# Martin Trigaux, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,18 +37,18 @@ msgstr "; keine Bestellung gefunden" #: code:addons/payment_sips/models/payment.py:74 #, python-format msgid "Currency not supported by Wordline" -msgstr "" +msgstr "Währung wird von Wordline nicht unterstützt" #. module: payment_sips #: code:addons/payment_sips/models/payment.py:55 #, python-format msgid "Incorrect payment acquirer provider" -msgstr "" +msgstr "Ungültiger Zahlungsanbieter" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_version msgid "Interface Version" -msgstr "" +msgstr "Schnittstellenversion" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id @@ -67,25 +68,25 @@ msgstr "Zahlungstransaktion" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_prod_url msgid "Prod's url" -msgstr "" +msgstr "Prods URL" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_secret msgid "Secret Key" -msgstr "" +msgstr "Geheimer Schlüssel" #. module: payment_sips #: code:addons/payment_sips/models/payment.py:149 #, python-format msgid "Sips: received data for reference %s" -msgstr "" +msgstr "Sips: empfangene Daten für Referenz %s" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_test_url msgid "Test's url" -msgstr "" +msgstr "Tests URL" #. module: payment_sips #: model:ir.model.fields,help:payment_sips.field_payment_acquirer_sips_merchant_id msgid "Used for production only" -msgstr "" +msgstr "Nur für Produktion verwendet" diff --git a/addons/payment_sips/i18n/es.po b/addons/payment_sips/i18n/es.po index 50f80d3c718..0f127300f01 100644 --- a/addons/payment_sips/i18n/es.po +++ b/addons/payment_sips/i18n/es.po @@ -3,17 +3,18 @@ # * payment_sips # # Translators: +# Martin Trigaux, 2016 +# Alejandro Die Sanchis , 2016 +# Ivan Nieto , 2016 # Luis M. Ontalba , 2017 -# Alejandro Die Sanchis , 2017 -# Martin Trigaux , 2017 -# Ivan Nieto , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Ivan Nieto , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +49,7 @@ msgstr "Método de pago del proveedor incorrecto" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_version msgid "Interface Version" -msgstr "" +msgstr "Versión de la interfaz" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id @@ -68,12 +69,12 @@ msgstr "Transacción de pago" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_prod_url msgid "Prod's url" -msgstr "" +msgstr "Url de la producción" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_secret msgid "Secret Key" -msgstr "" +msgstr "Contraseña secreta" #. module: payment_sips #: code:addons/payment_sips/models/payment.py:149 @@ -84,7 +85,7 @@ msgstr "Sips: received data for reference %s" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_test_url msgid "Test's url" -msgstr "" +msgstr "Url de la prueba" #. module: payment_sips #: model:ir.model.fields,help:payment_sips.field_payment_acquirer_sips_merchant_id diff --git a/addons/payment_sips/i18n/zh_CN.po b/addons/payment_sips/i18n/zh_CN.po index 5ac6c0f1d19..9231fadc040 100644 --- a/addons/payment_sips/i18n/zh_CN.po +++ b/addons/payment_sips/i18n/zh_CN.po @@ -3,15 +3,16 @@ # * payment_sips # # Translators: -# Jeffery CHEN , 2016 -# fausthuang , 2017 +# Jeffery CHEN Fan , 2016 +# fausthuang, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: fausthuang , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +47,7 @@ msgstr "不正确的付款收单方服务商" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_version msgid "Interface Version" -msgstr "" +msgstr "接口版本" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id @@ -66,12 +67,12 @@ msgstr "付款交易" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_prod_url msgid "Prod's url" -msgstr "" +msgstr "Prod URL" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_secret msgid "Secret Key" -msgstr "" +msgstr "密钥" #. module: payment_sips #: code:addons/payment_sips/models/payment.py:149 @@ -82,9 +83,9 @@ msgstr "Sips: 供参照的接收数据 %s" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_test_url msgid "Test's url" -msgstr "" +msgstr "测试 url" #. module: payment_sips #: model:ir.model.fields,help:payment_sips.field_payment_acquirer_sips_merchant_id msgid "Used for production only" -msgstr "" +msgstr "仅适用于生产" diff --git a/addons/payment_stripe/i18n/de.po b/addons/payment_stripe/i18n/de.po index de7e0de45bc..8312662940c 100644 --- a/addons/payment_stripe/i18n/de.po +++ b/addons/payment_stripe/i18n/de.po @@ -36,6 +36,9 @@ msgid "" "product. As defined in your Stripe profile. See: " "https://stripe.com/docs/checkout" msgstr "" +"Eine relative oder absolute URL weist auf ein quadratisches Bild Ihrer Marke" +" oder Produkt hin. Wie in Ihrem Stripe-Profil definiert. Siehe: " +"https://stripe.com/docs/checkout" #. module: payment_stripe #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form @@ -50,12 +53,12 @@ msgstr "Kartennummer" #. module: payment_stripe #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Name des Karteninhabers" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url msgid "Checkout Image URL" -msgstr "" +msgstr "Abmelde-Bild-URL" #. module: payment_stripe #. openerp-web @@ -74,14 +77,14 @@ msgstr "Fehler" #. module: payment_stripe #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Läuft ab (MM / JJ)" #. module: payment_stripe #. openerp-web #: code:addons/payment_stripe/static/src/js/stripe.js:32 #, python-format msgid "Just one more second, confirming your payment..." -msgstr "" +msgstr "Nur noch eine Sekunde, Ihre Zahlung wird bestätigt …" #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_acquirer @@ -98,7 +101,7 @@ msgstr "Zahlungstransaktion" #: code:addons/payment_stripe/static/src/js/stripe.js:57 #, python-format msgid "Payment error" -msgstr "" +msgstr "Zahlungsfehler" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:167 @@ -107,40 +110,43 @@ msgid "" "Perhaps the problem can be solved by double-checking your credit card " "details, or contacting your bank?" msgstr "" +"Vielleicht kann das Problem gelöst werden, wenn Sie Ihre " +"Kreditkarteninformationen erneut überprüfen oder Ihre Bank kontaktieren?" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key msgid "Stripe Publishable Key" -msgstr "" +msgstr "Stripe Veröffentlichbarer Schlüssel" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key msgid "Stripe Secret Key" -msgstr "" +msgstr "Stripe Geheimer Schlüssel" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:165 #, python-format msgid "Stripe gave us the following info about the problem: '%s'" -msgstr "" +msgstr "Stripe hat uns folgende Informationen über das Problem gegeben: '%s'" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:177 #, python-format msgid "Stripe: %s orders found for reference %s" -msgstr "" +msgstr "Stripe: %s gefundene Aufträge für Referenz %s" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:173 #, python-format msgid "Stripe: no order found for reference %s" -msgstr "" +msgstr "Stripe: kein Auftrag für Referenz %s gefunden" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:163 #, python-format msgid "We're sorry to report that the transaction has failed." msgstr "" +"Leider müssen wir Ihnen mitteilen, dass die Transaktion fehlgeschlagen ist." #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_token diff --git a/addons/payment_stripe/i18n/es.po b/addons/payment_stripe/i18n/es.po index c0a9fa499c9..05270578de7 100644 --- a/addons/payment_stripe/i18n/es.po +++ b/addons/payment_stripe/i18n/es.po @@ -3,17 +3,17 @@ # * payment_stripe # # Translators: -# Luis M. Ontalba , 2017 +# Martin Trigaux, 2016 # David Arnold , 2017 -# Martin Trigaux , 2017 # RGB Consulting , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-10-24 09:00+0000\n" -"Last-Translator: RGB Consulting , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Número de la tarjeta" #. module: payment_stripe #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form msgid "Cardholder name" -msgstr "" +msgstr "Nombre del titular de la tarjeta" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url @@ -76,14 +76,14 @@ msgstr "Error" #. module: payment_stripe #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form msgid "Expires (MM / YY)" -msgstr "" +msgstr "Caducidad (MM / AA)" #. module: payment_stripe #. openerp-web #: code:addons/payment_stripe/static/src/js/stripe.js:32 #, python-format msgid "Just one more second, confirming your payment..." -msgstr "" +msgstr "Espere un segundo, estamos confirmando su pago..." #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_acquirer @@ -100,7 +100,7 @@ msgstr "Transacción de pago" #: code:addons/payment_stripe/static/src/js/stripe.js:57 #, python-format msgid "Payment error" -msgstr "" +msgstr "Error en el pago" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:167 @@ -109,22 +109,24 @@ msgid "" "Perhaps the problem can be solved by double-checking your credit card " "details, or contacting your bank?" msgstr "" +"Tal vez el problema se puede resolver comprobando los datos de su tarjeta de" +" crédito, o contactando con su banco" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key msgid "Stripe Publishable Key" -msgstr "" +msgstr "Clave pública de Stripe" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key msgid "Stripe Secret Key" -msgstr "" +msgstr "Contraseña secreta de Stripe" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:165 #, python-format msgid "Stripe gave us the following info about the problem: '%s'" -msgstr "" +msgstr "Stripe nos proporcionó la siguiente información sobre el problema: \"%s\"" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:177 diff --git a/addons/payment_stripe/i18n/zh_CN.po b/addons/payment_stripe/i18n/zh_CN.po index 2efce32784b..d084df80aaf 100644 --- a/addons/payment_stripe/i18n/zh_CN.po +++ b/addons/payment_stripe/i18n/zh_CN.po @@ -81,7 +81,7 @@ msgstr "到期日 (MM / YY)" #: code:addons/payment_stripe/static/src/js/stripe.js:32 #, python-format msgid "Just one more second, confirming your payment..." -msgstr "" +msgstr "正在确认您的付款，只需再等一秒钟..." #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_acquirer @@ -106,41 +106,41 @@ msgstr "付款错误" msgid "" "Perhaps the problem can be solved by double-checking your credit card " "details, or contacting your bank?" -msgstr "" +msgstr "或许再次检查您的信用卡详细信息或联系您的银行能够解决该问题？" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key msgid "Stripe Publishable Key" -msgstr "" +msgstr "Stripe 公钥" #. module: payment_stripe #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key msgid "Stripe Secret Key" -msgstr "" +msgstr "Stripe 密钥" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:165 #, python-format msgid "Stripe gave us the following info about the problem: '%s'" -msgstr "" +msgstr "Stripe 为我们提供了以下关于问题的信息：'%s'" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:177 #, python-format msgid "Stripe: %s orders found for reference %s" -msgstr "" +msgstr "Stripe：已找到 %s 个可用于参考 %s 的订单" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:173 #, python-format msgid "Stripe: no order found for reference %s" -msgstr "" +msgstr "Stripe：未找到可用于参考 %s 的订单" #. module: payment_stripe #: code:addons/payment_stripe/models/payment.py:163 #, python-format msgid "We're sorry to report that the transaction has failed." -msgstr "" +msgstr "很遗憾地告诉您，交易已失败。" #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_token diff --git a/addons/payment_stripe/static/src/js/stripe.js b/addons/payment_stripe/static/src/js/stripe.js index a9395ea7bd6..7ecf25284f6 100644 --- a/addons/payment_stripe/static/src/js/stripe.js +++ b/addons/payment_stripe/static/src/js/stripe.js @@ -108,11 +108,14 @@ odoo.define('payment_stripe.stripe', function(require) { if ($('.o_website_payment').length !== 0) { - var create_tx = ajax.jsonRpc('/website_payment/transaction', 'call', { - reference: $("input[name='invoice_num']").val(), - amount: amount, // exact amount, not stripe cents - currency_id: currency_id, + var invoice_num = $("input[name='invoice_num']").val(); + var url = _.str.sprintf("/website_payment/transaction/%s/%f/%s", + invoice_num, amount, currency_id); + + var create_tx = ajax.jsonRpc(url, 'call', { acquirer_id: acquirer_id + }).then(function (data) { + try { provider_form[0].innerHTML = data; } catch (e) {} }); } else if ($('.o_website_quote').length !== 0) { diff --git a/addons/phone_validation/i18n/de.po b/addons/phone_validation/i18n/de.po index 3abd239775c..5c9084b3855 100644 --- a/addons/phone_validation/i18n/de.po +++ b/addons/phone_validation/i18n/de.po @@ -7,14 +7,15 @@ # Henry Mineehen , 2017 # darenkster , 2017 # Tina Rittmüller , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-10-24 09:00+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #. module: phone_validation #: selection:res.company,phone_international_format:0 msgid "Add international prefix" -msgstr "" +msgstr "Internationale Vorwahl hinzufügen" #. module: phone_validation #: model:ir.model.fields,help:phone_validation.field_res_company_phone_international_format @@ -57,13 +58,13 @@ msgstr "ID" #: code:addons/phone_validation/tools/phone_validation.py:23 #, python-format msgid "Impossible number %s: probably invalid number of digits" -msgstr "" +msgstr "Nummer %s nicht verfügbar: wahrscheinlich ungültige Anzahl an Stellen" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:25 #, python-format msgid "Invalid number %s: probably incorrect prefix" -msgstr "" +msgstr "Ungültige Zahl %s: wahrscheinlich fehlerhafte Vorwahl" #. module: phone_validation #: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin___last_update @@ -78,7 +79,7 @@ msgstr "Lokale Nummer" #. module: phone_validation #: selection:res.company,phone_international_format:0 msgid "No prefix" -msgstr "" +msgstr "Keine Vorwahl" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:44 @@ -87,6 +88,8 @@ msgid "" "Unable to format %s:\n" "%s" msgstr "" +"%s:\n" +"%s konnte nicht formatiert werden" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:20 @@ -95,8 +98,10 @@ msgid "" "Unable to parse %s:\n" "%s" msgstr "" +"%s:\n" +"%s konnte nicht analysiert werden" #. module: phone_validation #: model:ir.model,name:phone_validation.model_phone_validation_mixin msgid "phone.validation.mixin" -msgstr "" +msgstr "phone.validation.mixin" diff --git a/addons/phone_validation/i18n/es.po b/addons/phone_validation/i18n/es.po index b57be3ead3c..6ec990ca528 100644 --- a/addons/phone_validation/i18n/es.po +++ b/addons/phone_validation/i18n/es.po @@ -6,15 +6,16 @@ # José Matias Zuazo , 2017 # Eduardo Magdalena , 2017 # Pedro M. Baeza , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Luis M. Ontalba , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-24 09:00+0000\n" "PO-Revision-Date: 2017-10-24 09:00+0000\n" -"Last-Translator: Luis M. Ontalba , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,13 +59,13 @@ msgstr "ID (identificación)" #: code:addons/phone_validation/tools/phone_validation.py:23 #, python-format msgid "Impossible number %s: probably invalid number of digits" -msgstr "" +msgstr "Número imposible de %s: probablemente número de díg" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:25 #, python-format msgid "Invalid number %s: probably incorrect prefix" -msgstr "" +msgstr "Número no válido:%s probablemente" #. module: phone_validation #: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin___last_update @@ -88,6 +89,8 @@ msgid "" "Unable to format %s:\n" "%s" msgstr "" +"Imposible de dar formato %s:\n" +"%s" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:20 @@ -96,6 +99,8 @@ msgid "" "Unable to parse %s:\n" "%s" msgstr "" +"Imposibe de analizar %s:\n" +"%s" #. module: phone_validation #: model:ir.model,name:phone_validation.model_phone_validation_mixin diff --git a/addons/phone_validation/i18n/zh_CN.po b/addons/phone_validation/i18n/zh_CN.po index 59ec01c1713..45b6f12d1db 100644 --- a/addons/phone_validation/i18n/zh_CN.po +++ b/addons/phone_validation/i18n/zh_CN.po @@ -53,7 +53,7 @@ msgstr "ID" #: code:addons/phone_validation/tools/phone_validation.py:23 #, python-format msgid "Impossible number %s: probably invalid number of digits" -msgstr "" +msgstr "不可能的号码 %s：可能存在无效数字" #. module: phone_validation #: code:addons/phone_validation/tools/phone_validation.py:25 @@ -99,4 +99,4 @@ msgstr "" #. module: phone_validation #: model:ir.model,name:phone_validation.model_phone_validation_mixin msgid "phone.validation.mixin" -msgstr "" +msgstr "phone.validation.mixin" diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po index aac51377819..bca4cd78b3f 100644 --- a/addons/point_of_sale/i18n/de.po +++ b/addons/point_of_sale/i18n/de.po @@ -64,25 +64,25 @@ msgstr "# Positionen" #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "$ 3.12" -msgstr "" +msgstr "3,12 $" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "$ 4.40" -msgstr "" +msgstr "4,40 $" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "$ 4.50" -msgstr "" +msgstr "4,50 $" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "$ 8.50" -msgstr "" +msgstr "8,50 $" #. module: point_of_sale #. openerp-web @@ -279,7 +279,7 @@ msgstr "= Errechneter Endsaldo" #: code:addons/point_of_sale/static/src/js/screens.js:1992 #, python-format msgid "? Clicking \"Confirm\" will validate the payment." -msgstr "" +msgstr "? Klicken Sie auf „Bestätigen“, um die Zahlung zu validieren." #. module: point_of_sale #. openerp-web @@ -293,6 +293,8 @@ msgstr "Ein Kundenname ist erforderlich" msgid "" "A Security PIN used to protect sensible functionality in the Point of Sale" msgstr "" +"Eine Sicherheits-PIN, um die zweckmäßige Funktionalität des Point-of-Sales " +"zu schützen" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_uuid @@ -300,6 +302,8 @@ msgid "" "A globally unique identifier for this pos configuration, used to prevent " "conflicts in client-generated data." msgstr "" +"Eine weltweit einzigartige Identifikation dieser POS-Konfiguration, die dazu" +" verwendet wird, Konflikten um Kundendaten vorzubeugen." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_session_login_number @@ -322,6 +326,10 @@ msgid "" " currencies in your cash registers at the beginning and the end\n" " of each session." msgstr "" +"Eine Sitzung ist eine Zeitspanne, in der Regel ein Tag, in der\n" +" Sie über den Point-of-Sale verkaufen. Der Benutzer muss die\n" +" Währungen in Ihren Barkassen zu Beginn und am Ende\n" +" jeder Sitzung überprüfen." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_order_sequence_number @@ -332,11 +340,13 @@ msgstr "Eine sitzungsspezifische Nummernfolge für die Verkäufe" #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_footer msgid "A short text that will be inserted as a footer in the printed receipt." msgstr "" +"Ein kurzer Text, der als Fußzeile in die gedruckte Quittung eingefügt wird." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_header msgid "A short text that will be inserted as a header in the printed receipt." msgstr "" +"Ein kurzer Text, der als Kopfzeile in die gedruckte Quittung eingefügt wird." #. module: point_of_sale #. openerp-web @@ -348,7 +358,7 @@ msgstr "ABC" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Accept payments with an integrated card reader" -msgstr "" +msgstr "Zahlungen mit integriertem Kartenleser akzeptieren" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_bank_statement_cashbox @@ -368,7 +378,7 @@ msgstr "Buchungsinformation" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_invoice_journal_id msgid "Accounting journal used to create invoices." -msgstr "" +msgstr "Buchungsjournal, das zur Erstellung von Rechnungen verwendet wird." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_journal_id @@ -396,7 +406,7 @@ msgstr "Füge allg. Rabatt hinzu" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Add a custom message to header and footer" -msgstr "" +msgstr "Eine persönliche Nachricht zur Kopf- und Fußzeile hinzufügen" #. module: point_of_sale #. openerp-web @@ -414,6 +424,9 @@ msgid "" "the Sales Journal set on this point of sale if you use the Accounting " "application." msgstr "" +"Alle verfügbaren Preislisten müssen in derselben Währung sein wie das " +"Unternehmen oder dem Verkaufsjournal, die im Point-of-Sale festgelegt ist, " +"wenn Sie die Buchhaltungsanwendung verwenden." #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:255 @@ -422,6 +435,9 @@ msgid "" "All payment methods must be in the same currency as the Sales Journal or the" " company currency if that is not set." msgstr "" +"Alle Zahlungsmethoden müssen in derselben Währung sein wie das " +"Verkaufsjournal oder die Unternehmenswährung, falls diese nicht festgelegt " +"wurde." #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines @@ -436,7 +452,7 @@ msgstr "Kassenbeleg erneut drucken zulassen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Allow global discounts on orders" -msgstr "" +msgstr "Gesamtrabatte für Aufträge zulassen" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_sale_pricelist @@ -466,13 +482,13 @@ msgstr "Gesamtbetrag" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_name msgid "An internal identification of the point of sale." -msgstr "" +msgstr "Eine interne Identifikation des Point-of-Sales." #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:160 #, python-format msgid "Another session is already opened for this point of sale." -msgstr "" +msgstr "Für diesen Point-of-Sale ist bereits eine andere Sitzung geöffnet." #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount @@ -500,7 +516,7 @@ msgstr "Attribute" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_session_rescue msgid "Auto-generated session for orphan orders, ignored in constraints" -msgstr "" +msgstr "Automatische Sitzung für Einzelaufträge, in den Bedingungen ignoriert" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_auto @@ -510,7 +526,7 @@ msgstr "Automatischer Bondruck" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_cashdrawer msgid "Automatically open the cashdrawer." -msgstr "" +msgstr "Automatisches Öffnen der Kassenschublade." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_ids @@ -522,12 +538,12 @@ msgstr "Vorhandene Zahlungsmethoden" #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_available_pricelist_ids #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Available Pricelists" -msgstr "" +msgstr "Verfügbare Preislisten" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_search_inherit_point_of_sale msgid "Available for Point of Sale" -msgstr "" +msgstr "Für Point-of-Sale verfügbar" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos @@ -538,7 +554,7 @@ msgstr "Verfügbar am POS" #: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos #: model:ir.model.fields,field_description:point_of_sale.field_product_template_available_in_pos msgid "Available in Point of Sale" -msgstr "" +msgstr "Am Point-of-Sale verfügbar" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_average_price @@ -595,7 +611,7 @@ msgstr "Grundbetrag" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Bills & Receipts" -msgstr "" +msgstr "Rechnungen und Quittungen" #. module: point_of_sale #. openerp-web @@ -607,7 +623,7 @@ msgstr "Button" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_via_proxy msgid "Bypass browser printing and prints via the hardware proxy." -msgstr "" +msgstr "Druck via Hardware Proxy anstelle lokalem Ausdruck" #. module: point_of_sale #. openerp-web @@ -666,7 +682,7 @@ msgstr "Barkasse" #: code:addons/point_of_sale/models/pos_session.py:141 #, python-format msgid "Cash control can only be applied to cash journals." -msgstr "" +msgstr "Die Kassenprüfung kann nur auf Kassenjournale angewandt werden." #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_cashbox_line @@ -676,7 +692,7 @@ msgstr "Barkassenbuchung" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.account_cashbox_line_view_tree msgid "Cashbox balance" -msgstr "" +msgstr "Kassensaldo" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_cashdrawer @@ -706,11 +722,13 @@ msgid "" "Categories are used to browse your products through the\n" " touchscreen interface." msgstr "" +"Kategorien werden verwendet, um Ihre Produkte mittels der Touchscreen-" +"Schnittstelle zu durchsuchen." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Category Pictures" -msgstr "" +msgstr "Kategorienbilder" #. module: point_of_sale #. openerp-web @@ -771,11 +789,13 @@ msgstr "" msgid "" "Check if you want to group products of this category in point of sale orders" msgstr "" +"Überprüfen Sie, ob Sie Produkte dieser Kategorie in Point-of-Sales-Aufträge " +"zusammenfassen wollen" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_cash_control msgid "Check the amount of the cashbox at opening and closing." -msgstr "" +msgstr "Überprüfen Sie beim Öffnen und Schließen den Betrag in der Kasse." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_account_journal_journal_user @@ -783,6 +803,8 @@ msgid "" "Check this box if this journal define a payment method that can be used in a" " point of sale." msgstr "" +"Aktivieren Sie diese Option, wenn dieses Journal eine Zahlungsmethode " +"definiert hat, die in einem Point-of-Sales verwendet werden kann." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_by @@ -790,6 +812,8 @@ msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session." msgstr "" +"Aktivieren, wenn Sie beim Schließen einer Sitzung die Buchungszeilen nach " +"Produkt gruppieren wollen." #. module: point_of_sale #. openerp-web @@ -806,7 +830,7 @@ msgstr "Unterkategorien" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Choose a pricelist for the Point Of Sale" -msgstr "" +msgstr "Wählen Sie eine Preisliste für den Point-of-Sale" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form @@ -814,11 +838,14 @@ msgid "" "Choose a specific tax regime at the order depending on the kind of customer " "(tax exempt, onsite vs. takeaway, etc.)." msgstr "" +"Wählen Sie für den Auftrag ein bestimmtes Steuersystem, abhängig vom " +"Kundentyp (steuerbefreit, vor Ort vs. zum Mitnehmen etc.)" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Choose among several tax regimes when processing an order" msgstr "" +"Wählen Sie aus mehreren Steuersystemen für die Bearbeitung eines Auftrags" #. module: point_of_sale #. openerp-web @@ -836,12 +863,12 @@ msgstr "Klicken Sie, um ein neues Produkt anzulegen." #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form msgid "Click to add a payment method." -msgstr "" +msgstr "Klicken, um eine Zahlungsmethode hinzuzufügen." #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_pos_config_kanban msgid "Click to create a new PoS config." -msgstr "" +msgstr "Klicken, um eine neue PoS-Konfiguration zu erstellen." #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_pos_pos_form @@ -856,7 +883,7 @@ msgstr "Klicken Sie, um eine neue Kategorie zu definieren." #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_pos_session msgid "Click to start a new session." -msgstr "" +msgstr "Klicken, um eine neue Sitzung zu starten." #. module: point_of_sale #: code:addons/point_of_sale/models/barcode_rule.py:15 @@ -870,6 +897,7 @@ msgstr "Kunde" #, python-format msgid "Client Screen Unsupported. Please upgrade the PosBox" msgstr "" +"Kundenbildschirm wird nicht unterstützt. Bitte aktualisieren Sie die PosBox" #. module: point_of_sale #. openerp-web @@ -919,7 +947,7 @@ msgstr "Konfiguration" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Configuration for journal entries of PoS orders" -msgstr "" +msgstr "Konfiguration für Buchungssätze von PoS-Aufträgen" #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_pos_config_kanban @@ -927,6 +955,8 @@ msgid "" "Configure at least one Point of Sale to be able to sell through the PoS " "interface." msgstr "" +"Konfigurieren Sie mindestens einen Point-of-Sale, um durch die PoS-" +"Schnittstelle verkaufen zu können." #. module: point_of_sale #. openerp-web @@ -941,7 +971,7 @@ msgstr "Bestätigen" #: code:addons/point_of_sale/static/src/js/chrome.js:455 #, python-format msgid "Connected, Not Owned" -msgstr "" +msgstr "Verbunden, kein Besitzer" #. module: point_of_sale #. openerp-web @@ -963,7 +993,7 @@ msgstr "Verkauf fortsetzen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Control cash box at opening and closing" -msgstr "" +msgstr "Kasse beim Öffnen und Schließen kontrollieren" #. module: point_of_sale #. openerp-web @@ -1025,7 +1055,7 @@ msgstr "Aktuelle Session" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_current_session_state msgid "Current Session State" -msgstr "" +msgstr "Aktueller Sitzungsstatus" #. module: point_of_sale #. openerp-web @@ -1042,12 +1072,12 @@ msgstr "Kunde" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Customer Display" -msgstr "" +msgstr "Kundenanzeige" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_customer_facing_display msgid "Customer Facing Display" -msgstr "" +msgstr "Kundenseitiges Display" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_order.py:486 @@ -1059,7 +1089,7 @@ msgstr "Ausgangsrechnung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_customer_facing_display_html msgid "Customer facing display content" -msgstr "" +msgstr "Kundenseitiger Anzeigeinhalt" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard @@ -1081,7 +1111,7 @@ msgstr "Debug Fenster" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_default_cashbox_lines_ids msgid "Default Balance" -msgstr "" +msgstr "Standard-Saldo" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_account_id @@ -1096,7 +1126,7 @@ msgstr "Standard Steuerzuordnung" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Default Opening" -msgstr "" +msgstr "Standard-Öffnung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pricelist_id @@ -1107,7 +1137,7 @@ msgstr "Standardpreisliste" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets msgid "Default company logo" -msgstr "" +msgstr "Standard-Firmenlogo" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_barcode_nomenclature_id @@ -1115,6 +1145,8 @@ msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers." msgstr "" +"Definiert, welche Barcodes verfügbar sind und, wie sie Produkten, Kunden und" +" Kassierern zugewiesen werden." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_delay_validation @@ -1192,7 +1224,7 @@ msgstr "Rabatt:" #: code:addons/point_of_sale/static/src/js/chrome.js:460 #, python-format msgid "Disconnected" -msgstr "" +msgstr "Getrennt" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_discount @@ -1252,7 +1284,7 @@ msgstr "Anzeigename" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Display pictures of product categories" -msgstr "" +msgstr "Bilder von Produktkategorien anzeigen" #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.product_product_action @@ -1262,6 +1294,10 @@ msgid "" " category, you can not sell it through the point of sale\n" " interface." msgstr "" +"Vergessen Sie nicht, den Preis und die Point-of-Sale-Kategorie\n" +" festzulegen, in der er erscheinen sollen. Wenn ein Produkt keine Point-of-Sales-Kategorie\n" +" hat, können Sie es nicht durch die Point-of-Sale-Schnittstelle\n" +" verkaufen." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement @@ -1279,6 +1315,8 @@ msgid "" "Don’t turn this option on if you take orders on smartphones or tablets. \n" " Such devices already benefit from a native keyboard." msgstr "" +"Aktivieren Sie diese Option nicht, wenn Sie auf Smartphones oder Tablets Aufträge annehmen. \n" +" Diese Geräte profitieren bereits von einer zugehörigen Tastatur." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form @@ -1292,14 +1330,14 @@ msgstr "" #: code:addons/point_of_sale/static/src/xml/pos.xml:1355 #, python-format msgid "Download Paid Orders" -msgstr "" +msgstr "Bezahlte Aufträge herunterladen" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1357 #, python-format msgid "Download Unpaid Orders" -msgstr "" +msgstr "Unbezahlte Aufträge herunterladen" #. module: point_of_sale #. openerp-web @@ -1337,27 +1375,27 @@ msgstr "Leere Bestellung" #: code:addons/point_of_sale/static/src/js/screens.js:449 #, python-format msgid "Empty Serial/Lot Number" -msgstr "" +msgstr "Leere Serien- / Losnummer" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_scan_via_proxy msgid "Enable barcode scanning with a remotely connected barcode scanner." -msgstr "" +msgstr "Barcodescanning mit einem Remote-Barcode-Scanner aktivieren." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_electronic_scale msgid "Enables Electronic Scale integration." -msgstr "" +msgstr "Ermöglicht die Integration einer elektronischen Waage." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_payment_terminal msgid "Enables Payment Terminal integration." -msgstr "" +msgstr "Ermöglicht die Integration eines Zahlungsterminals" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_invoicing msgid "Enables invoice generation from the Point of Sale." -msgstr "" +msgstr "Ermöglicht die Rechnungserstellung am Point-of-Sale." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_end_date @@ -1443,7 +1481,7 @@ msgstr "Steuerzuordnung" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Fiscal Position per Order" -msgstr "" +msgstr "Steuerzuordnung pro Auftrag" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_fiscal_position_ids @@ -1459,7 +1497,7 @@ msgstr "Fußzeile" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_big_scrollbars msgid "For imprecise industrial touchscreens." -msgstr "" +msgstr "Für ungenaue Industrie-Touchscreens." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form @@ -1469,7 +1507,7 @@ msgstr "Allgemeine Informationen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Generation of your order references" -msgstr "" +msgstr "Generierung Ihrer Auftragsreferenzen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form @@ -1480,11 +1518,16 @@ msgid "" "recommended for an easy review of your journal entries when managing lots of" " orders." msgstr "" +"Erhalten Sie eine Buchungszeile pro Produkt, anstatt einer Buchungszeile pro" +" Belegzeile. Das gilt für jeden anonymen Auftrag. Wenn der Kunde auf den " +"Auftrag festgelegt ist, wird für jede Belegezeile eine Buchungszeile " +"erstellt. Diese Option wird für eine einfache Überprüfung Ihrer " +"Buchungssätze empfohlen, wenn Sie viele Aufträge verwalten." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Give customer rewards, free samples, etc." -msgstr "" +msgstr "Bieten Sie Kunden Premien, Gratisproben etc." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_category_sequence @@ -1494,7 +1537,7 @@ msgstr "Reihenfolge in Liste der Produktkategorien" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_discount msgid "Global Discounts" -msgstr "" +msgstr "Gesamtrabatte" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html @@ -1519,7 +1562,7 @@ msgstr "Gruppiere Buchungszeilen" #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_categ_is_pos_groupable #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_is_pos_groupable msgid "Group Products in POS" -msgstr "" +msgstr "Produkte in POS gruppieren" #. module: point_of_sale #. openerp-web @@ -1548,7 +1591,7 @@ msgstr "Kopfzeile" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_header_or_footer msgid "Header & Footer" -msgstr "" +msgstr "Kopf- und Fußzeile" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id @@ -1572,7 +1615,7 @@ msgstr "ID" #: code:addons/point_of_sale/static/src/js/popups.js:115 #, python-format msgid "IMPORTANT: Bug Report From Odoo Point Of Sale" -msgstr "" +msgstr "WICHTIG: Fehlerbericht vom Odoo-Point-of-Sale" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_proxy_ip @@ -1587,6 +1630,9 @@ msgid "" "can also decide to not put lots in this operation type. This means it will " "create stock with no lot or not put a restriction on the lot taken. " msgstr "" +"Wenn das aktiviert ist, können Sie die Los- und Seriennummern auswählen. Sie" +" können sich auch dafür entscheiden, bei dieser Vorgangsart keine Losnummer" +" zu verwenden. " #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.product_pos_category_action @@ -1595,6 +1641,8 @@ msgid "" " touchscreen interface will automatically. We suggest not to put\n" " a photo on categories for small (1024x768) screens." msgstr "" +"Wenn Sie der Kategorie ein Bild hinzufügen, wird das Layout der\n" +" Touchscreen-Schnittstelle automatisch. Wir empfehlen Ihnen, Kategorien für kleine (1024x768) Bildschirme keine Fotos hinzuzufügen." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_image @@ -1611,7 +1659,7 @@ msgstr "Bestellungen importieren" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Improve navigation for imprecise industrial touchscreens" -msgstr "" +msgstr "Navigation für ungenaue Industrie-Touchscreens verbessern" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -1640,22 +1688,22 @@ msgstr "Ungültiges Passwort" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id msgid "Initial Category" -msgstr "" +msgstr "Anfangskategorie" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_mercury msgid "Integrated Card Payments" -msgstr "" +msgstr "Integrierte Kartenzahlungen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Integrated Card Reader" -msgstr "" +msgstr "Integrierter Kartenleser" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_category_action msgid "Internal Categories" -msgstr "" +msgstr "Interne Kategorien" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_note @@ -1681,7 +1729,7 @@ msgstr "Rechnung" #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_invoice_journal_id #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Invoice Journal" -msgstr "" +msgstr "Rechnungsbuch" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_invoiced @@ -1699,12 +1747,12 @@ msgstr "Abrechnung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_installed_account_accountant msgid "Is Installed Account Accountant" -msgstr "" +msgstr "Konto-Buchhalter wurde installiert" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_restaurant msgid "Is a Bar/Restaurant" -msgstr "" +msgstr "Ist eine Bar / Restaurant" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id @@ -1752,12 +1800,12 @@ msgstr "Zuletzt geändert am" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_cash msgid "Last Session Closing Cash" -msgstr "" +msgstr "Kassenabschluss der letzten Sitzung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_date msgid "Last Session Closing Date" -msgstr "" +msgstr "Abschlussdatum der letzten Sitzung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_uid @@ -1795,7 +1843,7 @@ msgstr "Zeile Nr." #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_order_line msgid "Lines of Point of Sale Orders" -msgstr "" +msgstr "Auftragspositionen von POS-Aufträgen" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_open_statement.py:33 @@ -1827,24 +1875,24 @@ msgstr "Login Reihenfolge" #: code:addons/point_of_sale/static/src/js/gui.js:304 #, python-format msgid "Login as a Manager" -msgstr "" +msgstr "Als Manager anmelden" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_lot_name msgid "Lot Name" -msgstr "" +msgstr "Losname" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/models.js:2343 #, python-format msgid "Lot/Serial Number(s) Required" -msgstr "" +msgstr "Los -/ Seriennummer(n) erforderlich" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_pack_lot_ids msgid "Lot/serial Number" -msgstr "" +msgstr "Los- / Seriennummer" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_loyalty @@ -1854,7 +1902,7 @@ msgstr "Treueprogramm" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Loyalty program to use for this point of sale." -msgstr "" +msgstr "Treueprogramm für diesen Point-of-Sale." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment @@ -1869,12 +1917,17 @@ msgid "" "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." msgstr "" +"Stellen Sie im Point-of-Sale mehrere Preislisten zur Verfügung. Sie können " +"außerdem eine Preisliste auf bestimmte Kunden aus ihrem Kontaktformular (im " +"Verkaufsregister) anwenden. Um gültig zu sein, muss diese Preisliste hier " +"als verfügbare Preiseliste aufgelistet sein. Andernfalls gilt die " +"Standardpreisliste." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "Malibu Drink" -msgstr "" +msgstr "Malibu-Drink" #. module: point_of_sale #: model:res.groups,name:point_of_sale.group_pos_manager @@ -1981,13 +2034,13 @@ msgstr "" #: code:addons/point_of_sale/report/pos_invoice.py:24 #, python-format msgid "No link to an invoice for %s." -msgstr "" +msgstr "Kein Link zu einer Rechnung für %s." #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_open_statement.py:24 #, python-format msgid "No sequence defined on the journal" -msgstr "" +msgstr "Keine Nummernfolge für das Journal definiert" #. module: point_of_sale #. openerp-web @@ -2023,7 +2076,7 @@ msgstr "Anzahl der gedruckten Bons" #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "Odoo Logo" -msgstr "" +msgstr "Odoo-Logo" #. module: point_of_sale #. openerp-web @@ -2059,7 +2112,7 @@ msgstr "Ok" #: code:addons/point_of_sale/static/src/js/screens.js:450 #, python-format msgid "One or more product(s) required serial/lot number." -msgstr "" +msgstr "Ein oder mehrere Produkt(e) erfordern eine Serien- / Losnummer." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_restrict_price_control @@ -2068,6 +2121,8 @@ msgid "" "Only users with Manager access rights for PoS app can modify the product " "prices on orders." msgstr "" +"Nur Benutzer mit Manager-Zugangsrechten für die PoS-App können die " +"Produktpreise von Aufträgen ändern." #. module: point_of_sale #. openerp-web @@ -2107,7 +2162,7 @@ msgstr "Öffne Registrierkassen" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_details_wizard msgid "Open Sales Details Report" -msgstr "" +msgstr "Bericht über Verkaufsdetails öffnen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -2142,7 +2197,7 @@ msgstr "Eröffnungsdatum" #: model:ir.actions.act_window,name:point_of_sale.account_cashbox_line_action #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Opening/Closing Values" -msgstr "" +msgstr "Eröffnungs- / Schlusswerte" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_picking_type_id @@ -2155,11 +2210,12 @@ msgstr "Vorgangstyp" #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Operation type used to record product pickings" msgstr "" +"Vorgangstyp, der für die Aufzeichnung der Produktauswahl verwendet wird" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Operation types show up in the Inventory dashboard." -msgstr "" +msgstr "Die Vorgangstypen werden im Inventar-Dashboard angezeigt." #. module: point_of_sale #. openerp-web @@ -2190,12 +2246,12 @@ msgstr "Auftrag Kürzel Nummernfolge" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Order Interface" -msgstr "" +msgstr "Auftragsschnittstelle" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_sequence_line_id msgid "Order Line IDs Sequence" -msgstr "" +msgstr "Sequenz des Auftragspositions-IDs" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_lines @@ -2229,7 +2285,7 @@ msgstr "Auftragsnummernfolge" #: code:addons/point_of_sale/models/pos_order.py:498 #, python-format msgid "Order is not paid." -msgstr "" +msgstr "Der Auftrag wurde nicht bezahlt." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form @@ -2260,13 +2316,13 @@ msgstr "Statistik Verkäufe" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.account_journal_action_point_of_sale msgid "POS Journals" -msgstr "" +msgstr "POS-Journale" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:347 #, python-format msgid "POS Order %s" -msgstr "" +msgstr "POS-Auftrag %s" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form @@ -2291,23 +2347,23 @@ msgstr "POS Kaufpositionen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form msgid "POS Sales" -msgstr "" +msgstr "POS-Verkäufe" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:356 #, python-format msgid "POS order line %s" -msgstr "" +msgstr "POS-Auftragsposition %s" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search msgid "POS orders created during the current year" -msgstr "" +msgstr "Während des laufenden Jahres erstellt POS-Aufträge" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_line_pos_statement_id msgid "POS statement" -msgstr "" +msgstr "POS-Beleg" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_paid @@ -2391,7 +2447,7 @@ msgstr "" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Payment methods available" -msgstr "" +msgstr "Verfügbare Zahlungsmethoden" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_statement_ids @@ -2411,7 +2467,7 @@ msgstr "Zahlungen" #. module: point_of_sale #: model:ir.filters,name:point_of_sale.filter_orders_per_session msgid "Per session" -msgstr "" +msgstr "Pro Sitzung" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_order_user_id @@ -2419,6 +2475,8 @@ msgid "" "Person who uses the cash register. It can be a reliever, a student or an " "interim employee." msgstr "" +"Person, die die Barkasse verwendet. Es kann eine Aushilfe, ein Student oder " +"ein" #. module: point_of_sale #. openerp-web @@ -2444,12 +2502,12 @@ msgstr "Liefervorgang" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_picking_count msgid "Picking Count" -msgstr "" +msgstr "Anzahl auswählen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form msgid "Picking Errors" -msgstr "" +msgstr "Fehler auswählen" #. module: point_of_sale #. openerp-web @@ -2488,14 +2546,14 @@ msgstr "Bitte wählen Sie den Kunden" #: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action #: model:ir.ui.menu,name:point_of_sale.menu_products_pos_category msgid "PoS Categories" -msgstr "" +msgstr "PoS Kategorien" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_category #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pos_categ_id #: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view msgid "PoS Category" -msgstr "" +msgstr "PoS-Kategorie" #. module: point_of_sale #: model:stock.picking.type,name:point_of_sale.picking_type_posout @@ -2546,7 +2604,7 @@ msgstr "Point Of Sale Konfiguration" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pos_manager_id msgid "Point of Sale Manager Group" -msgstr "" +msgstr "Point-of-Sale-Gruppenmanager" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_name @@ -2580,7 +2638,7 @@ msgstr "Point of Sale Sitzung" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pos_user_id msgid "Point of Sale User Group" -msgstr "" +msgstr "Point-of-Sale-Benutzergruppe" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_form_view @@ -2590,18 +2648,18 @@ msgstr "PoS Kategorien" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_pos_config_ids msgid "Pos Config" -msgstr "" +msgstr "PoS-Konfiguration" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_res_partner_pos_order_count #: model:ir.model.fields,field_description:point_of_sale.field_res_users_pos_order_count msgid "Pos Order Count" -msgstr "" +msgstr "PoS-Auftragsanzahl" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_pos_order_line_id msgid "Pos Order Line" -msgstr "" +msgstr "POS-Auftragsposition" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_duration @@ -2611,23 +2669,23 @@ msgstr "" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_state msgid "Pos Session State" -msgstr "" +msgstr "PoS-Sitzungsstatus" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username msgid "Pos Session Username" -msgstr "" +msgstr "PoS-Sitzungsbenutzername" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_posbox #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "PosBox" -msgstr "" +msgstr "PosBox" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "PosBox / Hardware Proxy" -msgstr "" +msgstr "PosBox / Hardware-Proxy" #. module: point_of_sale #. openerp-web @@ -2650,7 +2708,7 @@ msgstr "Barzahlung vorausfüllen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Prefill amount paid with the exact due amount" -msgstr "" +msgstr "Gezahlten Betrag mit dem exakten fälligen Betrag vorausfüllen" #. module: point_of_sale #. openerp-web @@ -2664,12 +2722,12 @@ msgstr "Preis" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Price Control" -msgstr "" +msgstr "Preiskontrolle" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails msgid "Price Unit" -msgstr "" +msgstr "Preiseinheit" #. module: point_of_sale #: code:addons/point_of_sale/models/barcode_rule.py:13 @@ -2716,12 +2774,12 @@ msgstr "Bon drucken" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Print invoices on customer request" -msgstr "" +msgstr "Rechnungen auf Kundenanfrage drucken" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Print receipts automatically once the payment registered" -msgstr "" +msgstr "Rechnungen automatisch drucken, sobald die Zahlung erfasst wurde" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_via_proxy @@ -2786,7 +2844,7 @@ msgstr "Produkteinheit" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_product_uom_categ msgid "Product UoM Categories" -msgstr "" +msgstr "Kategorien für Maßeinheiten von Produkten" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_product_action @@ -2797,12 +2855,12 @@ msgstr "Produktvarianten" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Product prices on receipts" -msgstr "" +msgstr "Produktpreise auf Belegen" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tipproduct msgid "Product tips" -msgstr "" +msgstr "Produkt-Tipps" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_template_action_pos_product @@ -2838,7 +2896,7 @@ msgstr "Menge" #: code:addons/point_of_sale/static/src/xml/pos.xml:1373 #, python-format msgid "Read Weighing Scale" -msgstr "" +msgstr "Waage ablesen" #. module: point_of_sale #. openerp-web @@ -2875,14 +2933,14 @@ msgstr "Bon Referenz" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_rescue msgid "Recovery Session" -msgstr "" +msgstr "Wiederherstellungssitzung" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1367 #, python-format msgid "Refresh Display" -msgstr "" +msgstr "Anzeige aktualisieren" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep @@ -2909,12 +2967,12 @@ msgstr "Verantwortlich" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_restrict_price_control msgid "Restrict Price Modifications to Managers" -msgstr "" +msgstr "Preisänderungen für Manager einschränken" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Restrict price modification to managers" -msgstr "" +msgstr "Preisänderungen für Manager einschränken" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -2982,6 +3040,8 @@ msgstr "Speichern" #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Save this configuration to see and edit the customer display" msgstr "" +"Speichern Sie diese Konfiguration, um die Kundenanzeige zu sehen und zu " +"bearbeiten" #. module: point_of_sale #. openerp-web @@ -3002,7 +3062,7 @@ msgstr "Scan" #: code:addons/point_of_sale/static/src/xml/pos.xml:1346 #, python-format msgid "Scan EAN-13" -msgstr "" +msgstr "EAN-13 scannen" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_scan_via_proxy @@ -3044,7 +3104,7 @@ msgstr "Security PIN" #: code:addons/point_of_sale/models/res_users.py:15 #, python-format msgid "Security PIN can only contain digits" -msgstr "" +msgstr "Der Sicherheits-PIN darf nur Ziffern enthalten" #. module: point_of_sale #. openerp-web @@ -3065,7 +3125,7 @@ msgstr "Benutzer auswählen" #: code:addons/point_of_sale/static/src/js/screens.js:2160 #, python-format msgid "Select pricelist" -msgstr "" +msgstr "Preisliste auswählen" #. module: point_of_sale #. openerp-web @@ -3095,7 +3155,7 @@ msgstr "Fortlaufende Nummer" #: code:addons/point_of_sale/static/src/xml/pos.xml:1099 #, python-format msgid "Serial/Lot Number" -msgstr "" +msgstr "Serien- / Losnummer" #. module: point_of_sale #. openerp-web @@ -3132,7 +3192,7 @@ msgstr "Sitzungs-ID" #: code:addons/point_of_sale/static/src/xml/pos.xml:1225 #, python-format msgid "Session ids:" -msgstr "" +msgstr "Sitzungs-IDs:" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form @@ -3159,7 +3219,7 @@ msgstr "Kunde auswählen" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_start_category msgid "Set Start Category" -msgstr "" +msgstr "Startkategorie festlegen" #. module: point_of_sale #. openerp-web @@ -3171,19 +3231,19 @@ msgstr "Gewicht eintragen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Set barcodes to scan products, customer cards, etc." -msgstr "" +msgstr "Legen Sie Barcodes fest, um Produkte, Kundenkarten etc. zu scannen" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Set shop-specific prices, seasonal discounts, etc." -msgstr "" +msgstr "Legen Sie ladenspezifische Preise, saisonale Rabatte etc. fest" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/pos.web_editor.js:33 #, python-format msgid "Set your customized advertisement here" -msgstr "" +msgstr "Legen Sie hier Ihre individuelle Werbung fest" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -3193,7 +3253,7 @@ msgstr "Einstellungen" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display msgid "Show checkout to customers with a remotely-connected screen." -msgstr "" +msgstr "Kunden mit einem Remote-Bildschirm die Kasse zeigen." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pricelist_item @@ -3210,7 +3270,7 @@ msgstr "Überspringen" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_skip_screen msgid "Skip Preview Screen" -msgstr "" +msgstr "Vorschaufenster überspringen" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_image_small @@ -3233,12 +3293,12 @@ msgstr "" #: code:addons/point_of_sale/static/src/js/gui.js:333 #, python-format msgid "Some orders could not be submitted to" -msgstr "" +msgstr "Einige Aufträge konnten nicht gesendet werden an" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_pack_operation_lot msgid "Specify product lot/serial number in pos order line" -msgstr "" +msgstr "Fertigungslos- / Seriennummer in der PoS-Auftragsposition angeben" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_start_date @@ -3248,7 +3308,7 @@ msgstr "Startdatum" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Start selling from a default product category" -msgstr "" +msgstr "Verkauf aus einer Standard-Produktkategorie starten" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_cash_register_balance_start @@ -3287,7 +3347,7 @@ msgstr "Lagerort" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Stock location used for the inventory" -msgstr "" +msgstr "Lagerort für das Inventar verwendet" #. module: point_of_sale #. openerp-web @@ -3313,7 +3373,7 @@ msgstr "Zwischensumme mit/ohne Steuer" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_price_sub_total msgid "Subtotal w/o discount" -msgstr "" +msgstr "Zwischensumme ohne Rabatt" #. module: point_of_sale #. openerp-web @@ -3392,22 +3452,22 @@ msgstr "USt-IdNr." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime msgid "Tax Regime" -msgstr "" +msgstr "Steuersystem" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime_selection msgid "Tax Regime Selection value" -msgstr "" +msgstr "Steuersystemauswahlwert" #. module: point_of_sale #: selection:pos.config,iface_tax_included:0 msgid "Tax-Excluded Prices" -msgstr "" +msgstr "Preise ohne Steuern" #. module: point_of_sale #: selection:pos.config,iface_tax_included:0 msgid "Tax-Included Prices" -msgstr "" +msgstr "Preise mit Steuern" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_tax @@ -3472,6 +3532,8 @@ msgstr "" msgid "" "The company of the sales journal is different than the one of point of sale" msgstr "" +"Das Unternehmen des Verkaufsjournals unterscheidet sich von dem des Point-" +"of-Sales" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:227 @@ -3487,6 +3549,7 @@ msgstr "" #, python-format msgid "The default pricelist must be included in the available pricelists." msgstr "" +"Die Standardpreisliste muss in der verfügbaren Preisliste enthalten sein." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_proxy_ip @@ -3494,6 +3557,8 @@ msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty." msgstr "" +"Der Host oder die IP-Adresse für den Hardware-Proxy. Wenn kein Eintrag " +"vorliegt, wird dieser automatisch erkannt." #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:237 @@ -3501,6 +3566,8 @@ msgstr "" msgid "" "The invoice journal and the point of sale must belong to the same company" msgstr "" +"Das Rechnungsbuch und der Point-of-Sale müssen zu demselben Unternehmen " +"gehören" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:253 @@ -3509,6 +3576,8 @@ msgid "" "The invoice journal must be in the same currency as the Sales Journal or the" " company currency if that is not set." msgstr "" +"Das Rechnungsbuch muss in derselben Währung wie das Verkaufsjournal oder die" +" Firmenwährung sein, wenn diese nicht festgelegt ist." #. module: point_of_sale #: sql_constraint:pos.session:0 @@ -3519,7 +3588,7 @@ msgstr "Die Bezeichnung der POS Sitzung muss eindeutig sein." #: model:ir.model.fields,help:point_of_sale.field_res_partner_pos_order_count #: model:ir.model.fields,help:point_of_sale.field_res_users_pos_order_count msgid "The number of point of sales orders related to this customer" -msgstr "" +msgstr "Die Anzahl der Point-of-Sales-Aufträge für diesen Kunden" #. module: point_of_sale #. openerp-web @@ -3543,6 +3612,8 @@ msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount." msgstr "" +"Der Zahlungseingang verhält sich ähnlich wie ein Bankzahlungseingang, und " +"wird" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_order_config_id @@ -3556,6 +3627,8 @@ msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown." msgstr "" +"Der Point-of-Sale zeigt standardmäßig die Produktkategorie an. Ist keine " +"Kategorie angegeben, werden alle verfügbaren Produkte angezeigt." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_pricelist_id @@ -3563,11 +3636,13 @@ msgid "" "The pricelist used if no customer is selected or if the customer has no Sale" " Pricelist configured." msgstr "" +"Die Preisliste, die verwendet wird, wenn kein Kunde ausgewählt wurde oder " +"der Kunden keine Verkaufspreisliste konfiguriert hat." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_display_categ_images msgid "The product categories will be displayed with pictures." -msgstr "" +msgstr "Die Produktkategorien werden mit Bildern angezeigt." #. module: point_of_sale #. openerp-web @@ -3583,11 +3658,13 @@ msgid "" "The receipt screen will be skipped if the receipt can be printed " "automatically." msgstr "" +"Die Quittungsansicht wird übersprungen, wenn die Quittung automatisch " +"gedruckt werden kann." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_auto msgid "The receipt will automatically be printed at the end of each order." -msgstr "" +msgstr "Die Quittung wird automatisch am Ende jeder Bestellung gedruckt." #. module: point_of_sale #. openerp-web @@ -3595,6 +3672,7 @@ msgstr "" #, python-format msgid "The server encountered an error while receiving your order." msgstr "" +"Beim Empfangen Ihres Auftrages ist auf dem Server ein Fehler aufgetreten." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -3689,6 +3767,8 @@ msgid "" "This cashbox line is used by default when opening or closing a balance for " "this point of sale" msgstr "" +"Diese Kassenzeile wird standardmäßig verwendet, wenn Sie einen Saldo für " +"diesen Point-of-Sale öffnen oder schließen" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_account_journal_amount_authorized_diff @@ -3698,6 +3778,11 @@ msgid "" "this maximum is reached, the user will have an error message at the closing " "of his session saying that he needs to contact his manager." msgstr "" +"Dieses Feld zeigt die maximal zulässige Differenz zwischen dem Endsaldo und " +"dem errechneten Bargeld beim Schließen einer Sitzung für nicht-PoS-Manager. " +"Wenn dieses Maximum erreicht ist, erhält der Benutzer beim Schließen seiner " +"Sitzung eine Fehlermeldung, die ihn dazu auffordert, seinen Manager zu " +"kontaktieren." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_category_image @@ -3714,6 +3799,8 @@ msgid "" "This field is there to pass the id of the pos manager group to the point of " "sale client." msgstr "" +"Dieses Feld ist dazu da, den ID der PoS-Managergruppe dem Point-of-Sale-" +"Kunden zu übergeben" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_pos_user_id @@ -3721,6 +3808,8 @@ msgid "" "This field is there to pass the id of the pos user group to the point of " "sale client." msgstr "" +"Dieses Feld ist dazu da, den ID der PoS-Benutzergruppe dem Point-of-Sale-" +"Kunden zu übergeben." #. module: point_of_sale #: code:addons/point_of_sale/models/pos_order.py:522 @@ -3736,6 +3825,8 @@ msgid "" "This is useful for restaurants with onsite and take-away services that imply" " specific tax rates." msgstr "" +"Dies ist für Restaurants mit Vor-Ort- und Mitnahmediensten nützlich, die " +"spezielle Steuersätze implizieren." #. module: point_of_sale #. openerp-web @@ -3746,6 +3837,9 @@ msgid "" "all the unsaved data and exit the point of sale. This operation cannot be " "undone." msgstr "" +"Dieser Vorgang entfernt alle unbezahlten Aufträge im Browser. Sie verlieren " +"alle ungespeicherten Daten und verlassen den Point-of-Sale. Dieser Vorgang " +"kann nicht rückgängig gemacht werden." #. module: point_of_sale #. openerp-web @@ -3755,11 +3849,14 @@ msgid "" "This operation will permanently destroy all paid orders from the local " "storage. You will lose all the data. This operation cannot be undone." msgstr "" +"Dieser Vorgang entfernt dauerhaft alle bezahlten Aufträge im lokalen " +"Speicher. Sie verlieren alle Daten. Dieser Vorgang kann nicht rückgängig " +"gemacht werden." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_tip_product_id msgid "This product is used as reference on customer receipts." -msgstr "" +msgstr "Dieses Produkt wird als Referenz auf Kundenquittungen verwendet." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_line_id @@ -3767,6 +3864,8 @@ msgid "" "This sequence is automatically created by Odoo but you can change it to " "customize the reference numbers of your orders lines." msgstr "" +"Odoo erstellt diese Reihenfolge automatisch, aber Sie können sie ändern, um " +"die Referenznummern Ihrer Auftragspositionen anzupassen." #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_id @@ -3867,7 +3966,7 @@ msgstr "Gesamte Steuern" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_session_cash_register_total_entry_encoding msgid "Total of all paid sales orders" -msgstr "" +msgstr "Gesamtumsatz aller Verkäufe" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_session_cash_register_balance_end_real @@ -3907,6 +4006,8 @@ msgid "" "Unable to open the session. You have to assign a sales journal to your point" " of sale." msgstr "" +"Die Sitzung kann nicht geöffnet werden. Sie müssen Ihrem Point-of-Sale ein " +"Verkaufsjournal zuweisen." #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_price_unit @@ -3942,27 +4043,27 @@ msgstr "Benutze vorhandene Los/Seriennummer" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Use a default specific tax regime" -msgstr "" +msgstr "Ein spezielles Standard-Steuersystem verwenden" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_use_pricelist msgid "Use a pricelist." -msgstr "" +msgstr "Eine Preisliste verwenden." #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Use a virtual keyboard for touchscreens" -msgstr "" +msgstr "Eine virtuelle Tastatur für Touchscreens verwenden" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Use an integrated hardware setup like" -msgstr "" +msgstr "Ein integriertes Hardware-Setup verwenden als" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_account_journal_journal_user msgid "Use in Point of Sale" -msgstr "" +msgstr "Beim Point-of-Sale verwenden" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_sale_pricelist @@ -4003,7 +4104,7 @@ msgstr "Benutzer" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_uuid msgid "Uuid" -msgstr "" +msgstr "UUID" #. module: point_of_sale #. openerp-web @@ -4060,6 +4161,9 @@ msgid "" "accounting journal for all the orders not invoiced. Invoices are recorded in" " accounting separately." msgstr "" +"Immer, wenn Sie eine Sitzung schließen, wird ein Eintrag für alle nicht in " +"Rechnung gestellten Aufträge im folgenden Buchungsjournal generiert. " +"Rechnungen werden in der Buchhaltung gesondert erfasst." #. module: point_of_sale #. openerp-web @@ -4098,6 +4202,8 @@ msgid "" "You cannot confirm all orders of this session, because they have not the 'paid' status.\n" "{reference} is in state {state}, total amount: {total}, paid: {paid}" msgstr "" +"Sie können nicht alle Aufträge dieser Sitzung bestätigen, weil sie nicht den Status „Bezahlt“ haben.\n" +"{reference} im Status {state}, Gesamtbetrag: {total}, bezahlt: {paid}" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:151 @@ -4135,6 +4241,9 @@ msgid "" "You cannot use the session of another user. This session is owned by %s. " "Please first close this one to use this point of sale." msgstr "" +"Sie können nicht die Sitzung eines anderen Benutzers verwenden. Diese " +"Sitzung gehört %s. Bitte schließen Sie zunächst diese, um diesen Point-of-" +"Sale zu verwenden." #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_open_statement.py:18 @@ -4165,7 +4274,7 @@ msgstr "Sie sollten zumindest eine Kasse öffnen." #: code:addons/point_of_sale/models/pos_order.py:926 #, python-format msgid "You have to select a pricelist in the sale form !" -msgstr "" +msgstr "Sie müssen eine Preisliste beim Verkaufsauftrag wählen!" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_order.py:912 @@ -4181,19 +4290,19 @@ msgstr "" #: code:addons/point_of_sale/models/pos_session.py:26 #, python-format msgid "You have to set a Sale Journal for the POS:%s" -msgstr "" +msgstr "Sie müssen ein Verkaufsjournal festlegen für den PoS:%s" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_details.py:48 #, python-format msgid "You have to set a logo or a layout for your company." -msgstr "" +msgstr "Sie müssen ein Logo oder ein Layout für Ihr Unternehmen festlegen." #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_details.py:50 #, python-format msgid "You have to set your reports's header and footer layout." -msgstr "" +msgstr "Sie müssen das Kopf- und Fußzeilenlayout Ihres Berichts festlegen." #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.product_product_action @@ -4201,6 +4310,8 @@ msgid "" "You must define a product for everything you sell through\n" " the point of sale interface." msgstr "" +"Sie müssen ein Produkt für alles, was Sie über\n" +" die Point-of-Sales-Schnittstelle verkaufen, definieren." #. module: point_of_sale #. openerp-web @@ -4208,6 +4319,7 @@ msgstr "" #, python-format msgid "You need to select the customer before you can invoice an order." msgstr "" +"Sie müssen einen Kunden wählen, bevor Sie einen Auftrag berechnen können." #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:166 @@ -4272,7 +4384,7 @@ msgstr "barcode.rule" #: code:addons/point_of_sale/static/src/xml/pos.xml:1222 #, python-format msgid "belong to another session:" -msgstr "" +msgstr "Gehören zu einer anderen Sitzung:" #. module: point_of_sale #. openerp-web @@ -4317,26 +4429,26 @@ msgstr "Rabatt" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "e.g. Company Address, Website" -msgstr "" +msgstr "z. B. Firmenadresse, Website" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "e.g. Return Policy, Thanks for shopping with us!" -msgstr "" +msgstr "z. B. Rücksendebedingungen, Vielen Dank für Ihren Einkauf bei uns!" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/popups.js:109 #, python-format msgid "error" -msgstr "" +msgstr "Fehler" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:1988 #, python-format msgid "for an order of" -msgstr "" +msgstr "Für einen Auftrag von" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:335 @@ -4350,7 +4462,7 @@ msgstr "nicht genutzt" #: code:addons/point_of_sale/static/src/xml/pos.xml:1216 #, python-format msgid "paid orders" -msgstr "" +msgstr "Bezahlte Aufträge" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form @@ -4375,7 +4487,7 @@ msgstr "" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_saledetails msgid "report.point_of_sale.report_saledetails" -msgstr "" +msgstr "report.point_of_sale.report_saledetails" #. module: point_of_sale #. openerp-web @@ -4407,18 +4519,18 @@ msgstr "Tab" #: code:addons/point_of_sale/static/src/xml/pos.xml:1217 #, python-format msgid "unpaid orders" -msgstr "" +msgstr "Unbezahlte Bestellungen" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1219 #, python-format msgid "unpaid orders could not be imported" -msgstr "" +msgstr "Unbezahlte Aufträge konnten nicht importiert werden" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1221 #, python-format msgid "were duplicates of existing orders" -msgstr "" +msgstr "Waren Duplikate bestehender Aufträge" diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po index 41286b167fc..437b797a32e 100644 --- a/addons/point_of_sale/i18n/es.po +++ b/addons/point_of_sale/i18n/es.po @@ -2798,7 +2798,7 @@ msgstr "Categoría de producto" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Product Prices" -msgstr "" +msgstr "Precios del Producto" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_tree_view diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po index 2143fed7825..4fe4d61df75 100644 --- a/addons/point_of_sale/i18n/zh_CN.po +++ b/addons/point_of_sale/i18n/zh_CN.po @@ -419,7 +419,7 @@ msgstr "允许收银员再次打印收据" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Allow global discounts on orders" -msgstr "" +msgstr "订单全场折扣" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_sale_pricelist @@ -449,13 +449,13 @@ msgstr "总额合计" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_name msgid "An internal identification of the point of sale." -msgstr "" +msgstr "销售点的内部确认。" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:160 #, python-format msgid "Another session is already opened for this point of sale." -msgstr "" +msgstr "已为此销售点打开其他会话。" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount @@ -493,7 +493,7 @@ msgstr "自动收据打印" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_cashdrawer msgid "Automatically open the cashdrawer." -msgstr "" +msgstr "自动打开收银箱。" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_ids @@ -578,7 +578,7 @@ msgstr "基本金额" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Bills & Receipts" -msgstr "" +msgstr "账单和收据" #. module: point_of_sale #. openerp-web @@ -590,7 +590,7 @@ msgstr "按钮" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_via_proxy msgid "Bypass browser printing and prints via the hardware proxy." -msgstr "" +msgstr "绕过浏览器打印，通过硬件代理进行打印。" #. module: point_of_sale #. openerp-web @@ -750,7 +750,7 @@ msgstr "如果你想这个产品适用于POS，勾选此项" #: model:ir.model.fields,help:point_of_sale.field_product_uom_is_pos_groupable msgid "" "Check if you want to group products of this category in point of sale orders" -msgstr "" +msgstr "检查是否要在销售点订单中对此类别的产品进行分组" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_cash_control @@ -769,7 +769,7 @@ msgstr "如果这个日记账中定义了能够在‘POS’用的付款方式就 msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session." -msgstr "" +msgstr "如果您想要在关闭会话时按产品分组日记账项目，则对其进行检查。" #. module: point_of_sale #. openerp-web @@ -786,19 +786,19 @@ msgstr "儿童类" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Choose a pricelist for the Point Of Sale" -msgstr "" +msgstr "选择销售点的价目表" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "" "Choose a specific tax regime at the order depending on the kind of customer " "(tax exempt, onsite vs. takeaway, etc.)." -msgstr "" +msgstr "选择" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Choose among several tax regimes when processing an order" -msgstr "" +msgstr "处理订单时，在多个税制中进行选择" #. module: point_of_sale #. openerp-web @@ -849,7 +849,7 @@ msgstr "客户" #: code:addons/point_of_sale/static/src/js/chrome.js:462 #, python-format msgid "Client Screen Unsupported. Please upgrade the PosBox" -msgstr "" +msgstr "不支持客户端屏幕。请升级 PosBox" #. module: point_of_sale #. openerp-web @@ -899,7 +899,7 @@ msgstr "配置" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Configuration for journal entries of PoS orders" -msgstr "" +msgstr "配置 PoS 订单的日记账分录" #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.action_pos_config_kanban @@ -921,7 +921,7 @@ msgstr "确认" #: code:addons/point_of_sale/static/src/js/chrome.js:455 #, python-format msgid "Connected, Not Owned" -msgstr "" +msgstr "Connected, Not Owned" #. module: point_of_sale #. openerp-web @@ -943,7 +943,7 @@ msgstr "继续销售" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Control cash box at opening and closing" -msgstr "" +msgstr "在打开和关闭时控制现金箱" #. module: point_of_sale #. openerp-web @@ -1005,7 +1005,7 @@ msgstr "当前会话" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_current_session_state msgid "Current Session State" -msgstr "" +msgstr "当前会话状态" #. module: point_of_sale #. openerp-web @@ -1022,12 +1022,12 @@ msgstr "客户" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Customer Display" -msgstr "" +msgstr "客户显示" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_customer_facing_display msgid "Customer Facing Display" -msgstr "" +msgstr "面向客户的显示" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_order.py:486 @@ -1039,7 +1039,7 @@ msgstr "客户发票" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_customer_facing_display_html msgid "Customer facing display content" -msgstr "" +msgstr "面向客户的显示内容" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard @@ -1076,7 +1076,7 @@ msgstr "默认财政状况" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Default Opening" -msgstr "" +msgstr "默认打开" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pricelist_id @@ -1087,14 +1087,14 @@ msgstr "默认价格表" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets msgid "Default company logo" -msgstr "" +msgstr "默认公司徽标" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_barcode_nomenclature_id msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers." -msgstr "" +msgstr "定义可用的条码并且分配给产品，客户和收银员" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_delay_validation @@ -1165,14 +1165,14 @@ msgstr "折扣" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails msgid "Disc:" -msgstr "" +msgstr "折扣：" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/chrome.js:460 #, python-format msgid "Disconnected" -msgstr "" +msgstr "已断开连接" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_discount @@ -1232,7 +1232,7 @@ msgstr "显示名称" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Display pictures of product categories" -msgstr "" +msgstr "显示产品类别的图片" #. module: point_of_sale #: model:ir.actions.act_window,help:point_of_sale.product_product_action @@ -1259,6 +1259,8 @@ msgid "" "Don’t turn this option on if you take orders on smartphones or tablets. \n" " Such devices already benefit from a native keyboard." msgstr "" +"如果您在智能手机或平板电脑上下订单，则不要开启此选项。\n" +" 此类设备已通过原始键盘受益。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form @@ -1272,14 +1274,14 @@ msgstr "" #: code:addons/point_of_sale/static/src/xml/pos.xml:1355 #, python-format msgid "Download Paid Orders" -msgstr "" +msgstr "下载已付订单" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1357 #, python-format msgid "Download Unpaid Orders" -msgstr "" +msgstr "下载未付订单" #. module: point_of_sale #. openerp-web @@ -1322,22 +1324,22 @@ msgstr "空的批次/序列号码" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_scan_via_proxy msgid "Enable barcode scanning with a remotely connected barcode scanner." -msgstr "" +msgstr "使用远程连接的条码扫描器进行条码扫描。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_electronic_scale msgid "Enables Electronic Scale integration." -msgstr "" +msgstr "启用电子秤集成。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_payment_terminal msgid "Enables Payment Terminal integration." -msgstr "" +msgstr "启用支付终端集成。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_invoicing msgid "Enables invoice generation from the Point of Sale." -msgstr "" +msgstr "通过销售点启用发票生成。" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_end_date @@ -1419,7 +1421,7 @@ msgstr "财政状况" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Fiscal Position per Order" -msgstr "" +msgstr "每个订单的财务状况" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_fiscal_position_ids @@ -1435,7 +1437,7 @@ msgstr "页脚" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_big_scrollbars msgid "For imprecise industrial touchscreens." -msgstr "" +msgstr "对于不精确的工业用触摸屏。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form @@ -1445,7 +1447,7 @@ msgstr "一般信息" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Generation of your order references" -msgstr "" +msgstr "订单参考的生成" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form @@ -1456,11 +1458,12 @@ msgid "" "recommended for an easy review of your journal entries when managing lots of" " orders." msgstr "" +"每个产品提供一个日记账项目，而不是每个收据行提供一个日记账项目。这适用于任何匿名订单。如果在订单上设置了客户，则会为每个收据行创建一个日记账项目。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Give customer rewards, free samples, etc." -msgstr "" +msgstr "为客户提供奖励、免费样品等" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_category_sequence @@ -1470,7 +1473,7 @@ msgstr "显示产品列表的序列" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_discount msgid "Global Discounts" -msgstr "" +msgstr "全局折扣" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html @@ -1495,7 +1498,7 @@ msgstr "分组日记账项目" #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_categ_is_pos_groupable #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_is_pos_groupable msgid "Group Products in POS" -msgstr "" +msgstr "分组销售点中的产品" #. module: point_of_sale #. openerp-web @@ -1524,7 +1527,7 @@ msgstr "页眉" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_header_or_footer msgid "Header & Footer" -msgstr "" +msgstr "页眉和页脚" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id @@ -1590,7 +1593,7 @@ msgstr "导入订单" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Improve navigation for imprecise industrial touchscreens" -msgstr "" +msgstr "改善不精确工业用触摸屏的导航" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -1619,22 +1622,22 @@ msgstr "密码错误" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id msgid "Initial Category" -msgstr "" +msgstr "初始类别" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_mercury msgid "Integrated Card Payments" -msgstr "" +msgstr "集成卡支付" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Integrated Card Reader" -msgstr "" +msgstr "集成读卡器" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_category_action msgid "Internal Categories" -msgstr "" +msgstr "内部类别" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_note @@ -1678,12 +1681,12 @@ msgstr "开票" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_installed_account_accountant msgid "Is Installed Account Accountant" -msgstr "" +msgstr "为已安装账户会计" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_restaurant msgid "Is a Bar/Restaurant" -msgstr "" +msgstr "为酒吧/餐厅" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id @@ -1731,12 +1734,12 @@ msgstr "最后修改日" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_cash msgid "Last Session Closing Cash" -msgstr "" +msgstr "上次会话关闭支付金额" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_date msgid "Last Session Closing Date" -msgstr "" +msgstr "最近会话关闭日期" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_uid @@ -1774,7 +1777,7 @@ msgstr "行号" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_order_line msgid "Lines of Point of Sale Orders" -msgstr "" +msgstr "销售点订单明细" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_open_statement.py:33 @@ -1833,7 +1836,7 @@ msgstr "忠诚计划" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Loyalty program to use for this point of sale." -msgstr "" +msgstr "用于此销售单的忠诚度方案。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment @@ -1847,13 +1850,13 @@ msgid "" " pricelist to specific customers from their contact form (in Sales tab). To " "be valid, this pricelist must be listed here as an available pricelist. " "Otherwise the default pricelist will apply." -msgstr "" +msgstr "使多个价目表可用于销售点。否则，将应用默认价目表。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "Malibu Drink" -msgstr "" +msgstr "Malibu Drink" #. module: point_of_sale #: model:res.groups,name:point_of_sale.group_pos_manager @@ -1999,7 +2002,7 @@ msgstr "打印数" #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main msgid "Odoo Logo" -msgstr "" +msgstr "Odoo 徽标" #. module: point_of_sale #. openerp-web @@ -2035,7 +2038,7 @@ msgstr "确定" #: code:addons/point_of_sale/static/src/js/screens.js:450 #, python-format msgid "One or more product(s) required serial/lot number." -msgstr "" +msgstr "一个或多个产品需要序号/批号。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_restrict_price_control @@ -2043,7 +2046,7 @@ msgstr "" msgid "" "Only users with Manager access rights for PoS app can modify the product " "prices on orders." -msgstr "" +msgstr "仅具有 PoS 应用的管理器访问权限的用户能够修改订单上的产品价格。" #. module: point_of_sale #. openerp-web @@ -2083,7 +2086,7 @@ msgstr "打开出纳机" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_details_wizard msgid "Open Sales Details Report" -msgstr "" +msgstr "打开销售详细信息报告" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -2130,12 +2133,12 @@ msgstr "作业类型" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Operation type used to record product pickings" -msgstr "" +msgstr "用于记录产品拣配的操作类型" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Operation types show up in the Inventory dashboard." -msgstr "" +msgstr "操作类型显示在库存仪表盘中。" #. module: point_of_sale #. openerp-web @@ -2166,12 +2169,12 @@ msgstr "订单号序列" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Order Interface" -msgstr "" +msgstr "订单界面" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_sequence_line_id msgid "Order Line IDs Sequence" -msgstr "" +msgstr "订单行 ID 序列" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_lines @@ -2205,7 +2208,7 @@ msgstr "订单编号" #: code:addons/point_of_sale/models/pos_order.py:498 #, python-format msgid "Order is not paid." -msgstr "" +msgstr "订单未支付。" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form @@ -2236,7 +2239,7 @@ msgstr "订单分析" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.account_journal_action_point_of_sale msgid "POS Journals" -msgstr "" +msgstr "销售点日记账" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:347 @@ -2273,12 +2276,12 @@ msgstr "POS 销售" #: code:addons/point_of_sale/models/pos_config.py:356 #, python-format msgid "POS order line %s" -msgstr "" +msgstr "销售点订单行 %s" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search msgid "POS orders created during the current year" -msgstr "" +msgstr "当前年度创建的销售点订单" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_line_pos_statement_id @@ -2365,7 +2368,7 @@ msgstr "" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Payment methods available" -msgstr "" +msgstr "可用支付方式" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_statement_ids @@ -2380,12 +2383,12 @@ msgstr "付款" #: code:addons/point_of_sale/static/src/xml/pos.xml:939 #, python-format msgid "Payments:" -msgstr "" +msgstr "支付：" #. module: point_of_sale #: model:ir.filters,name:point_of_sale.filter_orders_per_session msgid "Per session" -msgstr "" +msgstr "按会话" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_order_user_id @@ -2418,7 +2421,7 @@ msgstr "分拣" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_picking_count msgid "Picking Count" -msgstr "" +msgstr "拣配计数" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form @@ -2462,14 +2465,14 @@ msgstr "请选择客户" #: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action #: model:ir.ui.menu,name:point_of_sale.menu_products_pos_category msgid "PoS Categories" -msgstr "" +msgstr "POS类别" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_category #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pos_categ_id #: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view msgid "PoS Category" -msgstr "" +msgstr "销售点类别" #. module: point_of_sale #: model:stock.picking.type,name:point_of_sale.picking_type_posout @@ -2564,18 +2567,18 @@ msgstr "POS类别" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_pos_config_ids msgid "Pos Config" -msgstr "" +msgstr "销售点配置" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_res_partner_pos_order_count #: model:ir.model.fields,field_description:point_of_sale.field_res_users_pos_order_count msgid "Pos Order Count" -msgstr "" +msgstr "销售点订单计数" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_pos_order_line_id msgid "Pos Order Line" -msgstr "" +msgstr "POS单明细" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_duration @@ -2585,23 +2588,23 @@ msgstr "" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_state msgid "Pos Session State" -msgstr "" +msgstr "销售点会话状态" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username msgid "Pos Session Username" -msgstr "" +msgstr "销售点会话用户名" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_posbox #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "PosBox" -msgstr "" +msgstr "POSBox" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "PosBox / Hardware Proxy" -msgstr "" +msgstr "PosBox/硬件代理" #. module: point_of_sale #. openerp-web @@ -2624,7 +2627,7 @@ msgstr "预先填好现金付款" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Prefill amount paid with the exact due amount" -msgstr "" +msgstr "以准确的到期金额预填充已付金额" #. module: point_of_sale #. openerp-web @@ -2638,7 +2641,7 @@ msgstr "价格" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Price Control" -msgstr "" +msgstr "价格控制" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails @@ -2690,12 +2693,12 @@ msgstr "打印收据" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Print invoices on customer request" -msgstr "" +msgstr "根据客户请求打印发票" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Print receipts automatically once the payment registered" -msgstr "" +msgstr "注册" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_via_proxy @@ -2734,7 +2737,7 @@ msgstr "产品种类" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Product Prices" -msgstr "" +msgstr "产品价格" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_tree_view @@ -2771,12 +2774,12 @@ msgstr "产品变体" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Product prices on receipts" -msgstr "" +msgstr "收据上的产品价格" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tipproduct msgid "Product tips" -msgstr "" +msgstr "产品提示" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_template_action_pos_product @@ -2849,14 +2852,14 @@ msgstr "收据参考" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_rescue msgid "Recovery Session" -msgstr "" +msgstr "恢复会话" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1367 #, python-format msgid "Refresh Display" -msgstr "" +msgstr "刷新显示" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_rep @@ -2883,12 +2886,12 @@ msgstr "负责人" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_restrict_price_control msgid "Restrict Price Modifications to Managers" -msgstr "" +msgstr "限制管理器进行价格修改" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Restrict price modification to managers" -msgstr "" +msgstr "限制管理器进行价格修改" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -2955,7 +2958,7 @@ msgstr "保存" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Save this configuration to see and edit the customer display" -msgstr "" +msgstr "保存此配置以查看和编辑客户显示" #. module: point_of_sale #. openerp-web @@ -3039,7 +3042,7 @@ msgstr "选择用户" #: code:addons/point_of_sale/static/src/js/screens.js:2160 #, python-format msgid "Select pricelist" -msgstr "" +msgstr "选择价目表" #. module: point_of_sale #. openerp-web @@ -3133,7 +3136,7 @@ msgstr "设置客户" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_start_category msgid "Set Start Category" -msgstr "" +msgstr "设置开始类别" #. module: point_of_sale #. openerp-web @@ -3145,19 +3148,19 @@ msgstr "设置重量" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Set barcodes to scan products, customer cards, etc." -msgstr "" +msgstr "设置条码以扫描产品、客户卡等" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Set shop-specific prices, seasonal discounts, etc." -msgstr "" +msgstr "设置商店特定价格、季节性折扣等" #. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/pos.web_editor.js:33 #, python-format msgid "Set your customized advertisement here" -msgstr "" +msgstr "在此处设置自定义广告" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban @@ -3167,7 +3170,7 @@ msgstr "设置" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display msgid "Show checkout to customers with a remotely-connected screen." -msgstr "" +msgstr "通过远程连接的屏幕向客户显示结账。" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pricelist_item @@ -3184,7 +3187,7 @@ msgstr "跳过" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_skip_screen msgid "Skip Preview Screen" -msgstr "" +msgstr "跳过预览屏幕" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_image_small @@ -3209,7 +3212,7 @@ msgstr "有些订单不能提交给" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_pack_operation_lot msgid "Specify product lot/serial number in pos order line" -msgstr "" +msgstr "在销售点订单明细中指定产品批号/序号" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_start_date @@ -3219,7 +3222,7 @@ msgstr "开始日期" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Start selling from a default product category" -msgstr "" +msgstr "从默认产品类别开始销售" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_cash_register_balance_start @@ -3258,7 +3261,7 @@ msgstr "库存位置" #. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Stock location used for the inventory" -msgstr "" +msgstr "用于库存的库存位置" #. module: point_of_sale #. openerp-web @@ -3363,7 +3366,7 @@ msgstr "税号" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime msgid "Tax Regime" -msgstr "" +msgstr "税制" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime_selection @@ -3438,7 +3441,7 @@ msgstr "支付方式的公司不同于POS所在公司" #, python-format msgid "" "The company of the sales journal is different than the one of point of sale" -msgstr "" +msgstr "销售日记账所属公司不同于销售点所属公司" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:227 @@ -3451,21 +3454,21 @@ msgstr "库位所属公司不同于POS所属公司" #: code:addons/point_of_sale/models/pos_config.py:247 #, python-format msgid "The default pricelist must be included in the available pricelists." -msgstr "" +msgstr "默认价目表必须包括在可用价目表中。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_proxy_ip msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty." -msgstr "" +msgstr "将自动检测是否留空硬件代理的主机名或 IP 地址" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:237 #, python-format msgid "" "The invoice journal and the point of sale must belong to the same company" -msgstr "" +msgstr "发票日记账和销售点必须属于同一公司" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_config.py:253 @@ -3473,7 +3476,7 @@ msgstr "" msgid "" "The invoice journal must be in the same currency as the Sales Journal or the" " company currency if that is not set." -msgstr "" +msgstr "发票日记账所使用币种在未设置的情况下必须与销售日记账或公司币种一致。" #. module: point_of_sale #: sql_constraint:pos.session:0 @@ -3484,7 +3487,7 @@ msgstr "销售会话名称必须唯一" #: model:ir.model.fields,help:point_of_sale.field_res_partner_pos_order_count #: model:ir.model.fields,help:point_of_sale.field_res_users_pos_order_count msgid "The number of point of sales orders related to this customer" -msgstr "" +msgstr "与此客户相关的销售点订单的数量" #. module: point_of_sale #. openerp-web @@ -3505,7 +3508,7 @@ msgstr "因为未知错误，订单不能发送到服务器" msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount." -msgstr "" +msgstr "该支付输入与银行支付输入类似，将通过准确到期金额预填充。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_order_config_id @@ -3518,7 +3521,7 @@ msgstr "您要使用的物理POS。" msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown." -msgstr "" +msgstr "销售点将默认显示此产品类别。" #. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_pricelist_id diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index cad950c576e..794b590c0a0 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -227,10 +227,14 @@ class PosOrder(models.Model): return InvoiceLine.sudo().create(inv_line) def _create_account_move_line(self, session=None, move=None): - def _flatten_tax_and_children(taxes): + def _flatten_tax_and_children(taxes, group_done=None): children = self.env['account.tax'] - for tax in taxes: - children |= _flatten_tax_and_children(tax.children_tax_ids) + if group_done is None: + group_done = set() + for tax in taxes.filtered(lambda t: t.amount_type == 'group'): + if tax.id not in group_done: + group_done.add(tax.id) + children |= _flatten_tax_and_children(tax.children_tax_ids, group_done) return taxes + children # Tricky, via the workflow, we only have one id in the ids variable diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 295526ad95b..920d703506d 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -729,6 +729,7 @@ exports.PosModel = Backbone.Model.extend({ deferred.resolve(); }; + img.crossOrigin = 'use-credentials'; img.src = url; return deferred; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 4e53d259248..dadd9cffbb8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -1170,8 +1170,9 @@ var ClientListScreenWidget = ScreenWidget.extend({ var order = this.pos.get_order(); if( this.has_client_changed() ){ var default_fiscal_position_id = _.findWhere(this.pos.fiscal_positions, {'id': this.pos.config.default_fiscal_position_id[0]}); - if ( this.new_client ) { - order.fiscal_position = _.findWhere(this.pos.fiscal_positions, {'id': this.new_client.property_account_position_id[0]}); + if ( this.new_client && this.new_client.property_account_position_id ) { + var client_fiscal_position_id = _.findWhere(this.pos.fiscal_positions, {'id': this.new_client.property_account_position_id[0]}); + order.fiscal_position = client_fiscal_position_id || default_fiscal_position_id; order.set_pricelist(_.findWhere(this.pos.pricelists, {'id': this.new_client.property_product_pricelist[0]}) || this.pos.default_pricelist); } else { order.fiscal_position = default_fiscal_position_id; @@ -1277,9 +1278,14 @@ var ClientListScreenWidget = ScreenWidget.extend({ .then(function(partner_id){ self.saved_client_details(partner_id); },function(type,err){ + var error_body = _t('Your Internet connection is probably down.'); + if (err.data) { + var except = err.data; + error_body = except.arguments && except.arguments[0] || except.message || error_body; + } self.gui.show_popup('error',{ 'title': _t('Error: Could not Save Changes'), - 'body': _t('Your Internet connection is probably down.'), + 'body': error_body, }); }); }, diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po index a0e4e1ce9ed..89206db54d0 100644 --- a/addons/portal/i18n/de.po +++ b/addons/portal/i18n/de.po @@ -111,7 +111,7 @@ msgstr "Suche löschen" #: code:addons/portal/static/src/xml/portal_signature.xml:27 #, python-format msgid "Click here to see your document." -msgstr "" +msgstr "Klicken Sie hier, um Ihr Dokument anzuzeigen." #. module: portal #: model:ir.ui.view,arch_db:portal.portal_my_details @@ -164,7 +164,7 @@ msgstr "Erstellt am" #: model:ir.model.fields,help:portal.field_project_task_portal_url #: model:ir.model.fields,help:portal.field_sale_order_portal_url msgid "Customer Portal URL" -msgstr "" +msgstr "Kundenportal-URL" #. module: portal #: model:ir.model.fields,field_description:portal.field_portal_mixin_display_name @@ -195,7 +195,7 @@ msgstr "E-Mail Thread" #: code:addons/portal/wizard/portal_wizard.py:130 #, python-format msgid "Group %s is not a portal" -msgstr "" +msgstr "Gruppe %s ist kein Portal" #. module: portal #: model:ir.model.fields,field_description:portal.field_portal_mixin_id @@ -278,6 +278,8 @@ msgstr "Weiter" #, python-format msgid "Oops! Something went wrong. Try to reload the page and log in." msgstr "" +"Ups! Es ist ein Fehler aufgetreten. Versuchen Sie, die Seite erneut zu laden" +" und sich anzumelden." #. module: portal #: model:ir.ui.view,arch_db:portal.portal_my_details @@ -303,7 +305,7 @@ msgstr "Portal-Zugriffsverwaltung" #: model:ir.model.fields,field_description:portal.field_project_task_portal_url #: model:ir.model.fields,field_description:portal.field_sale_order_portal_url msgid "Portal Access URL" -msgstr "" +msgstr "Portalzugriffs-URL" #. module: portal #: model:ir.model,name:portal.model_portal_wizard_user @@ -320,7 +322,7 @@ msgstr "Vorher" #: code:addons/portal/static/src/js/portal_chatter.js:101 #, python-format msgid "Published on %s" -msgstr "" +msgstr "Am %s veröffentlicht" #. module: portal #: model:ir.ui.view,arch_db:portal.wizard_view @@ -391,7 +393,7 @@ msgstr "Das Portal, dem Benutzer hinzugefügt oder entfernt werden können." #: code:addons/portal/static/src/xml/portal_chatter.xml:11 #, python-format msgid "There are no comments for now." -msgstr "" +msgstr "Momentan sind keine Kommentare vorhanden." #. module: portal #: model:ir.ui.view,arch_db:portal.wizard_view @@ -570,7 +572,7 @@ msgstr "Schreiben Sie eine Nachricht..." #: code:addons/portal/static/src/xml/portal_chatter.xml:21 #, python-format msgid "You must be" -msgstr "" +msgstr "Sie müssen sein" #. module: portal #: code:addons/portal/wizard/portal_wizard.py:182 @@ -584,7 +586,7 @@ msgstr "" #. module: portal #: model:ir.ui.view,arch_db:portal.portal_my_details msgid "Your Contact Details" -msgstr "" +msgstr "Ihre Kontaktdaten" #. module: portal #: model:ir.ui.view,arch_db:portal.portal_layout @@ -595,7 +597,7 @@ msgstr "Ihre Angaben" #. module: portal #: model:ir.ui.view,arch_db:portal.portal_my_home msgid "Your Documents" -msgstr "" +msgstr "Ihre Dokumente" #. module: portal #. openerp-web @@ -641,12 +643,12 @@ msgstr "Kommentare" #: code:addons/portal/static/src/xml/portal_chatter.xml:21 #, python-format msgid "logged in" -msgstr "" +msgstr "Eingeloggt" #. module: portal #: model:ir.model,name:portal.model_portal_mixin msgid "portal.mixin" -msgstr "" +msgstr "portal.mixin" #. module: portal #: model:ir.ui.view,arch_db:portal.portal_my_details diff --git a/addons/portal/static/src/js/portal_chatter.js b/addons/portal/static/src/js/portal_chatter.js index c91771174c1..66414d70b5d 100644 --- a/addons/portal/static/src/js/portal_chatter.js +++ b/addons/portal/static/src/js/portal_chatter.js @@ -52,7 +52,8 @@ var PortalChatter = Widget.extend({ params: this._messageFetchPrepareParams() }), this._loadTemplates() ).then(function(result){ - self.result = result + self.result = result; + self.options = _.extend(self.options, self.result['options'] || {}); return result; }); }, @@ -69,7 +70,6 @@ var PortalChatter = Widget.extend({ this.on("change:pager", this, this._renderPager); this.on("change:domain", this, this._onChangeDomain); // set options and parameters - this.options = _.extend(this.options, this.result['options'] || {}); this.set('message_count', this.options['message_count']); this.set('messages', this.preprocessMessages(this.result['messages'])); return this._super.apply(this, arguments); diff --git a/addons/pos_cache/i18n/de.po b/addons/pos_cache/i18n/de.po index b30542897df..9bacc83c478 100644 --- a/addons/pos_cache/i18n/de.po +++ b/addons/pos_cache/i18n/de.po @@ -5,19 +5,20 @@ # Translators: # Henry Mineehen , 2017 # Tina Rittmüller , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # Thorsten Vocks , 2017 -# Niki Waibel , 2017 -# Dejan Dinic , 2017 +# Niki Waibel, 2017 +# Dejan Dinic, 2017 # darenkster , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-13 14:37+0000\n" "PO-Revision-Date: 2017-12-13 14:37+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +92,7 @@ msgstr "Ladevorgang" #. module: pos_cache #: model:ir.model.fields,field_description:pos_cache.field_pos_config_oldest_cache_time msgid "Oldest cache time" -msgstr "" +msgstr "Älteste Cachezeit" #. module: pos_cache #: model:ir.actions.server,name:pos_cache.refresh_pos_cache_cron_ir_actions_server diff --git a/addons/pos_data_drinks/i18n/es.po b/addons/pos_data_drinks/i18n/es.po index d3a7bb958af..696f6c8c8a9 100644 --- a/addons/pos_data_drinks/i18n/es.po +++ b/addons/pos_data_drinks/i18n/es.po @@ -4,15 +4,16 @@ # # Translators: # Eduardo Magdalena , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Pierre-Antoine Magnet , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:53+0000\n" "PO-Revision-Date: 2017-09-20 09:53+0000\n" -"Last-Translator: Pierre-Antoine Magnet , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +182,7 @@ msgstr "Té helado" #. module: pos_data_drinks #: model:pos.category,name:pos_data_drinks.alcohol msgid "Import Drinks" -msgstr "" +msgstr "Bebidas de importación" #. module: pos_data_drinks #: model:product.product,name:pos_data_drinks.irish_coffee @@ -231,31 +232,31 @@ msgstr "Martini" #: model:product.product,name:pos_data_drinks.milkshake_banana #: model:product.template,name:pos_data_drinks.milkshake_banana_product_template msgid "Milkshake Banana" -msgstr "" +msgstr "Batido de plátano" #. module: pos_data_drinks #: model:product.product,name:pos_data_drinks.milkshake_cherry #: model:product.template,name:pos_data_drinks.milkshake_cherry_product_template msgid "Milkshake Cherry" -msgstr "" +msgstr "Batido de cereza" #. module: pos_data_drinks #: model:product.product,name:pos_data_drinks.milkshake_chocolate #: model:product.template,name:pos_data_drinks.milkshake_chocolate_product_template msgid "Milkshake Chocolate" -msgstr "" +msgstr "Batido de chocolate" #. module: pos_data_drinks #: model:product.product,name:pos_data_drinks.milkshake_strawberry #: model:product.template,name:pos_data_drinks.milkshake_strawberry_product_template msgid "Milkshake Strawberry" -msgstr "" +msgstr "Batido de fresa" #. module: pos_data_drinks #: model:product.product,name:pos_data_drinks.milkshake_vanilla #: model:product.template,name:pos_data_drinks.milkshake_vanilla_product_template msgid "Milkshake Vanilla" -msgstr "" +msgstr "Batido de vainilla" #. module: pos_data_drinks #: model:pos.category,name:pos_data_drinks.milkshake diff --git a/addons/pos_discount/i18n/de.po b/addons/pos_discount/i18n/de.po index ef391ab5154..e621c4ff118 100644 --- a/addons/pos_discount/i18n/de.po +++ b/addons/pos_discount/i18n/de.po @@ -3,16 +3,17 @@ # * pos_discount # # Translators: -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Ermin Trevisan , 2017 # Fabian Liesch , 2017 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:52+0000\n" "PO-Revision-Date: 2017-09-20 09:52+0000\n" -"Last-Translator: Fabian Liesch , 2017\n" +"Last-Translator: e2f , 2018\n" "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,10 +38,13 @@ msgstr "Rabatt" #. module: pos_discount #: model:ir.ui.view,arch_db:pos_discount.pos_config_view_form_inherit_pos_discount msgid "Discount %" -msgstr "" +msgstr "Rabatt %" #. module: pos_discount +#. openerp-web +#: code:addons/pos_discount/static/src/js/discount.js:14 #: model:ir.model.fields,field_description:pos_discount.field_pos_config_discount_pc +#, python-format msgid "Discount Percentage" msgstr "% Rabatt" @@ -58,7 +62,7 @@ msgstr "Bestellrabatte" #. module: pos_discount #: model:ir.model.fields,help:pos_discount.field_pos_config_discount_pc msgid "The default discount percentage" -msgstr "" +msgstr "Der Standard-Rabattprozentsatz" #. module: pos_discount #: model:ir.model.fields,help:pos_discount.field_pos_config_discount_product_id diff --git a/addons/pos_discount/i18n/es.po b/addons/pos_discount/i18n/es.po index 19581ff2cb2..eb07d433359 100644 --- a/addons/pos_discount/i18n/es.po +++ b/addons/pos_discount/i18n/es.po @@ -3,16 +3,17 @@ # * pos_discount # # Translators: -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Carlos rodriguez , 2016 # Ana Juaristi , 2016 +# e2f , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:52+0000\n" "PO-Revision-Date: 2017-09-20 09:52+0000\n" -"Last-Translator: Ana Juaristi , 2016\n" +"Last-Translator: e2f , 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "Descuento" #. module: pos_discount #: model:ir.ui.view,arch_db:pos_discount.pos_config_view_form_inherit_pos_discount msgid "Discount %" -msgstr "" +msgstr "Descuento %" #. module: pos_discount #. openerp-web diff --git a/addons/pos_mercury/i18n/de.po b/addons/pos_mercury/i18n/de.po index 2a26c90adc8..c8f20102c3b 100644 --- a/addons/pos_mercury/i18n/de.po +++ b/addons/pos_mercury/i18n/de.po @@ -71,7 +71,7 @@ msgstr "" #: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:46 #, python-format msgid "ABOVE AMOUNT PURSUANT" -msgstr "" +msgstr "ÜBER BETRAG GEMÄẞ" #. module: pos_mercury #. openerp-web @@ -103,7 +103,7 @@ msgstr "Kontoauszugszeile" #: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:45 #, python-format msgid "CARDHOLDER WILL PAY CARD ISSUER" -msgstr "" +msgstr "KARTENINHABER BEZAHLT KARTENAUSSTELLER" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_account_bank_statement_line_mercury_card_brand @@ -132,12 +132,12 @@ msgstr "Kartenlesegerät" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:190 #, python-format msgid "Clear Text Request Not Supported" -msgstr "" +msgstr "Klartextanfrage wird nicht unterstützt" #. module: pos_mercury #: model:ir.actions.act_window,help:pos_mercury.action_configuration_form msgid "Click to configure your card reader." -msgstr "" +msgstr "Klicken, um Ihren Kartenleser zu konfigurieren." #. module: pos_mercury #. openerp-web @@ -159,13 +159,15 @@ msgstr "Verbindung verloren" #, python-format msgid "Control failed to find branded serial (password lookup failed)" msgstr "" +"Die Kontrolle konnte keine branded serial finden (Nachschlagen des " +"Passwortes fehlgeschlagen)" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:196 #, python-format msgid "Could Not Encrypt Response- Call Provider" -msgstr "" +msgstr "Antwort-Anbieter konnte nicht verschlüsselt werden" #. module: pos_mercury #. openerp-web @@ -238,14 +240,14 @@ msgstr "Fehler" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:192 #, python-format msgid "Error Occurred While Decrypting Request" -msgstr "" +msgstr "Fehler beim Entschlüsseln der Anfrage aufgetreten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:182 #, python-format msgid "Failed to start Event Thread." -msgstr "" +msgstr "Ereignis-Thread konnte nicht gestartet werden" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form @@ -254,6 +256,8 @@ msgid "" " (without having pressed anything else) will charge the full amount of the order to\n" " the card." msgstr "" +"Für die schnelle Bearbeitung von Aufträgen: einfach eine Kreditkarte über den Zahlungsbildschirm\n" +" ziehen (ohne etwas anderes gedrückt zu haben)" #. module: pos_mercury #. openerp-web @@ -274,28 +278,28 @@ msgstr "Globale API nicht initialisiert" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:186 #, python-format msgid "Global Response Length Error (Too Short)" -msgstr "" +msgstr "Gesamt-Antwortlängenfehler (zu kurz)" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:188 #, python-format msgid "Global String Error" -msgstr "" +msgstr "Gesamt-Zeichenfolgefehler" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:256 #, python-format msgid "Go to payment screen to use cards" -msgstr "" +msgstr "Zum Zahlungsbildschirm, um die Karten zu verwenden" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:387 #, python-format msgid "Handling transaction..." -msgstr "" +msgstr "Transaktion wird abgewickelt …" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration_id @@ -307,6 +311,7 @@ msgstr "ID" #: model:ir.model.fields,help:pos_mercury.field_pos_mercury_configuration_merchant_id msgid "ID of the merchant to authenticate him on the payment provider server" msgstr "" +"Händler-ID, um ihn auf dem Zahlungsanbieter-Server zu authentifizieren" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form @@ -314,27 +319,29 @@ msgid "" "If you don't already have a Mercury account, contact Mercury at +1 (800) 846-4472\n" " to create one." msgstr "" +"Wenn Sie noch kein Mercury-Konto haben, kontaktieren Sie Mercury über +1 (800) 846-4472\n" +", um eins zu erstellen." #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:178 #, python-format msgid "In Process with server" -msgstr "" +msgstr "In Bearbeitung mit dem Server" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:159 #, python-format msgid "Initialize Failed" -msgstr "" +msgstr "Initialisieren fehlgeschlagen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:166 #, python-format msgid "Insufficient Fields" -msgstr "" +msgstr "Ungültige Felder" #. module: pos_mercury #. openerp-web @@ -355,7 +362,7 @@ msgstr "Ungültige Kontonummer" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:204 #, python-format msgid "Invalid Authorization Amount" -msgstr "" +msgstr "Ungültiger Autorisierungsbetrag" #. module: pos_mercury #. openerp-web @@ -370,14 +377,14 @@ msgstr "Ungültiger Berechtigungscode" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:219 #, python-format msgid "Invalid Batch Item Count" -msgstr "" +msgstr "Ungültige Anzahl an Batchelementen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:218 #, python-format msgid "Invalid Batch Number" -msgstr "" +msgstr "Ungültige Batchnummer" #. module: pos_mercury #. openerp-web @@ -391,28 +398,28 @@ msgstr "Ungültiger Kartentyp" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:205 #, python-format msgid "Invalid Cash Back Amount" -msgstr "" +msgstr "Ungültiger Cashback-Betrag" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:193 #, python-format msgid "Invalid Check Digit" -msgstr "" +msgstr "Ungültige Prüfziffer" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:213 #, python-format msgid "Invalid Check Type" -msgstr "" +msgstr "Ungültiger Checktyp" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:165 #, python-format msgid "Invalid Command Format" -msgstr "" +msgstr "Ungültiges Befehlsformat" #. module: pos_mercury #. openerp-web @@ -426,7 +433,7 @@ msgstr "Ungültiger Geburtstag" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:210 #, python-format msgid "Invalid Derived Key Data" -msgstr "" +msgstr "Ungültige abgeleitete Schlüsseldaten" #. module: pos_mercury #. openerp-web @@ -447,28 +454,28 @@ msgstr "Ungültiges Ablaufdatum" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:206 #, python-format msgid "Invalid Gratuity Amount" -msgstr "" +msgstr "Ungültiger Vergütungsbetrag" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:220 #, python-format msgid "Invalid MICR Input Type" -msgstr "" +msgstr "Ungültiger MICR-Eingangs-Typ" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:208 #, python-format msgid "Invalid Magnetic Stripe Data" -msgstr "" +msgstr "Ungültige Magnetstreifendaten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:199 #, python-format msgid "Invalid Memo" -msgstr "" +msgstr "Ungültiges Memo" #. module: pos_mercury #. openerp-web @@ -482,75 +489,75 @@ msgstr "Ungültige Händler-ID" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:198 #, python-format msgid "Invalid Operator ID" -msgstr "" +msgstr "Ungültige Operator-ID" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:209 #, python-format msgid "Invalid PIN Block Data" -msgstr "" +msgstr "Ungültige PIN-Blockdaten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:223 #, python-format msgid "Invalid Pass Data" -msgstr "" +msgstr "Ungültige Passdaten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:207 #, python-format msgid "Invalid Purchase Amount" -msgstr "" +msgstr "Ungültiger Kaufbetrag" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:214 #, python-format msgid "Invalid Routing Number" -msgstr "" +msgstr "Ungültige Bankleitzahl" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:222 #, python-format msgid "Invalid Sequence Number" -msgstr "" +msgstr "Ungültige Sequenznummer" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:211 #, python-format msgid "Invalid State Code" -msgstr "" +msgstr "Ungültiger Bundeslandcode" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:217 #, python-format msgid "Invalid TStream Type" -msgstr "" +msgstr "Ungültiger TStream-Typ" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:215 #, python-format msgid "Invalid TranCode" -msgstr "" +msgstr "Ungültiger TranCode" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:197 #, python-format msgid "Invalid Transaction Type" -msgstr "" +msgstr "Ungültiger Transaktionstyp" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_invoice_no msgid "Invoice number from Mercury Pay" -msgstr "" +msgstr "Rechnungsnummer von Mercury Pay" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_account_journal @@ -578,7 +585,7 @@ msgstr "Zuletzt aktualisiert am" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.mercury_transaction msgid "MagneSafe" -msgstr "" +msgstr "MagneSafe" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration_merchant_id @@ -590,38 +597,38 @@ msgstr "Händler-ID" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:194 #, python-format msgid "Merchant ID Missing" -msgstr "" +msgstr "Händler-ID fehlt" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration_merchant_pwd msgid "Merchant Password" -msgstr "" +msgstr "Händlerpasswort" #. module: pos_mercury #: model:ir.actions.act_window,name:pos_mercury.action_configuration_form #: model:ir.ui.menu,name:pos_mercury.menu_pos_pos_mercury_config msgid "Mercury Configurations" -msgstr "" +msgstr "Mercury-Konfigurationen" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_account_journal_pos_mercury_config_id msgid "Mercury Credentials" -msgstr "" +msgstr "Mercury-Anmeldedaten" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_account_bank_statement_line_mercury_invoice_no msgid "Mercury invoice number" -msgstr "" +msgstr "Mercury-Rechnungsnummer" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_account_bank_statement_line_mercury_record_no msgid "Mercury record number" -msgstr "" +msgstr "Mercury-Datensatznummer" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_account_bank_statement_line_mercury_ref_no msgid "Mercury reference number" -msgstr "" +msgstr "Mercury-Referenznummer" #. module: pos_mercury #: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration_name @@ -631,33 +638,33 @@ msgstr "Name" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_pos_mercury_configuration_name msgid "Name of this Mercury configuration" -msgstr "" +msgstr "Name dieser Mercury-Konfiguration" #. module: pos_mercury #: code:addons/pos_mercury/models/pos_mercury_transaction.py:33 #, python-format msgid "No Mercury configuration associated with the journal." -msgstr "" +msgstr "Keine Mercury-Konfiguration, die mit dem Journal verknüpft ist." #. module: pos_mercury #: code:addons/pos_mercury/models/pos_mercury_transaction.py:21 #, python-format msgid "No opened point of sale session for user %s found" -msgstr "" +msgstr "Keine offene Point-of-Sale-Sitzung für Benutzer %s gefunden" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:328 #, python-format msgid "No response from Mercury (Mercury down?)" -msgstr "" +msgstr "Keine Antwort von Mercury (Mercury außer Betrieb?)" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:330 #, python-format msgid "No response from server (connected to network?)" -msgstr "" +msgstr "Keine Antwort vom Server (mit dem Netzwerk verbunden?)" #. module: pos_mercury #. openerp-web @@ -665,40 +672,40 @@ msgstr "" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:567 #, python-format msgid "Odoo error while processing transaction." -msgstr "" +msgstr "Odoo-Fehler bei der Transaktionsabwicklung." #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:642 #, python-format msgid "One credit card swipe already pending." -msgstr "" +msgstr "Ein Kreditkartenleser ausstehend." #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.mercury_common msgid "OneTime" -msgstr "" +msgstr "OneTime" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:460 #, python-format msgid "Partially approved" -msgstr "" +msgstr "Teilweise genehmigt" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:175 #, python-format msgid "Password Failed (Client / Server)" -msgstr "" +msgstr "Passwort fehlgeschlagen (Kunde / Server)" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:170 #, python-format msgid "Password Failed – Disconnecting" -msgstr "" +msgstr "Passwort fehlgeschlagen – Trennen" #. module: pos_mercury #. openerp-web @@ -712,30 +719,31 @@ msgstr "Passwort verifiziert" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:176 #, python-format msgid "Password failed (Challenge / Response)" -msgstr "" +msgstr "Passwort fehlgeschlagen (Zielvereinbarung / Antwort)" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_pos_mercury_configuration_merchant_pwd msgid "" "Password of the merchant to authenticate him on the payment provider server" msgstr "" +"Händlerpasswort, um ihn auf dem Zahlungsanbieter-Server zu authentifizieren" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_record_no msgid "Payment record number from Mercury Pay" -msgstr "" +msgstr "Zahlungsdatensatznummer von Mercury-Pay" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_ref_no msgid "Payment reference number from Mercury Pay" -msgstr "" +msgstr "Zahlungs-Referenznummer von Mercury Pay" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:407 #, python-format msgid "Please setup your Mercury merchant account." -msgstr "" +msgstr "Bitte richten Sie Ihr Mercury-Händlerkonto ein." #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_pos_order @@ -747,133 +755,133 @@ msgstr "Point Of Sale Verkäufe" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:169 #, python-format msgid "Queue Full" -msgstr "" +msgstr "Warteschlange voll" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.mercury_transaction msgid "RecordNumberRequested" -msgstr "" +msgstr "RecordNumberRequested" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:173 #, python-format msgid "Refused ‘Max Connections’" -msgstr "" +msgstr "Abgelehnte „Max Connections“" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:539 #, python-format msgid "Reversal failed, sending VoidSale..." -msgstr "" +msgstr "Storno fehlgeschlagen, VoidSale wird gesendet …" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:581 #, python-format msgid "Reversal succeeded" -msgstr "" +msgstr "Storno erfolgreich" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:542 #, python-format msgid "Sending reversal..." -msgstr "" +msgstr "Storno wird gesendet …" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:185 #, python-format msgid "Server Login Failed" -msgstr "" +msgstr "Server-Login fehlgeschlagen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:154 #, python-format msgid "Socket Connection Failed" -msgstr "" +msgstr "Socket-Verbindung fehlgeschlagen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:153 #, python-format msgid "Socket Creation Failed" -msgstr "" +msgstr "Socket-Erstellung fehlgeschlagen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:151 #, python-format msgid "Socket Error sending request" -msgstr "" +msgstr "Socket-Fehler beim Senden der Anfrage" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:152 #, python-format msgid "Socket already open or in use" -msgstr "" +msgstr "Socket bereits geöffnet oder schon aktiv" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.mercury_transaction msgid "Swiped" -msgstr "" +msgstr "Eingelesen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:171 #, python-format msgid "System Going Offline" -msgstr "" +msgstr "System geht offline" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:156 #, python-format msgid "TCP/IP Failed to Initialize" -msgstr "" +msgstr "Initialisierung von TCP/IP fehlgeschlagen" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:47 #, python-format msgid "TO CARDHOLDER AGREEMENT" -msgstr "" +msgstr "FÜR KREDITKARTENVERTRAG" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:195 #, python-format msgid "TStream Type Missing" -msgstr "" +msgstr "TStream-Typ fehlt" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_card_brand msgid "The brand of the payment card (e.g. Visa, AMEX, ...)" -msgstr "" +msgstr "Die Marke der Zahlungskarte (z.B. Visa, AMEX …)" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_prefixed_card_number msgid "The card number used for the payment." -msgstr "" +msgstr "Die für die Zahlung verwendete Kartennummer" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_journal_pos_mercury_config_id msgid "The configuration of Mercury used for this journal" -msgstr "" +msgstr "Die Konfiguration von Mercury, die für dieses Journal verwendet wird" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_card_number msgid "The last 4 numbers of the card used to pay" -msgstr "" +msgstr "Die letzten 4 Ziffern der für die Bezahlung verwendeten Karte" #. module: pos_mercury #: model:ir.model.fields,help:pos_mercury.field_account_bank_statement_line_mercury_card_owner_name msgid "The name of the card owner" -msgstr "" +msgstr "Der Name des Karteninhabers" #. module: pos_mercury #. openerp-web @@ -883,34 +891,37 @@ msgid "" "This can be caused by a badly executed swipe or by not having your keyboard " "layout set to US QWERTY (not US International)." msgstr "" +"Dies kann durch schlecht ausgeführtes Einlesen oder dadurch verursacht " +"werden, dass Sie Ihr Tastatur-Layout nicht auf US QWERTY eingestellt haben " +"(nicht US-international)." #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:181 #, python-format msgid "Threaded Auth Started Expect Response" -msgstr "" +msgstr "Gruppierte Authorisierung hat Rückantworten gestartet" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:157 #, python-format msgid "Time Out waiting for server response" -msgstr "" +msgstr "Timeout, auf Server-Antwort warten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:163 #, python-format msgid "Timeout error" -msgstr "" +msgstr "Timeout-Fehler" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:150 #, python-format msgid "Timeout on Response" -msgstr "" +msgstr "Timeout bei der Antwort" #. module: pos_mercury #. openerp-web @@ -925,6 +936,7 @@ msgstr "Transaktion freigegeben" #, python-format msgid "Unable to Parse Response from Global (Indistinguishable)" msgstr "" +"Das Parsen der Antwort von Global ist nicht möglich (nicht differenzierbar)" #. module: pos_mercury #. openerp-web @@ -938,7 +950,7 @@ msgstr "Unbekannter Fehler" #: code:addons/pos_mercury/static/src/js/pos_mercury.js:191 #, python-format msgid "Unrecognized Request Format" -msgstr "" +msgstr "Unbekanntes Antragsformat" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form @@ -948,25 +960,29 @@ msgid "" " just like on any other payment line. Whenever the payment line is set up, a card\n" " can be swiped through the card reader device." msgstr "" +"Die Mercury-Integration im Point-of-Sale zu verwenden, ist einfach: Drücken Sie einfach die\n" +" damit verbundene Zahlungsmethode. Danach kann der Betrag angepasst werden (z. B. für Cashback)\n" +" wie auf jeder anderen Buchungszeile. Immer, wenn die Buchungszeile erstellt wurde, kann eine Karte\n" +" durch das Kartenlesegerät gezogen werden." #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury msgid "Vantiv Accounts" -msgstr "" +msgstr "Vantiv-Konten" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:589 #, python-format msgid "VoidSale succeeded" -msgstr "" +msgstr "VoidSale erfolgreich" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:17 #, python-format msgid "WAITING FOR SWIPE" -msgstr "" +msgstr "AUF EINLESEN WARTEN" #. module: pos_mercury #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form @@ -974,20 +990,22 @@ msgid "" "We currently support the MagTek Dynamag card reader device. It can be connected\n" " directly to the Point Of Sale device or it can be connected to the POSBox." msgstr "" +"Derzeit unterstützen wir das MagTek Dynamag-Kartenlesegerät. Es kann direkt mit\n" +" dem Point-of-Sale-Gerät oder mit der PoSBox verbunden werden." #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:189 #, python-format msgid "Weak Encryption Request Not Supported" -msgstr "" +msgstr "Schwache Verschlüsselungsanfrage wird nicht unterstützt" #. module: pos_mercury #. openerp-web #: code:addons/pos_mercury/static/src/js/pos_mercury.js:183 #, python-format msgid "XML Parse Error" -msgstr "" +msgstr "XML-Parsefehler" #. module: pos_mercury #. openerp-web @@ -1009,7 +1027,7 @@ msgstr "ir.autovacuum" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_pos_mercury_configuration msgid "pos_mercury.configuration" -msgstr "" +msgstr "pos_mercury.configuration" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_pos_mercury_mercury_transaction diff --git a/addons/pos_mercury/views/pos_mercury_transaction_templates.xml b/addons/pos_mercury/views/pos_mercury_transaction_templates.xml index 0ac0f8edb75..3573672acb4 100644 --- a/addons/pos_mercury/views/pos_mercury_transaction_templates.xml +++ b/addons/pos_mercury/views/pos_mercury_transaction_templates.xml @@ -6,11 +6,11 @@ - OneTime + OneTime