pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-11.1 up to e750bb6e11

Browse Source
This commit is contained in:
Christophe Simonis
2018-02-22 10:39:15 +01:00
parent 898cd0a5c1 e750bb6e11
commit 9a84ba5533
207 changed files with 5260 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/zh_CN.po
+14 -6
View File
@@ -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
addons/account/report/account_aged_partner_balance.py
+7 -7
View File
@@ -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()
addons/base_automation/i18n/de.po
+14 -7
View File
@@ -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
addons/base_gengo/i18n/de.po
+10 -9
View File
@@ -3,22 +3,23 @@
# * base_gengo
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Martin Trigaux, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Martin K <martinkuenz@gmail.com>, 2017
# Henry Mineehen <info@mineehen.de>, 2017
# Anja Funk <anja.funk@afimage.de>, 2017
# Ermin Trevisan <trevi@twanda.com>, 2017
# Ralf Hilgenstock <rh@dialoge.info>, 2017
# Niki Waibel <niki.waibel@gmail.com>, 2017
# Niki Waibel, 2017
# Anja Funk <anja.funk@afimage.de>, 2017
# e2f <projects@e2f.com>, 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 <niki.waibel@gmail.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/base_gengo/wizard/base_gengo_translations.py
+2 -2
View File
@@ -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
addons/base_import/i18n/de.po
+12 -11
View File
@@ -4,22 +4,23 @@
#
# Translators:
# darenkster <inactive+darenkster@transifex.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Thomas Neu <t.neu@runbox.com>, 2017
# Ermin Trevisan <trevi@twanda.com>, 2017
# Henry Mineehen <info@mineehen.de>, 2017
# Rudolf Schnapka <rs@techno-flex.de>, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Niki Waibel <niki.waibel@gmail.com>, 2017
# Renzo Meister <info@jamotion.ch>, 2017
# Andi <flimflam@salasar.de>, 2017
# Niki Waibel, 2017
# Renzo Meister, 2017
# Andi, 2017
# e2f <projects@e2f.com>, 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 <flimflam@salasar.de>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/base_import_module/i18n/de.po
+11 -10
View File
@@ -3,23 +3,24 @@
# * base_import_module
#
# Translators:
# Niki Waibel <niki.waibel@gmail.com>, 2017
# Niki Waibel, 2017
# Ralf Hilgenstock <rh@dialoge.info>, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Anja Funk <anja.funk@afimage.de>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Martin Trigaux, 2017
# Wolfgang Taferner, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Henry Mineehen <info@mineehen.de>, 2017
# Ermin Trevisan <trevi@twanda.com>, 2017
# Renzo Meister <info@jamotion.ch>, 2017
# Renzo Meister, 2017
# e2f <projects@e2f.com>, 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 <info@jamotion.ch>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/base_setup/i18n/de.po
+33 -26
View File
@@ -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
addons/base_sparse_field/i18n/de.po
+9 -8
View File
@@ -3,20 +3,21 @@
# * base_sparse_field
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Niki Waibel <niki.waibel@gmail.com>, 2017
# Niki Waibel, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Henry Mineehen <info@mineehen.de>, 2017
# Renzo Meister <info@jamotion.ch>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Renzo Meister, 2017
# Wolfgang Taferner, 2017
# e2f <projects@e2f.com>, 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 <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
addons/base_vat/i18n/de.po
+9 -4
View File
@@ -3,17 +3,18 @@
# * base_vat
#
# Translators:
# Anja Funk <anja.funk@afimage.de>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Andi <flimflam@salasar.de>, 2017
# Andi, 2017
# Anja Funk <anja.funk@afimage.de>, 2017
# e2f <projects@e2f.com>, 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 <flimflam@salasar.de>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/board/i18n/de.po
+4 -3
View File
@@ -4,18 +4,19 @@
#
# Translators:
# Ermin Trevisan <trevi@twanda.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Anja Funk <anja.funk@afimage.de>, 2017
# Henry Mineehen <info@mineehen.de>, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# e2f <projects@e2f.com>, 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 <tr@ife.de>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/bus/static/src/js/bus.js
+2 -1
View File
@@ -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();
addons/calendar/i18n/zh_CN.po
+2 -2
View File
@@ -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
addons/crm/i18n/zh_CN.po
+1 -1
View File
@@ -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
addons/crm/security/crm_security.xml
-10
View File
@@ -34,16 +34,6 @@
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="crm_rule_lead_assigned_activities" model="ir.rule">
<field name="name">Leads with assigned activities</field>
<field ref="model_crm_lead" name="model_id"/>
<field name="domain_force">[('activity_ids.user_id','=',user.id)]</field>
<field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
</record>
<record id="crm_rule_all_lead" model="ir.rule">
<field name="name">All Leads</field>
<field ref="model_crm_lead" name="model_id"/>
addons/event/i18n/zh_CN.po
+14 -12
View File
@@ -502,7 +502,7 @@ msgstr "<p/><p/><p/><p/><p/>"
#. 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
addons/fetchmail/i18n/zh_CN.po
+3 -2
View File
@@ -6,13 +6,14 @@
# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
# liAnGjiA <liangjia@qq.com>, 2017
# 老窦 北京 <2662059195@qq.com>, 2018
# e2f <projects@e2f.com>, 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 <projects@e2f.com>, 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
addons/gamification_sale_crm/i18n/es.po
+5 -4
View File
@@ -3,16 +3,17 @@
# * gamification_sale_crm
#
# Translators:
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
# Martin Trigaux, 2016
# Christopher Ormaza <chris.ormaza@gmail.com>, 2017
# JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.com>, 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 <chris.ormaza@gmail.com>, 2017\n"
"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.com>, 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
addons/hr_expense/models/hr_expense.py
+1 -1
View File
@@ -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
addons/hr_expense/views/hr_expense_views.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<field name="reference"/>
<field name="date"/>
<field name="account_id" domain="[('internal_type', '=', 'other')]" groups="account.group_account_user"/>
<field name="employee_id"/>
<field name="employee_id" groups="hr_expense.group_hr_expense_user"/>
<field name="sheet_id" invisible="1"/>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
addons/hr_holidays/models/hr.py
+7 -2
View File
@@ -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
addons/hr_holidays/models/hr_leave.py
+1
View File
@@ -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')
addons/hr_payroll_account/models/hr_payroll_account.py
-1
View File
@@ -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))
addons/hr_recruitment/i18n/fr.po
+33 -12
View File
@@ -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
addons/hr_recruitment/i18n/zh_CN.po
+32 -25
View File
@@ -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
addons/iap/i18n/fr.po
+4 -3
View File
@@ -3,17 +3,18 @@
# * iap
#
# Translators:
# Florian Hatat, 2017
# Eloïse Stilmant <est@odoo.com>, 2017
# Bertrand LATOUR <divoir@gmail.com>, 2017
# Fabien Pinckaers <fp@openerp.com>, 2017
# Florian Hatat <mininet@wanadoo.fr>, 2017
# fr trans <e2ffr01@hotmail.com>, 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 <mininet@wanadoo.fr>, 2017\n"
"Last-Translator: fr trans <e2ffr01@hotmail.com>, 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
addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
-2
View File
@@ -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"/>
<field name="company_id" ref="base.main_company"/>
addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+3 -3
View File
@@ -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
addons/lunch/i18n/es.po
+15 -12
View File
@@ -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
addons/mail/i18n/es.po
+20 -16
View File
@@ -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 <b>%s</b>."
#: 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
addons/mail/i18n/zh_CN.po
+51 -39
View File
@@ -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 "你不再订阅<b>%s</b>。"
#: 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
addons/mail/models/ir_model.py
+1 -1
View File
@@ -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
addons/mail/models/mail_channel.py
+10 -2
View File
@@ -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'] = '<mailto:%s@%s>' % (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 = _('<div class="o_mail_notification">joined <a href="#" class="o_channel_redirect" data-oe-id="%s">#%s</a></div>') % (self.id, self.name,)
if partner.id != self.env.user.partner_id.id:
notification = _('<div class="o_mail_notification">%(author)s invited %(new_partner)s to <a href="#" class="o_channel_redirect" data-oe-id="%(channel_id)s">#%(channel_name)s</a></div>') % {
'author': self.env.user.display_name,
'new_partner': partner.display_name,
'channel_id': channel.id,
'channel_name': channel.name,
}
else:
notification = _('<div class="o_mail_notification">joined <a href="#" class="o_channel_redirect" data-oe-id="%s">#%s</a></div>') % (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
addons/mail/models/mail_message.py
+1 -1
View File
@@ -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):
addons/mail/static/src/js/thread.js
+4
View File
@@ -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();
addons/mail/static/src/js/utils.js
+2 -2
View File
@@ -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 '<a ' + attrs + ' href="' + href + '">' + url + '</a>';
});
}
addons/mail/static/tests/mail_utils_tests.js
+34
View File
@@ -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('<a '), 0, "There should be a link");
} else {
assert.strictEqual(output.indexOf('<a '), -1, "There should be no link");
}
});
});
});
});
addons/mail/views/mail_templates.xml
+1
View File
@@ -44,6 +44,7 @@
<xpath expr="//t[@t-set='head']" position="inside">
<script type="text/javascript" src="/mail/static/tests/chat_window_tests.js"></script>
<script type="text/javascript" src="/mail/static/tests/chatter_tests.js"></script>
<script type="text/javascript" src="/mail/static/tests/mail_utils_tests.js"></script>
<script type="text/javascript" src="/mail/static/tests/discuss_tests.js"></script>
<script type="text/javascript" src="/mail/static/tests/systray_tests.js"></script>
<script type="text/javascript" src="/mail/static/tests/helpers/mock_server.js"></script>
addons/maintenance/i18n/es.po
+20 -14
View File
@@ -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
addons/mass_mailing/i18n/es.po
+17 -9
View File
@@ -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
addons/mrp/i18n/es.po
+13 -10
View File
@@ -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
addons/mrp/models/mrp_bom.py
+5
View File
@@ -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]
addons/pad/i18n/es.po
+5 -4
View File
@@ -4,18 +4,19 @@
#
# Translators:
# oihane <oihanecruce@gmail.com>, 2016
# Martin Trigaux <mat@odoo.com>, 2016
# Martin Trigaux, 2016
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
# Carles Antoli <carlesantoli@hotmail.com>, 2016
# Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
# Antonio Trueba <atgayol@gmail.com>, 2017
# Antonio Trueba, 2017
# e2f <projects@e2f.com>, 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 <atgayol@gmail.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment/controllers/portal.py
+80 -19
View File
@@ -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/<string:reference>/<string:amount>/<string:currency_id>',], 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/<string:reference>/<float:amount>/<int:currency_id>'], 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':
addons/payment/i18n/es.po
+7 -5
View File
@@ -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
addons/payment/static/src/js/payment_transaction_portal.js
+2 -24
View File
@@ -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('<i class="fa fa-refresh fa-spin"></i> ');
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
addons/payment/views/payment_portal_templates.xml
+15 -25
View File
@@ -46,32 +46,22 @@
<div class="wrap">
<div class="container o_website_payment">
<h1>Payment</h1>
<div class="row">
<div class="col-md-6">
<div class="oe_structure"></div>
<div>
<div class="form-horizontal row o_website_payment_new_payment" t-att-data-acquirer_id="acquirer.id" t-att-data-currency_id="currency.id" t-att-data-reference="reference" t-att-data-amount="amount">
<div class="form-group">
<label for="form_reference" class="col-sm-3 control-label">Reference</label>
<div class="col-sm-9">
<span name="form_reference" class="form-control" t-esc="reference"/>
</div>
</div>
<div class="form-group">
<label for="form_amount" class="col-sm-3 control-label">Amount</label>
<div class="col-sm-9">
<span name="form_amount" class="form-control" t-esc="amount" t-options="{'widget': 'monetary', 'display_currency': currency}"/>
</div>
</div>
<div class="col-sm-9 col-sm-offset-3 text-muted mt16" t-raw="acquirer.pre_msg"/>
<div class="col-sm-12 o_website_payment_form" t-raw="payment_form"/>
<div class="col-sm-6 col-sm-offset-6 text-muted mt16">
<span t-field="acquirer.image_small" t-att-title="acquirer.name" t-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/>
<span>Processed by <t t-esc="acquirer.name"/>.</span>
</div>
</div>
<div t-if="error_msg" class="alert alert-danger col-md-7">
<t t-esc="error_msg"/>
</div>
<div class="row mt32 mb32">
<div class="col-md-7">
<p><b>Reference:</b> <t t-esc="reference"/></p>
<p><b>Amount:</b> <t t-esc="amount" t-options="{'widget': 'monetary', 'display_currency': currency}"/></p>
<t t-call="payment.payment_tokens_list" t-if="reference and amount and currency">
<t t-set="mode" t-value="'payment'"/>
<t t-set="prepare_tx_url" t-value="'/website_payment/transaction/' + reference + '/' + str(amount) + '/' + str(currency.id)"/>
<t t-set="form_action" t-value="'/website_payment/token/' + reference + '/' + str(amount) + '/' + str(currency.id)"/>
</t>
<div t-if="not (s2s_acquirers or form_acquirers)" class="alert alert-danger">
<p>No payment acquirer found.</p>
<p>Please configure a payment acquirer.</p>
</div>
<div class="oe_structure"/>
</div>
</div>
</div>
addons/payment_adyen/i18n/de.po
+10 -7
View File
@@ -4,15 +4,16 @@
#
# Translators:
# darenkster <inactive+darenkster@transifex.com>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Wolfgang Taferner, 2017
# Martin Trigaux, 2017
# e2f <projects@e2f.com>, 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 <mat@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_authorize/i18n/de.po
+10 -6
View File
@@ -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
addons/payment_authorize/i18n/es.po
+9 -6
View File
@@ -3,18 +3,19 @@
# * payment_authorize
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2016
# Martin Trigaux, 2016
# Humberto Garza De Koster <garzadekoster@gmail.com>, 2016
# David Arnold <blaggacao@users.noreply.github.com>, 2017
# RGB Consulting <odoo@rgbconsulting.com>, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# e2f <projects@e2f.com>, 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 <luis.martinez@tecnativa.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_buckaroo/i18n/de.po
+9 -6
View File
@@ -4,15 +4,16 @@
#
# Translators:
# darenkster <inactive+darenkster@transifex.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Martin Trigaux, 2017
# Wolfgang Taferner, 2017
# e2f <projects@e2f.com>, 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 <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_ogone/i18n/de.po
+11 -6
View File
@@ -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
addons/payment_ogone/i18n/es.po
+10 -9
View File
@@ -3,20 +3,21 @@
# * payment_ogone
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# David Arnold <blaggacao@users.noreply.github.com>, 2017
# Alejandro Die Sanchis <marketing@domatix.com>, 2017
# RGB Consulting <odoo@rgbconsulting.com>, 2017
# Ivan Nieto <ivan.n.s@tuta.io>, 2017
# Martin Trigaux, 2016
# Alejandro Die Sanchis <marketing@domatix.com>, 2016
# Ivan Nieto <ivan.n.s@tuta.io>, 2016
# Gelo Joga Landoo <gj@landoo.es>, 2017
# David Arnold <blaggacao@users.noreply.github.com>, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# RGB Consulting <odoo@rgbconsulting.com>, 2017
# e2f <projects@e2f.com>, 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 <gj@landoo.es>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_paypal/i18n/de.po
+7 -4
View File
@@ -3,17 +3,18 @@
# * payment_paypal
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# aNj <anj2j@yahoo.de>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Wolfgang Taferner, 2017
# e2f <projects@e2f.com>, 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 <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_paypal/i18n/es.po
+6 -3
View File
@@ -3,16 +3,17 @@
# * payment_paypal
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# Martin Trigaux, 2016
# Gelo Joga Landoo <gj@landoo.es>, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# e2f <projects@e2f.com>, 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 <gj@landoo.es>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_paypal/i18n/zh_CN.po
+5 -4
View File
@@ -3,14 +3,15 @@
# * payment_paypal
#
# Translators:
# Jeffery CHEN <jeffery9@gmail.com>, 2016
# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
# e2f <projects@e2f.com>, 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 <jeffery9@gmail.com>, 2016\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_payumoney/i18n/de.po
+11 -6
View File
@@ -4,14 +4,15 @@
#
# Translators:
# darenkster <inactive+darenkster@transifex.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# e2f <projects@e2f.com>, 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 <mat@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_payumoney/i18n/es.po
+9 -5
View File
@@ -3,15 +3,16 @@
# * payment_payumoney
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2016
# Martin Trigaux, 2016
# David Arnold <blaggacao@users.noreply.github.com>, 2017
# e2f <projects@e2f.com>, 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 <blaggacao@users.noreply.github.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_payumoney/i18n/zh_CN.po
+8 -7
View File
@@ -3,14 +3,15 @@
# * payment_payumoney
#
# Translators:
# Jeffery CHEN <jeffery9@gmail.com>, 2016
# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
# e2f <projects@e2f.com>, 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 <jeffery9@gmail.com>, 2016\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_sips/i18n/de.po
+12 -11
View File
@@ -4,15 +4,16 @@
#
# Translators:
# darenkster <inactive+darenkster@transifex.com>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Wolfgang Taferner, 2017
# Martin Trigaux, 2017
# e2f <projects@e2f.com>, 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 <mat@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
addons/payment_sips/i18n/es.po
+9 -8
View File
@@ -3,17 +3,18 @@
# * payment_sips
#
# Translators:
# Martin Trigaux, 2016
# Alejandro Die Sanchis <marketing@domatix.com>, 2016
# Ivan Nieto <ivan.n.s@tuta.io>, 2016
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# Alejandro Die Sanchis <marketing@domatix.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Ivan Nieto <ivan.n.s@tuta.io>, 2017
# e2f <projects@e2f.com>, 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 <ivan.n.s@tuta.io>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_sips/i18n/zh_CN.po
+9 -8
View File
@@ -3,15 +3,16 @@
# * payment_sips
#
# Translators:
# Jeffery CHEN <jeffery9@gmail.com>, 2016
# fausthuang <faust_huang@hotmail.com>, 2017
# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
# fausthuang, 2017
# e2f <projects@e2f.com>, 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 <faust_huang@hotmail.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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 "仅适用于生产"
addons/payment_stripe/i18n/de.po
+16 -10
View File
@@ -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
addons/payment_stripe/i18n/es.po
+12 -10
View File
@@ -3,17 +3,17 @@
# * payment_stripe
#
# Translators:
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# Martin Trigaux, 2016
# David Arnold <blaggacao@users.noreply.github.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# RGB Consulting <odoo@rgbconsulting.com>, 2017
# e2f <projects@e2f.com>, 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 <odoo@rgbconsulting.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/payment_stripe/i18n/zh_CN.po
+8 -8
View File
@@ -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
addons/payment_stripe/static/src/js/stripe.js
+7 -4
View File
@@ -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) {
addons/phone_validation/i18n/de.po
+12 -7
View File
@@ -7,14 +7,15 @@
# Henry Mineehen <info@mineehen.de>, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# e2f <projects@e2f.com>, 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 <mat@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
addons/phone_validation/i18n/es.po
+9 -4
View File
@@ -6,15 +6,16 @@
# José Matias Zuazo <jose.zuazo@tpsistemas.com.ar>, 2017
# Eduardo Magdalena <emagdalena@close2circle.com>, 2017
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
# e2f <projects@e2f.com>, 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 <luis.martinez@tecnativa.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/phone_validation/i18n/zh_CN.po
+2 -2
View File
@@ -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"
addons/point_of_sale/i18n/de.po
+271 -159
View File
File diff suppressed because it is too large Load Diff
addons/point_of_sale/i18n/es.po
+1 -1
View File
@@ -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
addons/point_of_sale/i18n/zh_CN.po
+110 -107
View File
@@ -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 &amp; 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
addons/point_of_sale/models/pos_order.py
+7 -3
View File
@@ -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
addons/point_of_sale/static/src/js/models.js
+1
View File
@@ -729,6 +729,7 @@ exports.PosModel = Backbone.Model.extend({
deferred.resolve();
};
img.crossOrigin = 'use-credentials';
img.src = url;
return deferred;
addons/point_of_sale/static/src/js/screens.js
+9 -3
View File
@@ -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,
});
});
},
addons/portal/i18n/de.po
+13 -11
View File
@@ -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
addons/portal/static/src/js/portal_chatter.js
+2 -2
View File
@@ -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);
addons/pos_cache/i18n/de.po
+7 -6
View File
@@ -5,19 +5,20 @@
# Translators:
# Henry Mineehen <info@mineehen.de>, 2017
# Tina Rittmüller <tr@ife.de>, 2017
# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
# Wolfgang Taferner, 2017
# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
# Niki Waibel <niki.waibel@gmail.com>, 2017
# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
# Niki Waibel, 2017
# Dejan Dinic, 2017
# darenkster <inactive+darenkster@transifex.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# e2f <projects@e2f.com>, 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 <mat@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/pos_data_drinks/i18n/es.po
+9 -8
View File
@@ -4,15 +4,16 @@
#
# Translators:
# Eduardo Magdalena <emagdalena@close2circle.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Pierre-Antoine Magnet <pma@odoo.com>, 2017
# e2f <projects@e2f.com>, 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 <pma@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/pos_discount/i18n/de.po
+8 -4
View File
@@ -3,16 +3,17 @@
# * pos_discount
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Ermin Trevisan <trevi@twanda.com>, 2017
# Fabian Liesch <fabian.liesch@gmail.com>, 2017
# e2f <projects@e2f.com>, 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 <fabian.liesch@gmail.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/pos_discount/i18n/es.po
+4 -3
View File
@@ -3,16 +3,17 @@
# * pos_discount
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2016
# Martin Trigaux, 2016
# Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
# Ana Juaristi <ajuaristio@gmail.com>, 2016
# e2f <projects@e2f.com>, 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 <ajuaristio@gmail.com>, 2016\n"
"Last-Translator: e2f <projects@e2f.com>, 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
addons/pos_mercury/i18n/de.po
+110 -92
View File
@@ -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
addons/pos_mercury/views/pos_mercury_transaction_templates.xml
+4 -4
View File
@@ -6,11 +6,11 @@
<TranType><t t-esc='transaction_type'/></TranType>
<TranCode><t t-esc='transaction_code'/></TranCode>
<InvoiceNo><t t-esc='invoice_no'/></InvoiceNo>
<Frequency>OneTime</Frequency>
<Frequency t-translation="off">OneTime</Frequency>
</template>
<template id='mercury_transaction'>
<TStream>
<TStream t-translation="off">
<Transaction>
<t t-call='pos_mercury.mercury_common'/>
<OperatorID><t t-esc='operator_id'/></OperatorID>
@@ -31,7 +31,7 @@
</template>
<template id='mercury_voidsale'>
<TStream>
<TStream t-translation="off">
<Transaction>
<t t-call='pos_mercury.mercury_common'/>
<RefNo><t t-esc='ref_no'/></RefNo>
@@ -52,7 +52,7 @@
</template>
<template id='mercury_return'>
<TStream>
<TStream t-translation="off">
<Transaction>
<t t-call='pos_mercury.mercury_common'/>
<OperatorID><t t-esc='operator_id'/></OperatorID>
addons/pos_restaurant/i18n/de.po
+11 -11
View File
@@ -61,7 +61,7 @@ msgstr ""
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Accept customer tips or convert their change to a tip"
msgstr ""
msgstr "Trinkgelder annehmen oder das Wechselgeld in Trinkgeld umwandeln"
#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_active
@@ -78,7 +78,7 @@ msgstr "Notiz hinzufügen"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Add notes to orderlines"
msgstr ""
msgstr "Hinweise zur Bestellung hinzufügen"
#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_orderline_notes
@@ -88,12 +88,12 @@ msgstr ""
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Allow to print bill before payment"
msgstr ""
msgstr "Rechnungsdruck vor der Zahlung zulassen"
#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_printbill
msgid "Allows to print the Bill before payment."
msgstr ""
msgstr "Lässt den Rechnungsdruck vor der Zahlung zu."
#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_restaurant_table_name
@@ -244,7 +244,7 @@ msgstr ""
#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_splitbill
msgid "Enables Bill Splitting in the Point of Sale."
msgstr ""
msgstr "Ermöglicht eine Rechnungsaufteilung im Point-of-Sale."
#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_floor_id
@@ -265,7 +265,7 @@ msgstr "Tischplan"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Floors"
msgstr ""
msgstr "Ebenen"
#. module: pos_restaurant
#. openerp-web
@@ -339,7 +339,7 @@ msgstr "Zuletzt aktualisiert am"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Manage table orders"
msgstr ""
msgstr "Tabellenaufträge verwalten"
#. module: pos_restaurant
#. openerp-web
@@ -439,7 +439,7 @@ msgstr "Drucken"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Print orders at the kitchen, at the bar, etc."
msgstr ""
msgstr "Bestellungen in der Küche, Bar etc. drucken"
#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_printer_product_categories_ids
@@ -526,7 +526,7 @@ msgstr "Aufteilen"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Split total or order lines"
msgstr ""
msgstr "Gesamt- oder Auftragspositionen teilen"
#. module: pos_restaurant
#: selection:restaurant.table,shape:0
@@ -555,7 +555,7 @@ msgstr "Tabelle"
#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_pos_config_is_table_management
msgid "Table Management"
msgstr ""
msgstr "Tabellenverwaltung"
#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_name
@@ -662,7 +662,7 @@ msgstr "Dieser Plan hat keine Tische, verwenden Sie die"
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "This product is used as reference on customer receipts."
msgstr ""
msgstr "Dieses Produkt wird als Referenz auf Kundenquittungen verwendet."
#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
addons/pos_sale/i18n/de.po
+8 -7
View File
@@ -13,13 +13,14 @@
# Malte Jansen <work@maltejansen.de>, 2017
# Jan Brodersen <4rmitxes@gmail.com>, 2017
# DE T1 <e2f8846@yahoo.com>, 2018
# e2f <projects@e2f.com>, 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: DE T1 <e2f8846@yahoo.com>, 2018\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
@@ -30,7 +31,7 @@ msgstr ""
#. module: pos_sale
#: model:ir.model,name:pos_sale.model_report_all_channels_sales
msgid "All sales orders grouped by sales channels"
msgstr ""
msgstr "Alle Verkaufsaufträge gruppiert nach Vertriebskanälen"
#. module: pos_sale
#: code:addons/pos_sale/models/crm_team.py:103
@@ -61,12 +62,12 @@ msgstr "Monat"
#. module: pos_sale
#: model:ir.model.fields,field_description:pos_sale.field_crm_team_pos_sessions_open_count
msgid "Open POS Sessions"
msgstr ""
msgstr "PoS-Sitzungen öffnen"
#. module: pos_sale
#: model:ir.actions.act_window,name:pos_sale.pos_session_action_from_crm_team
msgid "Open Sessions"
msgstr ""
msgstr "Sitzungen öffnen"
#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
@@ -95,7 +96,7 @@ msgstr "Vertriebskanal"
#: code:addons/pos_sale/models/crm_team.py:115
#, python-format
msgid "Sales: Untaxed Amount"
msgstr ""
msgstr "Verkauf: Nettobetrag"
#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
@@ -105,12 +106,12 @@ msgstr "Verkäufer"
#. module: pos_sale
#: model:ir.ui.view,arch_db:pos_sale.crm_team_salesteams_view_kanban_inherit_pos_sale
msgid "Session Running"
msgstr ""
msgstr "Sitzung läuft"
#. module: pos_sale
#: model:ir.model.fields,field_description:pos_sale.field_crm_team_pos_order_amount_total
msgid "Session Sale Amount"
msgstr ""
msgstr "Anzahl der Sitzungsverkäufe"
#. module: pos_sale
#: model:ir.ui.view,arch_db:pos_sale.crm_team_salesteams_view_kanban_inherit_pos_sale
addons/product/i18n/de.po
+54 -15
View File
@@ -164,6 +164,9 @@ msgid ""
"This description will be copied to every Purchase Order, Receipt and Vendor "
"Bill/Credit Note."
msgstr ""
"Eine Beschreibung des Produkts, die Sie Ihren Lieferanten mitteilen möchten."
" Diese Beschreibung wird in jeden Kaufauftrag, jede Quittung und jede "
"Lieferanten-Rechnung/-Gutschrift kopiert."
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description
@@ -306,7 +309,7 @@ msgstr "Strichcode"
#. module: product
#: model:ir.model.fields,help:product.field_product_packaging_barcode
msgid "Barcode used for packaging identification."
msgstr ""
msgstr "Barcode wird für die Identifikation der Verpackung verwendet."
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_base
@@ -316,6 +319,10 @@ msgid ""
"Cost Price : The base price will be the cost price.\n"
"Other Pricelist : Computation of the base price based on another Pricelist."
msgstr ""
"Basispreis zur Berechnung.\n"
"Listenpreis: Der Preisbasis entspricht dem Verkaufspreis/Listenpreis.\n"
"Einstandspreis : Die Preisbasis ist der Einstandstandspreis.\n"
"Andere Preisliste : Ermittlung der Preisbasis beruht auf anderer Preisliste."
#. module: product
#: model:ir.model.fields,help:product.field_product_product_list_price
@@ -446,7 +453,7 @@ msgstr "Farbkennzeichnung"
#. module: product
#: model:ir.ui.view,arch_db:product.res_config_settings_view_form
msgid "Common Product Catalog"
msgstr ""
msgstr "Gemeinsamer Produktkatalog"
#. module: product
#: model:ir.model,name:product.model_res_company
@@ -526,6 +533,9 @@ msgid ""
"in average/fifo. Also used as a base price for pricelists. Expressed in the "
"default unit of measure of the product."
msgstr ""
"Kosten, die für die Berechnung des Standardpreises angesetzt werden und des "
"ersten unter Durchschnitt/FIFO festgelegten Preises. Auch als Basispreis für"
" Preislisten verwendet. Ausgedrückt in der Standard-Maßeinheit des Produkts."
#. module: product
#: model:ir.model.fields,help:product.field_product_template_standard_price
@@ -534,6 +544,9 @@ msgid ""
"in average/fifo. Also used as a base price for pricelists. Expressed in the "
"default unit of measure of the product. "
msgstr ""
"Kosten, die für die Berechnung des Standardpreises angesetzt werden und des "
"ersten unter Durchschnitt/FIFO festgelegten Preises. Auch als Basispreis für"
" Preislisten verwendet. Ausgedrückt in der Standard-Maßeinheit des Produkts."
#. module: product
#: model:ir.model,name:product.model_res_country_group
@@ -616,7 +629,7 @@ msgstr "Tag(e)"
#: code:addons/product/models/res_company.py:59
#, python-format
msgid "Default %(currency)s pricelist for %(company)s"
msgstr ""
msgstr "Standard-Preisliste in %(currency) für %(company)"
#. module: product
#: model:ir.model.fields,help:product.field_product_product_uom_id
@@ -798,6 +811,7 @@ msgstr "Allgemeine Informationen"
#: model:ir.model.fields,help:product.field_product_template_packaging_ids
msgid "Gives the different ways to package the same product."
msgstr ""
"Stellt verschiedene Möglichkeiten bereit, dasselbe Produkt zu verpacken."
#. module: product
#: model:ir.model.fields,help:product.field_product_product_sequence
@@ -814,7 +828,7 @@ msgstr "Global"
#: code:addons/product/models/product_template.py:30
#, python-format
msgid "Go to Internal Categories"
msgstr ""
msgstr "Interne Kategorien aufrufen"
#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
@@ -832,6 +846,9 @@ msgid ""
"How many times this Unit of Measure is bigger than the reference Unit of "
"Measure in this category: 1 * (this unit) = ratio * (reference unit)"
msgstr ""
"Wie viel größer oder kleiner ist diese Einheit im Vergleich zur "
"Referenzeinheit in dieser Kategorie: 1 * (Referenz Einheit) = Faktor * "
"(diese Einheit)"
#. module: product
#: model:ir.model.fields,help:product.field_product_uom_factor
@@ -839,6 +856,9 @@ msgid ""
"How much bigger or smaller this unit is compared to the reference Unit of "
"Measure for this category: 1 * (reference unit) = ratio * (this unit)"
msgstr ""
"Wie viel größer oder kleiner ist diese Einheit im Vergleich zur "
"Referenzeinheit in dieser Kategorie: 1 * (Referenz Einheit) = Faktor * "
"(diese Einheit)"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute_id
@@ -865,6 +885,8 @@ msgstr "ID"
msgid ""
"If not set, the vendor price will apply to all variants of this products."
msgstr ""
"Falls nicht anderweitig festgelegt, gilt der Lieferantenpreis für alle "
"Varianten dieser Produkte."
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_active
@@ -1229,12 +1251,12 @@ msgstr "Preisliste"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_pricelist_item_ids
msgid "Pricelist Item"
msgstr ""
msgstr "Preisliste Einzelposition"
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_applied_on
msgid "Pricelist Item applicable on selected option"
msgstr ""
msgstr "Preisliste Einzelposition ist für ausgewählte Option anwendbar"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_ids
@@ -1351,12 +1373,12 @@ msgstr "Produktname"
#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
msgid "Product Packages"
msgstr ""
msgstr "Produktverpackungen"
#. module: product
#: model:ir.ui.view,arch_db:product.product_packaging_form_view
msgid "Product Packaging"
msgstr ""
msgstr "Produktverpackung"
#. module: product
#: model:ir.actions.act_window,name:product.action_packaging_view
@@ -1390,7 +1412,7 @@ msgstr "Produkteinheit"
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
msgid "Product UoM Categories"
msgstr ""
msgstr "Kategorien für Maßeinheiten von Produkten"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_id
@@ -1740,6 +1762,8 @@ msgstr "Lagerprodukt"
msgid ""
"Technical field. Used for searching on pricelists, not stored in database."
msgstr ""
"Technisches Feld. Verwendet für die Suche nach Preislisten, die nicht in der"
" Datenbank gespeichert sind."
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
@@ -1785,6 +1809,8 @@ msgid ""
"The number of products under this category (Does not consider the children "
"categories)"
msgstr ""
"Die Anzahl der Produkte in dieser Kategorie (untergeordnete Kategorien "
"werden nicht berücksichtigt)"
#. module: product
#: code:addons/product/models/product_attribute.py:74
@@ -1827,7 +1853,7 @@ msgstr ""
#. module: product
#: sql_constraint:product.uom:0
msgid "The rounding precision must be greater than 0!"
msgstr ""
msgstr "Die Rundungsgenauigkeit muss größer als 0 sein!"
#. module: product
#: model:ir.model.fields,help:product.field_product_product_lst_price
@@ -1842,6 +1868,8 @@ msgstr ""
#: model:ir.model.fields,help:product.field_product_packaging_qty
msgid "The total number of products you can have per pallet or box."
msgstr ""
"Die Gesamtzahl der Produkte, die Sie pro Palette oder Karton erhalten "
"können."
#. module: product
#: model:ir.model.fields,help:product.field_product_product_volume
@@ -1933,6 +1961,8 @@ msgstr "Typ"
msgid ""
"Uncheck the active field to disable a unit of measure without deleting it."
msgstr ""
"Heben Sie die Markierung des aktiven Felds auf, um eine Maßeinheit zu "
"deaktivieren, ohne sie zu löschen."
#. module: product
#: model:product.uom.categ,name:product.product_uom_categ_unit
@@ -2018,7 +2048,7 @@ msgstr "Varianteninformation"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_price_extra
msgid "Variant Price Extra"
msgstr ""
msgstr "Preisaufschlag für Variante"
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
@@ -2029,7 +2059,7 @@ msgstr "Variantenpreise"
#: model:ir.model.fields,field_description:product.field_product_product_variant_seller_ids
#: model:ir.model.fields,field_description:product.field_product_template_variant_seller_ids
msgid "Variant Seller"
msgstr ""
msgstr "Verkäufer von Variante"
#. module: product
#: model:ir.actions.act_window,name:product.product_attribute_value_action
@@ -2120,18 +2150,20 @@ msgid ""
"You cannot define the decimal precision of 'Account' as greater than the "
"rounding factor of the company's main currency"
msgstr ""
"Die Nachkommastellen des „Kontos“ dürfen nicht größer sein als der "
"Rundungsfaktor für die Hauptwährung des Unternehmens."
#. module: product
#: code:addons/product/wizard/product_price_list.py:26
#, 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: product
#: code:addons/product/wizard/product_price_list.py:28
#, 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: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -2139,6 +2171,8 @@ msgid ""
"You must define a conversion rate between several Units of\n"
" Measure within the same category."
msgstr ""
"Sie müssen einen Umrechnungsfaktor für unterschiedliche Maßeinheiten\n"
" der gleichen Kategorie festlegen."
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
@@ -2158,6 +2192,9 @@ msgid ""
"You must define a product for everything you sell, whether it's a physical "
"product, a consumable or a service you offer to customers."
msgstr ""
"Sie müssen ein Produkt für alles, was Sie verkaufen, definieren, ganz egal, "
"ob es ein physisches Produkt, ein Verbrauchsartikel oder eine "
"Dienstleistung, die Sie Kunden anbieten, ist."
#. module: product
#: code:addons/product/models/product_template.py:29
@@ -2166,6 +2203,8 @@ msgid ""
"You must define at least one product category in order to be able to create "
"products."
msgstr ""
"Sie müssen mindestens eine Produktkategorie festlegen, um Produkte erstellen"
" zu können."
#. module: product
#: model:product.uom,name:product.product_uom_cm
@@ -2190,7 +2229,7 @@ msgstr "z. B. Lampen"
#. module: product
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
msgid "e.g. Odoo Enterprise Subscription"
msgstr ""
msgstr "z. B. Odoo Enterprise-Abonnement"
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_view
addons/product/i18n/fr.po
+15 -5
View File
@@ -1811,6 +1811,8 @@ msgid ""
"The number of products under this category (Does not consider the children "
"categories)"
msgstr ""
"Le nombre de produits dans cette catégorie (Ne tient pas compte des "
"catégories enfants)"
#. module: product
#: code:addons/product/models/product_attribute.py:74
@@ -1853,7 +1855,7 @@ msgstr ""
#. module: product
#: sql_constraint:product.uom:0
msgid "The rounding precision must be greater than 0!"
msgstr ""
msgstr "L'arrondissement doit être supérieur à 0 !"
#. module: product
#: model:ir.model.fields,help:product.field_product_product_lst_price
@@ -1861,11 +1863,14 @@ msgid ""
"The sale price is managed from the product template. Click on the 'Variant "
"Prices' button to set the extra attribute prices."
msgstr ""
"Le prix de vente est géré depuis le modèle de produit. Cliquez sur le bouton"
" « Prix des variantes » pour définir les tarifs des attributs "
"supplémentaires."
#. module: product
#: model:ir.model.fields,help:product.field_product_packaging_qty
msgid "The total number of products you can have per pallet or box."
msgstr ""
msgstr "Le nombre total de produits vous pouvez avoir par palette ou carton."
#. module: product
#: model:ir.model.fields,help:product.field_product_product_volume
@@ -2026,7 +2031,7 @@ msgstr "Valeurs"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_variant_count
msgid "Variant Count"
msgstr ""
msgstr "Nombre de variantes"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_image_variant
@@ -2041,7 +2046,7 @@ msgstr "Information Variante"
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_price_extra
msgid "Variant Price Extra"
msgstr ""
msgstr "Prix supplémentaires des variantes"
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
@@ -2052,7 +2057,7 @@ msgstr "Prix de la variante"
#: model:ir.model.fields,field_description:product.field_product_product_variant_seller_ids
#: model:ir.model.fields,field_description:product.field_product_template_variant_seller_ids
msgid "Variant Seller"
msgstr ""
msgstr "Vendeur des variantes"
#. module: product
#: model:ir.actions.act_window,name:product.product_attribute_value_action
@@ -2143,6 +2148,9 @@ msgid ""
"You cannot define the decimal precision of 'Account' as greater than the "
"rounding factor of the company's main currency"
msgstr ""
"Pour la comptabilité, il n'est pas possible de choisir une précision "
"décimale supérieure au facteur d'arrondi de la devise principale de la "
"société"
#. module: product
#: code:addons/product/wizard/product_price_list.py:26
@@ -2164,6 +2172,8 @@ msgid ""
"You must define a conversion rate between several Units of\n"
" Measure within the same category."
msgstr ""
"Vous devez définir un taux de conversion entre plusieurs unités de\n"
" mesure au sein de la même catégorie."
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
addons/product_expiry/i18n/de.po
+13 -3
View File
@@ -67,6 +67,8 @@ msgid ""
"Date to determine the expired lots and serial numbers using the filter "
"\"Expiration Alerts\"."
msgstr ""
"Datum, um die abgelaufenen Lose und Seriennummern mit dem Filter „Alerts“ "
"(Alarme) zu bestimmen."
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry
@@ -82,7 +84,7 @@ msgstr "Verwendbar bis"
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.search_product_lot_filter_inherit_product_expiry
msgid "Expiration alerts"
msgstr ""
msgstr "Ablaufalarme"
#. module: product_expiry
#: model:product.product,name:product_expiry.product_product_jambon
@@ -107,6 +109,8 @@ msgstr "Los/Serie"
msgid ""
"Number of days before an alert should be raised on the lot/serial number."
msgstr ""
"Anzahl der Tage, bevor ein Alarm für die Los-/Seriennummer ausgelöst werden "
"sollte."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_life_time
@@ -115,6 +119,8 @@ msgid ""
"Number of days before the goods may become dangerous and must not be "
"consumed. It will be computed on the lot/serial number."
msgstr ""
"Anzahl der Tage, bevor die Waren gefährlich werden könnten und nicht mehr "
"verbraucht werden dürfen. Ist auf Los-/Seriennummer berechnet."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_removal_time
@@ -123,6 +129,8 @@ msgid ""
"Number of days before the goods should be removed from the stock. It will be"
" computed on the lot/serial number."
msgstr ""
"Anzahl der Tage, bevor die Waren aus dem Lager entfernt werden sollten. Ist "
"auf Los-/Seriennummer berechnet."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_use_time
@@ -131,6 +139,8 @@ msgid ""
"Number of days before the goods starts deteriorating, without being "
"dangerous yet. It will be computed on the lot/serial number."
msgstr ""
"Anzahl der Tage, bevor die Haltbarkeit abläuft, ohne dass der Konsum nach "
"Ablaufdatum gesundheitsschädlich ist. Ist auf Los-/Seriennummer berechnet."
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_product_product_alert_time
@@ -141,7 +151,7 @@ msgstr "Datum Ablaufwarnung"
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot_product_expiry_alert
msgid "Product Expiry Alert"
msgstr ""
msgstr "Produktauslauf-Alarm"
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_product_product_life_time
@@ -180,7 +190,7 @@ msgstr "Datum der Vernichtung"
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_product_expiry_alert
msgid "The Alert Date has been reached."
msgstr ""
msgstr "Das Alarmdatum wurde erreicht."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_life_date
addons/product_expiry/i18n/fr.po
+19 -7
View File
@@ -3,17 +3,18 @@
# * product_expiry
#
# Translators:
# Eloïse Stilmant <est@odoo.com>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Nancy Bolognesi <nb@microcom.ca>, 2017
# Martin Trigaux, 2016
# Nancy Bolognesi <nb@microcom.ca>, 2016
# Richard Mathot <rim@odoo.com>, 2017
# Eloïse Stilmant <est@odoo.com>, 2017
# e2f <projects@e2f.com>, 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~18\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-02 11:26+0000\n"
"PO-Revision-Date: 2017-10-02 11:26+0000\n"
"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
@@ -68,6 +69,8 @@ msgid ""
"Date to determine the expired lots and serial numbers using the filter "
"\"Expiration Alerts\"."
msgstr ""
"Date servant à déterminer les lots et numéros de série expirés à l'aide du "
"filtre « Alertes d'expiration »."
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry
@@ -83,7 +86,7 @@ msgstr "Date limite de consommation"
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.search_product_lot_filter_inherit_product_expiry
msgid "Expiration alerts"
msgstr ""
msgstr "Alertes d'expiration"
#. module: product_expiry
#: model:product.product,name:product_expiry.product_product_jambon
@@ -108,6 +111,8 @@ msgstr "Lot/N° série"
msgid ""
"Number of days before an alert should be raised on the lot/serial number."
msgstr ""
"Nombre de jours avant qu'une alerte ne se déclenche pour ce lot/numéro de "
"série."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_life_time
@@ -116,6 +121,8 @@ msgid ""
"Number of days before the goods may become dangerous and must not be "
"consumed. It will be computed on the lot/serial number."
msgstr ""
"Nombre de jours avant que les marchandises ne deviennent dangereuses et non "
"consommables. Elle sera calculée en fonction du lot/numéro de série."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_removal_time
@@ -124,6 +131,8 @@ msgid ""
"Number of days before the goods should be removed from the stock. It will be"
" computed on the lot/serial number."
msgstr ""
"Nombre de jours avant que les marchandises ne doivent être retirées du "
"stock. Elle sera calculée en fonction du lot/numéro de série."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_product_product_use_time
@@ -132,6 +141,9 @@ msgid ""
"Number of days before the goods starts deteriorating, without being "
"dangerous yet. It will be computed on the lot/serial number."
msgstr ""
"Nombre de jours avant que les marchandises ne commencent à se détériorer, "
"sans pour autant être dangereuses. Elle sera calculée en fonction du "
"lot/numéro de série."
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_product_product_alert_time
@@ -142,7 +154,7 @@ msgstr "Délai avant alerte"
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot_product_expiry_alert
msgid "Product Expiry Alert"
msgstr ""
msgstr "Alerte d'expiration de produit"
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_product_product_life_time
@@ -181,7 +193,7 @@ msgstr "Date de retrait"
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_product_expiry_alert
msgid "The Alert Date has been reached."
msgstr ""
msgstr "La date d'alerte a été atteinte."
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_life_date
addons/project/controllers/portal.py
+9 -7
View File
@@ -14,10 +14,12 @@ class CustomerPortal(CustomerPortal):
def _prepare_portal_layout_values(self):
values = super(CustomerPortal, self)._prepare_portal_layout_values()
values.update({
'project_count': request.env['project.project'].search_count([('privacy_visibility', '=', 'portal')]),
'task_count': request.env['project.task'].search_count([('project_id.privacy_visibility', '=', 'portal')])
})
Project = request.env['project.project']
Task = request.env['project.task']
# portal users can't view projects they don't follow
projects = Project.sudo().search([('privacy_visibility', '=', 'portal')])
values['project_count'] = Project.search_count([('id', 'in', projects.ids)])
values['task_count'] = Task.search_count([('project_id', 'in', projects.ids)])
return values
@http.route(['/my/projects', '/my/projects/page/<int:page>'], type='http', auth="user", website=True)
@@ -77,8 +79,6 @@ class CustomerPortal(CustomerPortal):
@http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', **kw):
values = self._prepare_portal_layout_values()
domain = [('project_id.privacy_visibility', '=', 'portal')]
searchbar_sortings = {
'date': {'label': _('Newest'), 'order': 'create_date desc'},
'name': {'label': _('Title'), 'order': 'name'},
@@ -96,7 +96,9 @@ class CustomerPortal(CustomerPortal):
'all': {'input': 'all', 'label': _('Search in All')},
}
# extends filterby criteria with project (criteria name is the project id)
projects = request.env['project.project'].search([('privacy_visibility', '=', 'portal')])
# Note: portal users can't view projects they don't follow
projects = request.env['project.project'].sudo().search([('privacy_visibility', '=', 'portal')])
domain = [('project_id', 'in', projects.ids)]
for proj in projects:
searchbar_filters.update({
str(proj.id): {'label': proj.name, 'domain': [('project_id', '=', proj.id)]}
addons/project/i18n/de.po
+61 -48
View File
@@ -304,12 +304,12 @@ msgstr "# Aufgaben"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_open
msgid "# Working Days to Assign"
msgstr ""
msgstr "# Zuzuweisende Arbeitstage"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_close
msgid "# Working Days to Close"
msgstr ""
msgstr "# Abzuschließende Arbeitstage"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_nbr
@@ -588,7 +588,7 @@ msgstr "Archiviert"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Assign to Me"
msgstr ""
msgstr "Mir zuweisen"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_date_start
@@ -642,7 +642,7 @@ msgstr "Dateianhang"
#. module: project
#: model:ir.model.fields,help:project.field_project_task_attachment_ids
msgid "Attachment that don't come from message."
msgstr ""
msgstr "Anhang, der nicht von der Nachricht stammt."
#. module: project
#: code:addons/project/models/project.py:119
@@ -747,6 +747,9 @@ msgid ""
"Choosing a sub-tasks project will both enable sub-tasks and set their "
"default project (possibly the project itself)"
msgstr ""
"Indem Sie ein Unteraufgaben-Projekt auswählen, werden Unteraufgaben "
"aktiviert und deren Standard-Projekt festgelegt (eventuell das Projekt "
"selbst)"
#. module: project
#. openerp-web
@@ -833,7 +836,7 @@ msgstr "Vertrag / Analyse Konto"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_displayed_image_id
msgid "Cover Image"
msgstr ""
msgstr "Titelbild"
#. module: project
#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
@@ -858,7 +861,7 @@ msgstr "Neues Projekt anlegen."
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_create_new_task
msgid "Create a new task"
msgstr ""
msgstr "Eine neue Aufgabe erstellen"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_create_uid
@@ -900,12 +903,12 @@ msgstr "Währung"
#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_tasks
msgid "Current stage of the task"
msgstr ""
msgstr "Aktueller Status der Aufgabe"
#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_task
msgid "Current stage of this task"
msgstr ""
msgstr "Aktueller Status dieser Aufgabe"
#. module: project
#: model:ir.actions.act_window,help:project.project_task_action_activity
@@ -1101,6 +1104,8 @@ msgid ""
"Explanation text to help users using the star on tasks or issues in this "
"stage."
msgstr ""
"Erklärungstext, um Nutzern dabei zu helfen, den Stern bei Aufgaben oder "
"Problemen auf dieser Stufe zu verwenden."
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1177,7 +1182,7 @@ msgstr "Grün"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_done
msgid "Green Kanban Label"
msgstr ""
msgstr "Grüne Kanban-Kennzeichnung"
#. module: project
#: selection:project.task,kanban_state:0
@@ -1187,7 +1192,7 @@ msgstr "Grau"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_normal
msgid "Grey Kanban Label"
msgstr ""
msgstr "Graue Kanban-Kennzeichnung"
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
@@ -1470,6 +1475,8 @@ msgid ""
"Lets the company customize which Pad installation should be used to link to "
"new pads (for example: http://etherpad.com/)."
msgstr ""
"Hier können Sie einstellen, welche Pad-Installation für neue Pads angewandt "
"werden sollen (z. B.: http://ietherpad.com/)."
#. module: project
#: model:ir.model.fields,help:project.field_project_project_analytic_account_id
@@ -1491,12 +1498,12 @@ msgstr "Niedrig"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
msgid "Main Attachments"
msgstr ""
msgstr "Hauptanhänge"
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Manage your resources with Gantt charts"
msgstr ""
msgstr "Verwalten Sie Ihre Ressourcen mit Gantt-Diagrammen"
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
@@ -1512,17 +1519,17 @@ msgstr "Mitglieder"
#. module: project
#: model:ir.actions.act_window,name:project.project_task_actions_act_window_merge_tasks
msgid "Merge Selected Tasks"
msgstr ""
msgstr "Ausgewählte Aufgaben zusammenführen"
#. module: project
#: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form
msgid "Merge Tasks"
msgstr ""
msgstr "Aufgaben zusammenführen"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_task_id
msgid "Merge into an existing task"
msgstr ""
msgstr "In eine bestehende Aufgabe zusammenführen"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -1537,7 +1544,7 @@ msgstr "Meine Favoriten"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "My Followed Tasks"
msgstr ""
msgstr "Aufgaben, denen ich folge"
#. module: project
#: model:ir.actions.act_window,name:project.project_task_action_activity
@@ -1560,7 +1567,7 @@ msgstr "Name"
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "Name of the tasks :"
msgstr ""
msgstr "Name der Aufgaben:"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1571,7 +1578,7 @@ msgstr "Neu"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_task_name
msgid "New task name"
msgstr ""
msgstr "Neuer Aufgabenname"
#. module: project
#: code:addons/project/controllers/portal.py:30
@@ -1625,12 +1632,12 @@ msgstr ""
#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_open
msgid "Number of Working Days to Open the task"
msgstr ""
msgstr "Tage bis Aufgabenstart"
#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_close
msgid "Number of Working Days to close the task"
msgstr ""
msgstr "Tage bis Beendigung"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_doc_count
@@ -1741,7 +1748,7 @@ msgstr "Zugehörige Diskussion"
#: model:ir.ui.view,arch_db:project.view_task_form2
#, python-format
msgid "Parent Task"
msgstr ""
msgstr "Hauptaufgabe"
#. module: project
#: model:ir.model.fields,help:project.field_project_project_alias_parent_model_id
@@ -1871,7 +1878,7 @@ msgstr "Projektaufgaben"
#. module: project
#: model:ir.actions.server,name:project.ir_actions_server_project_sample
msgid "Project: Activate Sample Project"
msgstr ""
msgstr "Projekt: Beispielprojekt aktivieren"
#. module: project
#: model:ir.actions.server,name:project.ir_cron_rating_project_ir_actions_server
@@ -1965,7 +1972,7 @@ msgstr "Bewertungen von %s"
#: model:project.task.type,legend_done:project.project_stage_data_1
#: model:project.task.type,legend_done:project.project_stage_data_2
msgid "Ready for Next Stage"
msgstr ""
msgstr "Bereit für nächste Stufe"
#. module: project
#: selection:report.project.task.user,state:0
@@ -1980,7 +1987,7 @@ msgstr "Aufzeichnung Diskussion ID"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_kanban
msgid "Record's Colour"
msgstr ""
msgstr "Datensatzfarbe"
#. module: project
#: selection:project.task,kanban_state:0
@@ -1990,7 +1997,7 @@ msgstr "Rot"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_blocked
msgid "Red Kanban Label"
msgstr ""
msgstr "Rote Kanban-Kennzeichnung"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_code
@@ -2052,7 +2059,7 @@ msgstr "Nachrichten durchsuchen"
#: code:addons/project/controllers/portal.py:95
#, python-format
msgid "Search in Stages"
msgstr ""
msgstr "Stufen durchsuchen"
#. module: project
#. openerp-web
@@ -2106,6 +2113,7 @@ msgstr "Alle Datensätze mit vor heute geplanten Aktionen anzeigen"
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Split your tasks to organize your work into sub-milestones"
msgstr ""
"Teilen Sie Ihre Aufgaben, um Ihre Arbeit in Untermeilensteile zu einzuteilen"
#. module: project
#: code:addons/project/controllers/portal.py:85
@@ -2152,7 +2160,7 @@ msgstr "Markiert"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_priority
msgid "Starred Explanation"
msgstr ""
msgstr "Markierte Erklärung"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_date_start
@@ -2168,12 +2176,12 @@ msgstr "Startdatum"
#: model:ir.model.fields,field_description:project.field_project_project_subtask_project_id
#: model:ir.model.fields,field_description:project.field_project_task_subtask_project_id
msgid "Sub-task Project"
msgstr ""
msgstr "Unteraufgaben-Projekt"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_subtask_count
msgid "Sub-task count"
msgstr ""
msgstr "Anzahl Unteraufgaben"
#. module: project
#: model:ir.actions.act_window,name:project.project_task_action_sub_task
@@ -2181,7 +2189,7 @@ msgstr ""
#: model:ir.model.fields,field_description:project.field_res_config_settings_group_subtask_project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Sub-tasks"
msgstr ""
msgstr "Unteraufgaben"
#. module: project
#: sql_constraint:project.tags:0
@@ -2200,7 +2208,7 @@ msgstr "Stichwörter"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_project_id
msgid "Target Project"
msgstr ""
msgstr "Zielprojekt"
#. module: project
#: model:ir.model,name:project.model_project_task
@@ -2214,7 +2222,7 @@ msgstr "Aufgabe"
#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_task
msgid "Task -"
msgstr ""
msgstr "Aufgabe -"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_tasks
@@ -2345,17 +2353,17 @@ msgstr "Aufgaben nach Benutzer und Projekt"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_task_ids
msgid "Tasks to Merge"
msgstr ""
msgstr "Zusammenzuführende Aufgaben"
#. module: project
#: model:ir.ui.view,arch_db:project.mail_template_task_merge
msgid "The following task has been merged into this one:"
msgstr ""
msgstr "Die folgende Aufgabe wurde in diese zusammengefasst:"
#. module: project
#: model:ir.ui.view,arch_db:project.mail_template_task_merge
msgid "The following tasks have been merged into this one:"
msgstr ""
msgstr "Die folgenden Aufgaben wurden in diese zusammengefasst:"
#. module: project
#: model:ir.model.fields,help:project.field_project_project_alias_model_id
@@ -2394,12 +2402,12 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_projects
msgid "There are no projects."
msgstr ""
msgstr "Es gibt keine Projekte."
#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_tasks
msgid "There are no tasks."
msgstr ""
msgstr "Es gibt keine Aufgaben."
#. module: project
#. openerp-web
@@ -2419,6 +2427,8 @@ msgid ""
"These email addresses will be added to the CC field of all inbound\n"
" and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
msgstr ""
"Diese E-Mail-Adressen werden werden zum CC-Feld aller ein-\n"
"  und ausgehenden E-Mails für diesen Datensatz vor dem Senden hinzugefügt. Mehrere E-Mail-Adressen mit einem Komma abtrennen"
#. module: project
#: model:ir.model.fields,help:project.field_project_task_email_from
@@ -2448,7 +2458,7 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.mail_template_task_merge
msgid "This task has been merged into the following task:"
msgstr ""
msgstr "Diese Aufgabe wurde in der folgenden Aufgabe zusammengefasst:"
#. module: project
#. openerp-web
@@ -2477,7 +2487,7 @@ msgstr "Erwartete Bearbeitungszeit für Aufgaben"
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Time Management"
msgstr ""
msgstr "Zeitmanagement"
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
@@ -2527,7 +2537,7 @@ msgstr "Kundenzufriedenheit für Aufgaben verfolgen"
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Track time spent on projects and tasks"
msgstr ""
msgstr "Zeit für Projekte und Aufgaben aufzeichnen"
#. module: project
#: selection:project.project,rating_status_period:0
@@ -2572,7 +2582,7 @@ msgstr "Nutze Aufgaben als"
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Use collaborative rich text pads on tasks"
msgstr ""
msgstr "Gemeinschaftliches umfassendes Textpad für Aufgaben verwenden"
#. module: project
#. openerp-web
@@ -2641,32 +2651,32 @@ msgstr "Arbeitszeit"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Working Time to Assign"
msgstr ""
msgstr "Zuzuweisende Arbeitszeit"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Working Time to Close"
msgstr ""
msgstr "Arbeitszeit bis Abschluss"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_days_open
msgid "Working days to assign"
msgstr ""
msgstr "Zuzuweisende Arbeitstage"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_days_close
msgid "Working days to close"
msgstr ""
msgstr "Arbeitstage bis Abschluss"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_hours_open
msgid "Working hours to assign"
msgstr ""
msgstr "Zuzuweisende Arbeitsstunden"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_hours_close
msgid "Working hours to close"
msgstr ""
msgstr "Arbeitsstunden bis Abschluss"
#. module: project
#: model:ir.filters,name:project.filter_task_report_workload
@@ -2719,6 +2729,9 @@ msgid ""
"The sub-task's project of the parent task's project should be this task's "
"project"
msgstr ""
"Sie können keine übergeordnete Aufgabe definieren, wenn deren Projekt nicht "
"korrekt konfiguriert ist. Das Projekt der Unteraufgabe des übergeordneten "
"Projekts sollte das Projekt dieser Aufgabe sein"
#. module: project
#: code:addons/project/models/project.py:77
@@ -2759,7 +2772,7 @@ msgstr "oe_kanban_text_red"
#. module: project
#: model:ir.model,name:project.model_project_task_merge_wizard
msgid "project.task.merge.wizard"
msgstr ""
msgstr "project.task.merge.wizard"
#. module: project
#: model:ir.model,name:project.model_res_config_settings
addons/project/i18n/fr.po
+32 -22
View File
@@ -33,13 +33,14 @@
# fr trans <e2ftrans1@yahoo.com>, 2017
# Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017
# e2f <projects@e2f.com>, 2018
# fr trans <e2ffr05@hotmail.com>, 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: e2f <projects@e2f.com>, 2018\n"
"Last-Translator: fr trans <e2ffr05@hotmail.com>, 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"
@@ -309,12 +310,12 @@ msgstr "# Tâches"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_open
msgid "# Working Days to Assign"
msgstr ""
msgstr "Nombre de jours ouvrés à attribuer"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_close
msgid "# Working Days to Close"
msgstr ""
msgstr "Nombre de jours ouvrés à clôturer"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_nbr
@@ -591,7 +592,7 @@ msgstr "Archivé"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Assign to Me"
msgstr ""
msgstr "Me l'assigner"
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_date_start
@@ -644,7 +645,7 @@ msgstr "Pièce jointe"
#. module: project
#: model:ir.model.fields,help:project.field_project_task_attachment_ids
msgid "Attachment that don't come from message."
msgstr ""
msgstr "Les pièces jointes ne provenant pas d'un message."
#. module: project
#: code:addons/project/models/project.py:119
@@ -749,6 +750,8 @@ msgid ""
"Choosing a sub-tasks project will both enable sub-tasks and set their "
"default project (possibly the project itself)"
msgstr ""
"Choisir un projet à sous-tâches permet à la fois d'activer les sous-tâches "
"et de définir leur projet par défaut (éventuellement le projet lui-même)"
#. module: project
#. openerp-web
@@ -1180,7 +1183,7 @@ msgstr "Vert"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_done
msgid "Green Kanban Label"
msgstr ""
msgstr "Étiquette Kanban verte"
#. module: project
#: selection:project.task,kanban_state:0
@@ -1190,7 +1193,7 @@ msgstr "Gris"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_normal
msgid "Grey Kanban Label"
msgstr ""
msgstr "Étiquette Kanban grise"
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
@@ -1472,6 +1475,8 @@ msgid ""
"Lets the company customize which Pad installation should be used to link to "
"new pads (for example: http://etherpad.com/)."
msgstr ""
"Permet à l'entreprise de personnaliser l'installation du pad à utiliser pour"
" créer des liens vers de nouveaux pads (exemple : http://etherpad.com/)."
#. module: project
#: model:ir.model.fields,help:project.field_project_project_analytic_account_id
@@ -1563,7 +1568,7 @@ msgstr "Nom"
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "Name of the tasks :"
msgstr ""
msgstr "Nom de la tâche :"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1626,12 +1631,12 @@ msgstr "Maintenant que le projet est en place, <b>créez quelques tâches</b>."
#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_open
msgid "Number of Working Days to Open the task"
msgstr ""
msgstr "Nombre de jours ouvrés pour ouvrir la tâche"
#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user_working_days_close
msgid "Number of Working Days to close the task"
msgstr ""
msgstr "Nombre de jours ouvrés pour clôturer la tâche"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_doc_count
@@ -1982,7 +1987,7 @@ msgstr "ID de l'enregistrement du fil"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_kanban
msgid "Record's Colour"
msgstr ""
msgstr "Couleur de l'enregistrement"
#. module: project
#: selection:project.task,kanban_state:0
@@ -1992,7 +1997,7 @@ msgstr "Rouge"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_blocked
msgid "Red Kanban Label"
msgstr ""
msgstr "Indicateur Kanban rouge"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_code
@@ -2054,7 +2059,7 @@ msgstr "Rechercher dans Messages"
#: code:addons/project/controllers/portal.py:95
#, python-format
msgid "Search in Stages"
msgstr ""
msgstr "Rechercher dans Étapes"
#. module: project
#. openerp-web
@@ -2109,7 +2114,7 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Split your tasks to organize your work into sub-milestones"
msgstr ""
msgstr "Divisez vos tâches pour organiser votre travail en sous-étapes"
#. module: project
#: code:addons/project/controllers/portal.py:85
@@ -2156,7 +2161,7 @@ msgstr "Favoris"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_type_legend_priority
msgid "Starred Explanation"
msgstr ""
msgstr "Explication des étoiles"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_date_start
@@ -2424,6 +2429,8 @@ msgid ""
"These email addresses will be added to the CC field of all inbound\n"
" and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
msgstr ""
"Ces adresses e-mail seront ajoutées au champ CC (Copie à) de tous les e-mails entrants\n"
" et sortants pour cet enregistrement après leur envoi. Séparez les adresses multiples avec une virgule."
#. module: project
#: model:ir.model.fields,help:project.field_project_task_email_from
@@ -2580,7 +2587,7 @@ msgstr "Utilisez les tâches comme"
#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Use collaborative rich text pads on tasks"
msgstr ""
msgstr "Utiliser un pad collaboratif à texte riche sur les tâches"
#. module: project
#. openerp-web
@@ -2648,32 +2655,32 @@ msgstr "Temps de travail"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Working Time to Assign"
msgstr ""
msgstr "Temps de travail pour attribuer"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Working Time to Close"
msgstr ""
msgstr "Temps de travail pour clôturer"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_days_open
msgid "Working days to assign"
msgstr ""
msgstr "Jours de travail pour attribuer"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_days_close
msgid "Working days to close"
msgstr ""
msgstr "Jours de travail pour clôturer"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_hours_open
msgid "Working hours to assign"
msgstr ""
msgstr "Heures de travail pour attribuer"
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_working_hours_close
msgid "Working hours to close"
msgstr ""
msgstr "Heures ouvrées pour clôturer une tâche"
#. module: project
#: model:ir.filters,name:project.filter_task_report_workload
@@ -2726,6 +2733,9 @@ msgid ""
"The sub-task's project of the parent task's project should be this task's "
"project"
msgstr ""
"Vous ne pouvez pas définir une tâche parente si le projet auquel elle "
"appartient n'est pas correctement configuré. Le projet de la sous-tâche ou "
"le projet de la tâche parente doit correspondre au projet de cette tâche."
#. module: project
#: code:addons/project/models/project.py:77
addons/project/i18n/zh_CN.po
+2 -2
View File
@@ -834,7 +834,7 @@ msgstr "任务的当前阶段"
#. module: project
#: model:ir.actions.act_window,help:project.project_task_action_activity
msgid "Currently there are not any activity scheduled."
msgstr ""
msgstr "目前，未计划任何活动。"
#. module: project
#: code:addons/project/models/project.py:897
@@ -1429,7 +1429,7 @@ msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.project_task_action_activity
msgid "My Next Activities"
msgstr ""
msgstr "我的下一个活动"
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
addons/project/models/project.py
+2 -6
View File
@@ -610,16 +610,12 @@ class Task(models.Model):
@api.onchange('project_id')
def _onchange_project(self):
default_partner_id = self.env.context.get('default_partner_id')
default_partner = self.env['res.partner'].browse(default_partner_id) if default_partner_id else self.env['res.partner']
if self.project_id:
if not self.parent_id and not self.partner_id:
self.partner_id = self.project_id.partner_id or default_partner
if not self.parent_id and self.project_id.partner_id:
self.partner_id = self.project_id.partner_id
if self.project_id not in self.stage_id.project_ids:
self.stage_id = self.stage_find(self.project_id.id, [('fold', '=', False)])
else:
if not self.parent_id:
self.partner_id = default_partner
self.stage_id = False
@api.onchange('user_id')
addons/project_timesheet_holidays/i18n/fr.po
+17 -6
View File
@@ -4,15 +4,16 @@
#
# Translators:
# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
# Martin Trigaux <mat@odoo.com>, 2017
# Martin Trigaux, 2017
# Xavier Belmere <Info@cartmeleon.com>, 2017
# e2f <projects@e2f.com>, 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: Xavier Belmere <Info@cartmeleon.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
@@ -40,6 +41,8 @@ msgstr "Sociétés"
#: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
msgid "Default project value for timesheet generated from leave type."
msgstr ""
"Valeur du projet par défaut pour la feuille de temps générée à partir du "
"type de congés."
#. module: project_timesheet_holidays
#: code:addons/project_timesheet_holidays/models/hr_holidays.py:30
@@ -48,11 +51,13 @@ msgid ""
"For the leaves to generate timesheet, the internal project and task are "
"requried."
msgstr ""
"Pour que le congé génère une feuille de temps, le projet interne et la tâche"
" doivent être spécifiés."
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
msgid "Generate Timesheet"
msgstr ""
msgstr "Générer une feuille de temps"
#. module: project_timesheet_holidays
#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
@@ -60,6 +65,8 @@ msgid ""
"If checked, when validating a leave, timesheet will be generated in the "
"Vacation Project of the company."
msgstr ""
"Si cette option est cochée, lors de la validation d'un congé, une feuille de"
" temps sera générée dans le projet Vacances de l'entreprise."
#. module: project_timesheet_holidays
#: code:addons/project_timesheet_holidays/models/res_company.py:30
@@ -68,12 +75,12 @@ msgstr ""
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
#, python-format
msgid "Internal Project"
msgstr ""
msgstr "Projet interne"
#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_task_id
msgid "Internal Task for timesheet"
msgstr ""
msgstr "Tâche interne pour la feuille de temps"
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays
@@ -89,7 +96,7 @@ msgstr "Demande de congé"
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_task_id
msgid "Leave Task"
msgstr ""
msgstr "Tâche Congé"
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays_status
@@ -117,6 +124,8 @@ msgstr "Tâche"
msgid ""
"The project will contain the timesheet generated when a leave is validated."
msgstr ""
"Le projet contiendra la feuille de temps générée lors de la validation d'un "
"congé."
#. module: project_timesheet_holidays
#: model:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
@@ -130,6 +139,8 @@ msgid ""
"You cannot delete timesheet lines attached to a leaves. Please cancel the "
"leaves instead."
msgstr ""
"Vous ne pouvez pas supprimer une ligne de feuille de temps associée à un "
"congé. Annulez plutôt le congé."
#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
addons/purchase/i18n/fr.po
+8 -5
View File
@@ -4,16 +4,16 @@
#
# Translators:
# Xavier Belmere <Info@cartmeleon.com>, 2016
# Martin Trigaux <mat@odoo.com>, 2016
# Martin Trigaux, 2016
# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
# Lucas Deliege <lud@odoo.com>, 2016
# Clo <clo@odoo.com>, 2016
# Lionel Sausin <ls@numerigraphe.com>, 2016
# Fabrice Henrion <fhe@odoo.com>, 2016
# Fabrice Henrion, 2016
# Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2016
# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
# Fabien Pinckaers <fp@openerp.com>, 2016
# Florian Hatat <mininet@wanadoo.fr>, 2016
# Florian Hatat, 2016
# Simon CARRIER <carrier.sim@gmail.com>, 2016
# Nancy Bolognesi <nb@microcom.ca>, 2016
# Melanie Bernard <mbe@odoo.com>, 2016
@@ -39,13 +39,14 @@
# fr rev <e2ffr02@hotmail.com>, 2017
# Bertrand LATOUR <divoir@gmail.com>, 2017
# fr rev <e2ffr04@hotmail.com>, 2017
# e2f <projects@e2f.com>, 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: fr rev <e2ffr04@hotmail.com>, 2017\n"
"Last-Translator: e2f <projects@e2f.com>, 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"
@@ -466,6 +467,8 @@ msgid ""
"A sale order that generated this purchase order has been deleted. Check if "
"an action is needed."
msgstr ""
"Un bon de commande à l'origine de cette commande a été supprimé. Vérifiez si"
" une action doit être effectué."
#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_order_line_product_type
@@ -1040,7 +1043,7 @@ msgstr "Est expédié"
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_config_settings_is_installed_sale
msgid "Is the Sale Module Installed"
msgstr ""
msgstr "Le module Vente est-il installé ?"
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order___last_update
addons/purchase/models/account_invoice.py
+3 -3
View File
@@ -192,13 +192,13 @@ class AccountInvoice(models.Model):
if child.type_tax_use != 'none':
tax_ids.append((4, child.id, None))
price_before = line.get('price', 0.0)
line.update({'price': company_currency.round(valuation_price_unit * line['quantity'])})
line.update({'price': inv.currency_id.round(valuation_price_unit * line['quantity'])})
diff_res.append({
'type': 'src',
'name': i_line.name[:64],
'price_unit': company_currency.round(price_unit - valuation_price_unit),
'price_unit': inv.currency_id.round(price_unit - valuation_price_unit),
'quantity': line['quantity'],
'price': company_currency.round(price_before - line.get('price', 0.0)),
'price': inv.currency_id.round(price_before - line.get('price', 0.0)),
'account_id': acc,
'product_id': line['product_id'],
'uom_id': line['uom_id'],
addons/purchase/models/purchase.py
+9 -2
View File
@@ -746,7 +746,7 @@ class PurchaseOrderLine(models.Model):
qty = 0.0
price_unit = self._get_stock_move_price_unit()
for move in self.move_ids.filtered(lambda x: x.state != 'cancel' and not x.location_dest_id.usage == "supplier"):
qty += move.product_qty
qty += move.product_uom._compute_quantity(move.product_uom_qty, self.product_uom, rounding_method='HALF-UP')
template = {
'name': self.name or '',
'product_id': self.product_id.id,
@@ -770,7 +770,14 @@ class PurchaseOrderLine(models.Model):
}
diff_quantity = self.product_qty - qty
if float_compare(diff_quantity, 0.0, precision_rounding=self.product_uom.rounding) > 0:
template['product_uom_qty'] = diff_quantity
quant_uom = self.product_id.uom_id
get_param = self.env['ir.config_parameter'].sudo().get_param
if self.product_uom.id != quant_uom.id and get_param('stock.propagate_uom') != '1':
product_qty = self.product_uom._compute_quantity(diff_quantity, quant_uom, rounding_method='HALF-UP')
template['product_uom'] = quant_uom.id
template['product_uom_qty'] = product_qty
else:
template['product_uom_qty'] = diff_quantity
res.append(template)
return res
addons/purchase/tests/test_create_picking.py
+50
View File
@@ -174,3 +174,53 @@ class TestCreatePicking(common.TestProductCommon):
customer_move._action_assign()
self.assertEqual(customer_move.state, 'assigned', 'Reservation should work with the new quantity provided by the PO.')
def test_03_uom(self):
""" Buy a dozen of products stocked in units. Check that the quantities on the purchase order
lines as well as the received quantities are handled in dozen while the moves themselves
are handled in units. Edit the ordered quantities, check that the quantites are correctly
updated on the moves. Edit the ir.config_parameter to propagate the uom of the purchase order
lines to the moves and edit a last time the ordered quantities. Receive, check the quantities.
"""
uom_unit = self.env.ref('product.product_uom_unit')
uom_dozen = self.env.ref('product.product_uom_dozen')
self.assertEqual(self.product_id_1.uom_po_id.id, uom_unit.id)
# buy a dozen
po = self.env['purchase.order'].create(self.po_vals)
po.order_line.product_qty = 1
po.order_line.product_uom = uom_dozen.id
po.button_confirm()
# the move should be 12 units
# note: move.product_qty = computed field, always in the uom of the quant
# move.product_uom_qty = stored field representing the initial demand in move.product_uom
move1 = po.picking_ids.move_lines[0]
self.assertEqual(move1.product_uom_qty, 12)
self.assertEqual(move1.product_uom.id, uom_unit.id)
self.assertEqual(move1.product_qty, 12)
# edit the so line, sell 2 dozen, the move should now be 24 units
po.order_line.product_qty = 2
self.assertEqual(move1.product_uom_qty, 24)
self.assertEqual(move1.product_uom.id, uom_unit.id)
self.assertEqual(move1.product_qty, 24)
# force the propagation of the uom, sell 3 dozen
self.env['ir.config_parameter'].sudo().set_param('stock.propagate_uom', '1')
po.order_line.product_qty = 3
move2 = po.picking_ids.move_lines.filtered(lambda m: m.product_uom.id == uom_dozen.id)
self.assertEqual(move2.product_uom_qty, 1)
self.assertEqual(move2.product_uom.id, uom_dozen.id)
self.assertEqual(move2.product_qty, 12)
# deliver everything
move1.quantity_done = 24
move2.quantity_done = 1
po.picking_ids.button_validate()
# check the delivered quantity
self.assertEqual(po.order_line.qty_received, 3.0)
addons/purchase/tests/test_stockvaluation.py
+73
View File
@@ -198,3 +198,76 @@ class TestStockValuation(TransactionCase):
self.assertAlmostEqual(move1.price_unit, price_unit_usd_new_rate, places=2)
self.assertAlmostEqual(self.product1.stock_value, price_unit_usd_new_rate * 10, delta=0.1)
def test_extra_move_fifo_1(self):
""" Check that the extra move when over processing a receipt is correctly merged back in
the original move.
"""
self.product1.product_tmpl_id.cost_method = 'fifo'
po1 = self.env['purchase.order'].create({
'partner_id': self.partner_id.id,
'order_line': [
(0, 0, {
'name': self.product1.name,
'product_id': self.product1.id,
'product_qty': 10.0,
'product_uom': self.product1.uom_po_id.id,
'price_unit': 100.0,
'date_planned': datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
}),
],
})
po1.button_confirm()
picking1 = po1.picking_ids[0]
move1 = picking1.move_lines[0]
move1.quantity_done = 15
res_dict = picking1.button_validate()
self.assertEqual(res_dict['res_model'], 'stock.overprocessed.transfer')
wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
wizard.action_confirm()
# there should be only one move
self.assertEqual(len(picking1.move_lines), 1)
self.assertEqual(move1.price_unit, 100)
self.assertEqual(move1.product_qty, 15)
self.assertEqual(self.product1.stock_value, 1500)
def test_backorder_fifo_1(self):
""" Check that the backordered move when under processing a receipt correctly keep the
price unit of the original move.
"""
self.product1.product_tmpl_id.cost_method = 'fifo'
po1 = self.env['purchase.order'].create({
'partner_id': self.partner_id.id,
'order_line': [
(0, 0, {
'name': self.product1.name,
'product_id': self.product1.id,
'product_qty': 10.0,
'product_uom': self.product1.uom_po_id.id,
'price_unit': 100.0,
'date_planned': datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
}),
],
})
po1.button_confirm()
picking1 = po1.picking_ids[0]
move1 = picking1.move_lines[0]
move1.quantity_done = 5
res_dict = picking1.button_validate()
self.assertEqual(res_dict['res_model'], 'stock.backorder.confirmation')
wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id'))
wizard.process()
self.assertEqual(len(picking1.move_lines), 1)
self.assertEqual(move1.price_unit, 100)
self.assertEqual(move1.product_qty, 5)
picking2 = po1.picking_ids.filtered(lambda p: p.backorder_id)
move2 = picking2.move_lines[0]
self.assertEqual(len(picking2.move_lines), 1)
self.assertEqual(move2.price_unit, 100)
self.assertEqual(move2.product_qty, 5)

Some files were not shown because too many files have changed in this diff Show More