From 799590426f5edec59717562539150c3e2b2ab305 Mon Sep 17 00:00:00 2001 From: Lionel Sausin Date: Tue, 11 Jun 2013 14:43:38 +0200 Subject: [PATCH 01/50] [FIX] propagate context through stock.move.action_cancel() bzr revid: ls@numerigraphe.fr-20130611124338-644rre13nhmnesvv --- addons/stock/stock.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b632101208f..92b378fe315 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1962,15 +1962,15 @@ class stock_move(osv.osv): if move.picking_id: pickings[move.picking_id.id] = True if move.move_dest_id and move.move_dest_id.state == 'waiting': - self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'}) + self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'}, context=context) if context.get('call_unlink',False) and move.move_dest_id.picking_id: wf_service = netsvc.LocalService("workflow") wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr) - self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}) + self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}, context=context) if not context.get('call_unlink',False): for pick in self.pool.get('stock.picking').browse(cr, uid, pickings.keys()): if all(move.state == 'cancel' for move in pick.move_lines): - self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}) + self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}, context=context) wf_service = netsvc.LocalService("workflow") for id in ids: From f29f1e6f049428e205dcadcb613857822e24c990 Mon Sep 17 00:00:00 2001 From: "Mohammed Shekha (OpenERP)" Date: Tue, 4 Mar 2014 16:36:59 +0530 Subject: [PATCH 02/50] [FIX]Fixed the issue of o2m sorting by column, m2o field does not give proper result for sorting because whole value of m2o [id, value] going to compare for sorting. bzr revid: msh@openerp.com-20140304110659-4uu38feetsjj0tt5 --- addons/web/static/src/js/data.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index abfb4c15347..e7dc81ef787 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -877,6 +877,10 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({ sign = -1; field = field.slice(1); } + //m2o should be searched based on value[1] not based whole value(i.e. [id, value]) + if(_.isArray(a[field]) && a[field].length == 2 && _.isString(a[field][1])){ + return sign * compare(a[field][1], b[field][1]); + } return sign * compare(a[field], b[field]); }, 0); }); From 4235dc8e88378d013d74d85f1b4f18e7ce4b6882 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 10 Mar 2014 14:33:14 +0100 Subject: [PATCH 03/50] [REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves. Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name". bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2 --- addons/sale/sale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 2673465b01b..bdadc4489da 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -209,8 +209,8 @@ class sale_order(osv.osv): 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), 'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True, track_visibility='onchange'), 'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True, track_visibility='always'), - 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', domain="[('parent_id','=',partner_id)]", readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."), - 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]", readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."), + 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."), + 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."), 'order_policy': fields.selection([ ('manual', 'On Demand'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, From a4c27d560d12762640e89a0ecf6f1cae13aceef4 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 11 Mar 2014 06:08:54 +0000 Subject: [PATCH 04/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072259-nwltzdp1dky79a3h bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065331-um114asu0v6l8y5e bzr revid: launchpad_translations_on_behalf_of_openerp-20140311060830-c174n48jvgwwgvlo bzr revid: launchpad_translations_on_behalf_of_openerp-20140311060854-j335qf61ll6hvrma --- addons/account/i18n/id.po | 65 ++++++++++++++++++------- addons/account_check_writing/i18n/nl.po | 8 +-- addons/account_voucher/i18n/nl.po | 10 ++-- openerp/addons/base/i18n/cs.po | 19 ++++---- openerp/addons/base/i18n/id.po | 63 ++++++++++++++++++++++-- openerp/addons/base/i18n/ja.po | 2 +- openerp/addons/base/i18n/nl.po | 8 +-- 7 files changed, 129 insertions(+), 46 deletions(-) diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index bd04d19de68..4ee51fb1982 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-10 19:00+0000\n" +"Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:51+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n" +"X-Generator: Launchpad (build 16948)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -34,13 +34,13 @@ msgid "" "Determine the display order in the report 'Accounting \\ Reporting \\ " "Generic Reporting \\ Taxes \\ Taxes Report'" msgstr "" -"Menentukan urutan tampilan dalam laporan 'Akunting\\Pelaporan\\Pelaporan " -"Generik\\Pajak\\Laporan Pjak'" +"Menentukan urutan tampilan dalam laporan 'Accounting \\ Reporting \\ Generic " +"Reporting \\ Taxes \\ Taxes Report'" #. module: account #: view:res.partner:0 msgid "the parent company" -msgstr "" +msgstr "perusahaan induk" #. module: account #: view:account.move.reconcile:0 @@ -68,7 +68,7 @@ msgstr "Sisa" #: code:addons/account/account_bank_statement.py:369 #, python-format msgid "Journal item \"%s\" is not valid." -msgstr "Jurnal item \"%s\" tidak valid" +msgstr "Item \"%s\" dalam Jurnal tidak valid" #. module: account #: model:ir.model,name:account.model_report_aged_receivable @@ -86,7 +86,7 @@ msgstr "Impor dari tagihan atau pembayaran" #: code:addons/account/account_move_line.py:1210 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Akun Salah" #. module: account #: view:account.move:0 @@ -172,6 +172,9 @@ msgid "" "which is set after generating opening entries from 'Generate Opening " "Entries'." msgstr "" +"Anda harus menetapkan 'End of Year Entries Journal' untuk tahun fiskal ini, " +"yang akan ditetapkan setelah menghasilkan entri awal dari 'Generate Opening " +"Entries'" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -190,6 +193,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik untuk menambah periode fiskal\n" +"

\n" +" Satu periode akunting biasanya adalah satu bulan atau satu " +"kuartal. \n" +" Biasanya terkait dengan periode pajak.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -204,7 +215,7 @@ msgstr "Nama Kolom" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Jumlah digit untuk kode akun" #. module: account #: help:account.analytic.journal,type:0 @@ -224,6 +235,9 @@ msgid "" "lines for invoices. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Set akun analitik yang akan digunakan sebagai default pada baris pajak " +"tagihan dalam invoice. Biarkan kosong jika anda tidak ingin menggunakan akun " +"analitik pada baris pajak tagihan sebagai default." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -249,12 +263,12 @@ msgstr "Laporan menurut standar Belgia" #. module: account #: model:mail.message.subtype,name:account.mt_invoice_validated msgid "Validated" -msgstr "" +msgstr "Tervalidasi" #. module: account #: model:account.account.type,name:account.account_type_income_view1 msgid "Income View" -msgstr "" +msgstr "View Pendapatan" #. module: account #: help:account.account,user_type:0 @@ -270,7 +284,7 @@ msgstr "" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Nomor catatan kredit berikutnya" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -279,6 +293,9 @@ msgid "" "sales, purchase, expense, contra, etc.\n" " This installs the module account_voucher." msgstr "" +"Ini mencakup seluruh kebutuhan dasar untuk entri voucher bank, kas, " +"penjualan, pembelian, biaya, kontra, dsb.\n" +" Menginstal modul account_voucher." #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -310,6 +327,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik untuk membentuk refund dana pelanggan.\n" +"

\n" +" Refund adalah dokumen yang meng-kredit tagihan seluruhnya " +"atau \n" +" sebagian.\n" +"

\n" +" Anda dapat menerbitkan refund langsung dari tagihan " +"pelanggan,\n" +" tidak harus diterbitkan secara manual.\n" +"

\n" +" " #. module: account #: help:account.installer,charts:0 @@ -328,7 +357,7 @@ msgstr "Pembatalan Rekonsiliasi Akun" #. module: account #: field:account.config.settings,module_account_budget:0 msgid "Budget management" -msgstr "" +msgstr "Manajemen anggaran" #. module: account #: view:product.template:0 @@ -349,13 +378,13 @@ msgstr "" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Izinkan mata uang jamak" #. module: account #: code:addons/account/account_invoice.py:77 #, python-format msgid "You must define an analytic journal of type '%s'!" -msgstr "" +msgstr "Anda harus mendefinisikan jurnal analitik tipe '%s'!" #. module: account #: selection:account.entries.report,month:0 @@ -370,12 +399,12 @@ msgstr "Juni" #: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile." -msgstr "" +msgstr "Anda harus memilih akun untuk di rekonsiliasi" #. module: account #: help:account.config.settings,group_analytic_accounting:0 msgid "Allows you to use the analytic accounting." -msgstr "" +msgstr "Mengizinkan anda menggunakan akunting analitik" #. module: account #: view:account.invoice:0 diff --git a/addons/account_check_writing/i18n/nl.po b/addons/account_check_writing/i18n/nl.po index a90f253c9f9..20d99736812 100644 --- a/addons/account_check_writing/i18n/nl.po +++ b/addons/account_check_writing/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-25 14:36+0000\n" +"PO-Revision-Date: 2014-03-10 20:45+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n" +"X-Generator: Launchpad (build 16948)\n" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -25,7 +25,7 @@ msgstr "Cheque boven" #. module: account_check_writing #: report:account.print.check.top:0 msgid "Open Balance" -msgstr "Open balans" +msgstr "Openstaand bedrag" #. module: account_check_writing #: view:account.check.write:0 diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po index bb354bcae59..9513d876648 100644 --- a/addons/account_voucher/i18n/nl.po +++ b/addons/account_voucher/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-19 09:56+0000\n" +"PO-Revision-Date: 2014-03-10 20:43+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-20 05:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n" +"X-Generator: Launchpad (build 16948)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -488,7 +488,7 @@ msgid "" "At the operation date, the exchange rate was\n" "%s = %s" msgstr "" -"Op de verwerkingsdatum, was de valutakoer\n" +"Op de verwerkingsdatum, was de valutakoers\n" "%s = %s" #. module: account_voucher @@ -1359,7 +1359,7 @@ msgstr "Relatie" #. module: account_voucher #: field:account.voucher.line,amount_unreconciled:0 msgid "Open Balance" -msgstr "Open balans" +msgstr "Openstaand bedrag" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:1106 diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index 4c0848246d0..1de34103c72 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2014-01-07 16:17+0000\n" -"Last-Translator: Maros Tarbajovsky \n" +"PO-Revision-Date: 2014-03-07 20:45+0000\n" +"Last-Translator: Marek Stopka \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-08 05:38+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n" +"X-Generator: Launchpad (build 16948)\n" "X-Language: cs_CZ\n" "X-Source-Language: en\n" @@ -71,7 +71,7 @@ msgstr "Zobrazení architektury" #. module: base #: model:ir.module.module,summary:base.module_sale_stock msgid "Quotation, Sale Orders, Delivery & Invoicing Control" -msgstr "Nabídky, zakázky, řízení dopravy a fakturace" +msgstr "Nabídky, zakázky, řízení dodávek a fakturace" #. module: base #: selection:ir.sequence,implementation:0 @@ -94,8 +94,7 @@ msgid "" "Helps you manage your projects and tasks by tracking them, generating " "plannings, etc..." msgstr "" -"Pomůže vám spravovat projekty a úkoly jejich sledováním, generováním plánů, " -"apod." +"Pomůže vám řídit projekty a úkoly jejich sledováním, generováním plánů, aj." #. module: base #: model:ir.module.module,summary:base.module_point_of_sale @@ -165,7 +164,7 @@ msgstr "" #. module: base #: help:res.partner,employee:0 msgid "Check this box if this contact is an Employee." -msgstr "Zaškrtněte toto pole, pokud je kontakt zaměstnanec." +msgstr "Zaškrtněte toto pole, pokud je kontakt zaměstnancem." #. module: base #: help:ir.model.fields,domain:0 @@ -11295,7 +11294,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_product_visible_discount msgid "Prices Visible Discounts" -msgstr "" +msgstr "Zobrazení slevy u ceny" #. module: base #: field:ir.attachment,datas:0 @@ -16098,7 +16097,7 @@ msgstr "Automatická instalace" #. module: base #: view:base.language.import:0 msgid "e.g. en_US" -msgstr "" +msgstr "např. en_US" #. module: base #: model:ir.module.module,description:base.module_l10n_hn diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index df2e90f4321..7d8cc6a4f14 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2014-02-01 05:58+0000\n" -"Last-Translator: Kristi Hari \n" +"PO-Revision-Date: 2014-03-10 19:22+0000\n" +"Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-02 05:59+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n" +"X-Generator: Launchpad (build 16948)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -216,6 +216,15 @@ msgid "" "revenue\n" "reports." msgstr "" +"\n" +"Bentuk tagihan anda dari entri Expenses, Timesheet.\n" +"========================================================\n" +"\n" +"Modul untuk menerbitkan tagihan berbasis biaya (sdm, biaya, dsb).\n" +"\n" +"Anda dapat mendefinisikan daftar harga pada akun analitik, membuat laporan " +"anggaran \n" +"penghasilan." #. module: base #: code:addons/base/ir/ir_sequence.py:134 @@ -325,6 +334,37 @@ msgid "" "launchpad:\n" " https://launchpad.net/openerp-swiss-localization\n" msgstr "" +"\n" +" Lokalisasi Swiss :\n" +" ====================\n" +" **Multilang swiss STERCHI account chart and taxes**\n" +" **Penulis:** Camptocamp SA\n" +"\n" +" **Kontributor finansial:** Prisme Solutions Informatique SA, Quod SA\n" +"\n" +" **Kontributor terjemahan:** brain-tec AG, Agile Business Group\n" +"\n" +" **Rilisi ini akan memperkenalkan perubahan besar pada l10n_ch.**\n" +"\n" +" Sehubungan dengan kebutuhan refaktoring yang penting, dan adopsi " +"Switzerland atas strandar pembayaran internasional yang baru selama 2013-" +"2014. Kami mengorganisasikan addons lokalisasi swiss dengan cara berikut: \n" +"\n" +" - **l10n_ch**: Akun multilang swiss STERCHI diagram and pajak (addon " +"resmi)\n" +" - **l10n_ch_base_bank**: Modul teknis yang memperkenalkan versi baru dari " +"manajemen tipe bank yang lebih mudah.\n" +" - **l10n_ch_bank**: Daftar bank-bank swiss \n" +" - **l10n_ch_zip**: Daftar kotak pos swiss\n" +" - **l10n_ch_dta**: Dukungan protokol pembayaran dta (akan diakhiri pada " +"akhir 2014)\n" +" - **l10n_ch_payment_slip**: Dukungan slip dan rekonsliasi pembayaran " +"ESR/BVR. Laporan refaktor dengan penempatan elemen yang mudah.\n" +" - **l10n_ch_sepa**: Implementasi alfa dari dukungan PostFinance SEPA/PAIN " +"akan diselesaikan dalam 2013/2014\n" +"\n" +" Modul-modul akan tersedia pada lokalisasi Swiss OpenERP pada launchpad: \n" +" https://launchpad.net/openerp-swiss-localization\n" #. module: base #: model:res.groups,name:base.group_multi_currency @@ -341,6 +381,12 @@ msgid "" "\n" " " msgstr "" +"\n" +"Lokalisasi skema akunting dan pajak Chili.\n" +"==============================================\n" +"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n" +"\n" +" " #. module: base #: model:ir.module.module,shortdesc:base.module_sale @@ -440,6 +486,15 @@ msgid "" "invoices from picking, OpenERP is able to add and compute the shipping " "line.\n" msgstr "" +"\n" +"Mengizinkan anda untuk menambahkan metode deliveri pada order penjualan dan " +"pengambilan.\n" +"==============================================================\n" +"\n" +"Anda dapat menentukan carrier sendiri dan metode antar untuk harga tersebut. " +"Saat membuat\n" +"tagihan dari pengantaran, OpenERP dapat menambah dan menghitung biaya " +"pengiriman.\n" #. module: base #: code:addons/base/ir/ir_filters.py:80 diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index 9d276888ff4..288297863a1 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n" +"X-Launchpad-Export-Date: 2014-03-07 07:22+0000\n" "X-Generator: Launchpad (build 16948)\n" #. module: base diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index e84881a4ff4..04b3c4e54d1 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2014-02-12 12:26+0000\n" +"PO-Revision-Date: 2014-03-07 12:12+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-13 06:47+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n" +"X-Generator: Launchpad (build 16948)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -13601,7 +13601,7 @@ msgstr "" #. module: base #: selection:res.currency,position:0 msgid "Before Amount" -msgstr "Voormalig bedrag" +msgstr "Voor bedrag" #. module: base #: field:res.request,act_from:0 From c033e5a5351a070043131720faf8f8f7df669571 Mon Sep 17 00:00:00 2001 From: Xavier ALT <> Date: Tue, 11 Mar 2014 10:15:22 +0100 Subject: [PATCH 05/50] [FIX] web: on SearchPopup creation concat build context even if we have initial_ids On SearchPopupCreation, if we have initial_ids - 1st search_read() will be missing custom context defined on the field. 1. defined view like this: 2. in we expand the list of available item, name_search() has 'test' in context 3. in we click on 'Search More', search_read() is missing 'test' in context 4. if we change filter add/remove item, search_read() will have 'test' in context Step 3. is wrong, should also have 'test' in context lp bug: https://launchpad.net/bugs/1209295 fixed bzr revid: mat@openerp.com-20140311091522-03imwd5rj3rmwapl --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 706bee5bd1a..edb44e7ea06 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4796,7 +4796,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend this.searchview.on('search_data', self, function(domains, contexts, groupbys) { if (self.initial_ids) { self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]), - contexts, groupbys); + contexts.concat(self.context), groupbys); self.initial_ids = undefined; } else { self.do_search(domains.concat([self.domain]), contexts.concat(self.context), groupbys); From 6e9f3ad8064bcd8491e85817d704aba6eb0d944c Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 11 Mar 2014 11:49:47 +0100 Subject: [PATCH 06/50] [FIX] web: set z-index of 9999 for autocompletion pane of search bar, to avoid being behind jquery ui dialogs. Besides, this pane should always be on top, therefore we can assume that setting 9999 will not have bad side effects bzr revid: dle@openerp.com-20140311104947-is5qpw71y1m2oakf --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index ad212d7f86d..b82ad6504a9 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -341,7 +341,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } }, 'autocompleteopen': function () { - this.$el.autocomplete('widget').css('z-index', 1004); + this.$el.autocomplete('widget').css('z-index', 9999); }, }, /** From 8a3523cd9721ecfbc860464b66f4b8db7b0c717f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 11 Mar 2014 12:23:41 +0100 Subject: [PATCH 07/50] [FIX] partner: backport of trunk revision 4882 When adding a new contact or a new company based from the partner form, use the customer value as default value (was doign it only for the supplier flag) bzr revid: mat@openerp.com-20140311112341-9yoi1hf0ks98ju3r --- openerp/addons/base/res/res_partner_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 8236e0b283e..9ff9649b8b7 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -138,7 +138,7 @@ @@ -186,7 +186,7 @@ - + @@ -286,6 +286,7 @@ + From 5041f63b353c82267b8669dfb0811e15246ef6d4 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 11 Mar 2014 16:04:46 +0100 Subject: [PATCH 08/50] [FIX] crm: write a value to date_closed field as well if change directly the stage instead of using buttons (which will probably be removed later) bzr revid: mat@openerp.com-20140311150446-0atbc6esymjyv69e --- addons/crm/crm_lead.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 28f89533ac3..bd3c6f33f4e 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -926,11 +926,14 @@ class crm_lead(base_stage, format_address, osv.osv): return res def write(self, cr, uid, ids, vals, context=None): - if vals.get('stage_id') and not vals.get('probability'): - # change probability of lead(s) if required by stage + if vals.get('stage_id'): stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context) - if stage.on_change: + if not vals.get('probability') and stage.on_change: + # change probability of lead(s) if required by stage vals['probability'] = stage.probability + # set closed date when won or lost + if not vals.get('date_closed') and (vals.get('probability', 0) >= 100 or stage.state == 'canceled'): + vals['date_closed'] = fields.datetime.now() return super(crm_lead, self).write(cr, uid, ids, vals, context=context) def copy(self, cr, uid, id, default=None, context=None): From 65d0a0733d9f26ee10654d521d67d9a363c24969 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 11 Mar 2014 17:03:07 +0100 Subject: [PATCH 09/50] [FIX] portal: expensive copy/paste typo bzr revid: odo@openerp.com-20140311160307-lth3kmu9z4h3l8c1 --- addons/portal/mail_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py index 211cf74a88f..428b1be3c4b 100644 --- a/addons/portal/mail_message.py +++ b/addons/portal/mail_message.py @@ -42,7 +42,7 @@ class mail_message(osv.Model): args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args) return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order, - context=context, count=False, access_rights_uid=access_rights_uid) + context=context, count=count, access_rights_uid=access_rights_uid) def check_access_rule(self, cr, uid, ids, operation, context=None): """ Add Access rules of mail.message for non-employee user: From b756b693e2c56c43c3454207505cb5b2c2cf78fe Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 11 Mar 2014 17:14:21 +0100 Subject: [PATCH 10/50] [FIX] portal: expensive copy/paste typo bzr revid: dle@openerp.com-20140311161421-6u54mzzj7pefypg8 --- addons/portal/mail_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py index 428b1be3c4b..3929908fe77 100644 --- a/addons/portal/mail_message.py +++ b/addons/portal/mail_message.py @@ -35,7 +35,7 @@ class mail_message(osv.Model): """ if uid == SUPERUSER_ID: return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order, - context=context, count=False, access_rights_uid=access_rights_uid) + context=context, count=count, access_rights_uid=access_rights_uid) group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1] if group_user_id not in [group.id for group in group_ids]: From 160229d58e340c7ba6799c5ae90607e205e5016c Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 12 Mar 2014 05:26:04 +0000 Subject: [PATCH 11/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140312052604-hgt48h8szpiw9szj --- addons/account/i18n/id.po | 98 +++++++++++----- addons/account/i18n/ko.po | 12 +- addons/account/i18n/mn.po | 12 +- addons/account_accountant/i18n/id.po | 10 +- addons/account_asset/i18n/id.po | 165 +++++++++++++++------------ addons/account_cancel/i18n/id.po | 10 +- addons/stock/i18n/nl.po | 9 +- addons/stock/i18n/zh_TW.po | 77 +++++++------ 8 files changed, 229 insertions(+), 164 deletions(-) diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index 4ee51fb1982..a4ece1f4bbd 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-03-10 19:00+0000\n" +"PO-Revision-Date: 2014-03-11 17:03+0000\n" "Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -253,7 +253,7 @@ msgstr "Pindahkan baris rekonsiliasi terpilih" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries are an input of the reconciliation." -msgstr "Catatan akuntansi adalah sebuah masukan dari rekonsiliasi" +msgstr "Entri akunting adalah input rekonsiliasi" #. module: account #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports @@ -412,18 +412,18 @@ msgstr "Mengizinkan anda menggunakan akunting analitik" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Pramuniaga" #. module: account #: view:account.bank.statement:0 #: view:account.invoice:0 msgid "Responsible" -msgstr "Bertanggung Jawab" +msgstr "Tanggung-jawab" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard msgid "account.bank.accounts.wizard" -msgstr "tuntunan.akun.bank" +msgstr "account.bank.accounts.wizard" #. module: account #: field:account.move.line,date_created:0 @@ -434,7 +434,7 @@ msgstr "Tanggal pembuatan" #. module: account #: view:account.invoice:0 msgid "Cancel Invoice" -msgstr "" +msgstr "Batalkan Tagihan" #. module: account #: selection:account.journal,type:0 @@ -472,18 +472,25 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Memungkinkan anda mengatur aktiva yang dimiliki oleh perusahaan atau " +"perseorangan.\n" +" Menyimpan depresiasi yang terjadi pada aktiva tersebut , dan " +"membuat akun bergerak untuk baris depresiasinya.\n" +" Menginstal modul account_asset. Jika anda tidak mencentang " +"kotak ini, anda bisa melakukan penagihan dan pembayaran, tetapi tidak bisa " +"melakukan pembukuan (Jurnal Items, Chart of Accounts, ...)" #. module: account #: help:account.bank.statement.line,name:0 msgid "Originator to Beneficiary Information" -msgstr "" +msgstr "Pembuat Informasi Penerima" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Periode :" #. module: account #: field:account.account.template,chart_template_id:0 @@ -491,12 +498,13 @@ msgstr "" #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "Salinan Bagan Akun" +msgstr "Template Bagan" #. module: account #: selection:account.invoice.refund,filter_refund:0 msgid "Modify: create refund, reconcile and create a new draft invoice" msgstr "" +"Perubahan: buat pengembalian, rekonsiliasi, dan membuat draft tagihan baru" #. module: account #: help:account.config.settings,tax_calculation_rounding_method:0 @@ -510,11 +518,19 @@ msgid "" "should choose 'Round per line' because you certainly want the sum of your " "tax-included line subtotals to be equal to the total amount with taxes." msgstr "" +"Jika anda memilih 'Round per line' : untuk setiap pajak, nilai pajak awal " +"akan dihitung dan dibulatkan untuk setiap baris PO/SO/Tagihan kemudian hasil " +"pembulatan ini dijumlahkan, hasilnya adalah total pajak. Jika anda memilih " +"'Round globally': untuk setiap pajak, jumlah pajak akan dihitung untuk " +"setiap baris PO/SO/tagihan, kemudian jumlahnya barulah di bulatkan. Jika " +"anda menjual dengan pajak, anda harusnya memilih 'Round per line' karena " +"tentunya anda menginginkan agar nilai pajak pada subtotal sama dengan jumlah " +"total pajak setiap baris." #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts msgid "wizard.multi.charts.accounts" -msgstr "tuntunan.multi.bagan.akun" +msgstr "wizard.multi.charts.accounts" #. module: account #: help:account.model.line,amount_currency:0 @@ -524,12 +540,12 @@ msgstr "Jumlah yang ditampilkan dalam mata uang pilihan lainnya" #. module: account #: view:account.journal:0 msgid "Available Coins" -msgstr "" +msgstr "Koin yang tersedia" #. module: account #: field:accounting.report,enable_filter:0 msgid "Enable Comparison" -msgstr "Perbandingan diperbolehkan" +msgstr "Izinkan Perbandingan" #. module: account #: view:account.analytic.line:0 @@ -577,7 +593,7 @@ msgstr "Induk target" #. module: account #: help:account.invoice.line,sequence:0 msgid "Gives the sequence of this line when displaying the invoice." -msgstr "" +msgstr "Memberikan urutan baris ini saat menampilkan tagihan" #. module: account #: field:account.bank.statement,account_id:0 @@ -621,7 +637,7 @@ msgstr "Bukan transaksi yang dapat direkonsiliasi" #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 msgid "Counterpart" -msgstr "Lawan" +msgstr "Counterpart" #. module: account #: view:account.fiscal.position:0 @@ -655,7 +671,7 @@ msgstr "Semua" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "Presisi desimal pada entri jurnal" #. module: account #: selection:account.config.settings,period:0 @@ -681,6 +697,8 @@ msgid "" "Specified journal does not have any account move entries in draft state for " "this period." msgstr "" +"Jurnal dimaksud tidak memiliki entri akun bergerak pada kondisi draft untuk " +"periode ini." #. module: account #: view:account.fiscal.position:0 @@ -703,12 +721,12 @@ msgstr "Urutan Utama harus berbeda dari yang sekarang !" #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly." -msgstr "" +msgstr "Mata uang saat ini tidak terkonfigurasi dengan baik." #. module: account #: field:account.journal,profit_account_id:0 msgid "Profit Account" -msgstr "" +msgstr "Akun Profit" #. module: account #: code:addons/account/account_move_line.py:1156 @@ -729,11 +747,19 @@ msgid "" "either the user pressed the button \"Nothing more to reconcile\" during the " "manual reconciliation process." msgstr "" +"Tanggal dimana partner entri akunting terakhir kali sepenuhnya ter-" +"rekonsiliasi. Berbeda dengan tanggal terakhir dimana suatu rekonsiliasi " +"dilakukan untuk partner ini, karena disini kita menggambarkan fakta bahwa " +"tidak ada lagi yang perlu di rekonsiliasi pada tanggal ini. Hal ini dapat " +"dicapai dengan 2 cara berbeda: bisa entri debit/kredit terakhir yang belum " +"di rekonsiliasi untuk partner ini di rekonsiliasikan, atau pengguna " +"menggunakan tombol \"Tidak ada lagi yang perlu di rekonsiliasi\" pada proses " +"rekonsiliasi manual." #. module: account #: model:ir.model,name:account.model_report_account_type_sales msgid "Report of the Sales by Account Type" -msgstr "" +msgstr "Laporan Penjualan Menurut Tipe Akun" #. module: account #: code:addons/account/account.py:3201 @@ -745,7 +771,7 @@ msgstr "SAJ" #: code:addons/account/account.py:1591 #, python-format msgid "Cannot create move with currency different from .." -msgstr "" +msgstr "Tidak dapat membuat gerakan dengan mata uang berbeda dari .." #. module: account #: model:email.template,report_name:account.email_template_edi_invoice @@ -753,6 +779,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " "and 'draft' or ''}" msgstr "" +"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " +"and 'draft' or ''}" #. module: account #: view:account.period:0 @@ -781,12 +809,16 @@ msgid "" "The amount expressed in the secondary currency must be positive when the " "journal item is a debit and negative when if it is a credit." msgstr "" +"Jumlah pada mata uang sekunder harus positif saat item jurnal adalah debit " +"dan negatif saat kredit." #. module: account #: constraint:account.move:0 msgid "" "You cannot create more than one move per period on a centralized journal." msgstr "" +"Anda tidak dapat membuat lebih dari satu pergerakan per periode pada jurnal " +"tersentralisasi." #. module: account #: help:account.tax,account_analytic_paid_id:0 @@ -795,6 +827,9 @@ msgid "" "lines for refunds. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Set akun analitik yang akan digunakan sebagai default pada baris pajak " +"tagihan untuk pengembalian. Tinggalkan kosong jika sebagai default anda " +"tidak ingin menggunakan akun analitik pada baris pajak tagihan." #. module: account #: view:account.account:0 @@ -812,12 +847,12 @@ msgstr "Akun Piutang" #. module: account #: view:account.config.settings:0 msgid "Configure your company bank accounts" -msgstr "" +msgstr "Konfigurasi akun bank perusahaan anda." #. module: account #: view:account.invoice.refund:0 msgid "Create Refund" -msgstr "" +msgstr "Buat Pengembalian" #. module: account #: constraint:account.move.line:0 @@ -825,13 +860,13 @@ msgid "" "The date of your Journal Entry is not in the defined period! You should " "change the date or remove this constraint from the journal." msgstr "" -"Tanggal pada jurnal entri tidak sesuai dengan Period ! Anda harus merubah " -"atau menghilangkan tanggal ini pada jurnal." +"Tanggal pada jurnal entri tidak sesuai dengan Periode ! Anda harus merubah " +"tanggal atau menghilangkan batasan ini dari jurnal." #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "Laporan Buku Besar Umum" +msgstr "Laporan Buku Besar" #. module: account #: view:account.invoice:0 @@ -847,12 +882,12 @@ msgstr "Apakah anda yakin untuk membuat catatan baru?" #: code:addons/account/account_invoice.py:1361 #, python-format msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." -msgstr "" +msgstr "Tagihan dibayar parsial: %s%s dari %s%s (%s%s tersisa)." #. module: account #: view:account.invoice:0 msgid "Print Invoice" -msgstr "Print Faktur" +msgstr "Cetak Tagihan" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:111 @@ -861,16 +896,19 @@ msgid "" "Cannot %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only refund this invoice." msgstr "" +"Tidak dapat %s tagihan yang sudah di rekonsiliasi, tagihan seharusnya di-" +"unreconciled terlebih dulu. Anda hanya dapat melakukan pengembalian atas " +"tagihan ini." #. module: account #: view:account.account:0 msgid "Account code" -msgstr "" +msgstr "Kode akun" #. module: account #: selection:account.financial.report,display_detail:0 msgid "Display children with hierarchy" -msgstr "Tampilkan anak dengan terstruktur" +msgstr "Tampilkan hirarki anak" #. module: account #: selection:account.payment.term.line,value:0 diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 9b272d2c28a..bf5699cfb5d 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-05-14 01:08+0000\n" -"Last-Translator: AhnJD \n" +"PO-Revision-Date: 2014-03-12 04:39+0000\n" +"Last-Translator: Gong HK \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:51+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -84,7 +84,7 @@ msgstr "청구서 또는 납부서로부터 가져오기" #: code:addons/account/account_move_line.py:1210 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "비정상 계정" #. module: account #: view:account.move:0 @@ -198,7 +198,7 @@ msgstr "열 라벨" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "계좌번호" #. module: account #: help:account.analytic.journal,type:0 diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 879b8d880f7..029628d02db 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-03-06 09:16+0000\n" +"PO-Revision-Date: 2014-03-11 06:15+0000\n" "Last-Translator: Jacara \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -6832,7 +6832,7 @@ msgstr "Захиалагчийн буцаалт" #. module: account #: field:account.account,foreign_balance:0 msgid "Foreign Balance" -msgstr "Гадаад бланс" +msgstr "Валютын баланс" #. module: account #: field:account.journal.period,name:0 @@ -9161,7 +9161,7 @@ msgstr "Орлогын толгой данс" #. module: account #: field:account.account,adjusted_balance:0 msgid "Adjusted Balance" -msgstr "Тохируулсан бланс" +msgstr "Тохируулсан баланс" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form @@ -11040,7 +11040,7 @@ msgstr "Дэлгэрэнгүй байхгүй" #: model:ir.actions.act_window,name:account.action_account_gain_loss #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses msgid "Unrealized Gain or Loss" -msgstr "Тэгшитгэгдээгүй Ашиг эсвэл Алдагдал" +msgstr "Хэрэгжээгүй ашиг алдагдал" #. module: account #: view:account.move:0 diff --git a/addons/account_accountant/i18n/id.po b/addons/account_accountant/i18n/id.po index 7f45dcd09c5..834bd2d265c 100644 --- a/addons/account_accountant/i18n/id.po +++ b/addons/account_accountant/i18n/id.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-11 08:21+0000\n" +"Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Buka Menu Akunting" diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po index f45ba33316b..dc1457a9e90 100644 --- a/addons/account_asset/i18n/id.po +++ b/addons/account_asset/i18n/id.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-11 08:50+0000\n" +"Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -27,27 +27,27 @@ msgstr "" #: field:account.asset.history,method_end:0 #: field:asset.modify,method_end:0 msgid "Ending date" -msgstr "" +msgstr "Tanggal akhir" #. module: account_asset #: field:account.asset.asset,value_residual:0 msgid "Residual Value" -msgstr "" +msgstr "Nilai residual" #. module: account_asset #: field:account.asset.category,account_expense_depreciation_id:0 msgid "Depr. Expense Account" -msgstr "" +msgstr "Depr Akun Biaya" #. module: account_asset #: view:asset.asset.report:0 msgid "Group By..." -msgstr "" +msgstr "Dikelompokan berdasarkan ..." #. module: account_asset #: field:asset.asset.report,gross_value:0 msgid "Gross Amount" -msgstr "" +msgstr "Jumlah Kotor" #. module: account_asset #: view:account.asset.asset:0 @@ -58,7 +58,7 @@ msgstr "" #: field:asset.asset.report,asset_id:0 #: model:ir.model,name:account_asset.model_account_asset_asset msgid "Asset" -msgstr "" +msgstr "Aktiva" #. module: account_asset #: help:account.asset.asset,prorata:0 @@ -67,12 +67,14 @@ msgid "" "Indicates that the first depreciation entry for this asset have to be done " "from the purchase date instead of the first January" msgstr "" +"Mengindikasikan bahwa entri depresiasi pertama untuk aset ini harus " +"dilakukan dari tanggal pembelian, bukan dari tanggal satu Januari." #. module: account_asset #: selection:account.asset.asset,method:0 #: selection:account.asset.category,method:0 msgid "Linear" -msgstr "" +msgstr "Linier" #. module: account_asset #: field:account.asset.asset,company_id:0 @@ -85,19 +87,19 @@ msgstr "Perusahaan" #. module: account_asset #: view:asset.modify:0 msgid "Modify" -msgstr "" +msgstr "Ubah" #. module: account_asset #: selection:account.asset.asset,state:0 #: view:asset.asset.report:0 #: selection:asset.asset.report,state:0 msgid "Running" -msgstr "" +msgstr "Sedang berjalan" #. module: account_asset #: view:account.asset.asset:0 msgid "Set to Draft" -msgstr "" +msgstr "Atur menjadi draft" #. module: account_asset #: view:asset.asset.report:0 @@ -105,24 +107,24 @@ msgstr "" #: model:ir.model,name:account_asset.model_asset_asset_report #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report msgid "Assets Analysis" -msgstr "" +msgstr "Analisa Aset" #. module: account_asset #: field:asset.modify,name:0 msgid "Reason" -msgstr "" +msgstr "Alasan" #. module: account_asset #: field:account.asset.asset,method_progress_factor:0 #: field:account.asset.category,method_progress_factor:0 msgid "Degressive Factor" -msgstr "" +msgstr "Faktor Penurunan Nilai" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal msgid "Asset Categories" -msgstr "" +msgstr "Kategori Aset" #. module: account_asset #: view:account.asset.asset:0 @@ -130,40 +132,40 @@ msgstr "" #: field:account.move.line,entry_ids:0 #: model:ir.actions.act_window,name:account_asset.act_entries_open msgid "Entries" -msgstr "" +msgstr "Entri" #. module: account_asset #: view:account.asset.asset:0 #: field:account.asset.asset,depreciation_line_ids:0 msgid "Depreciation Lines" -msgstr "" +msgstr "Baris Depresiasi" #. module: account_asset #: help:account.asset.asset,salvage_value:0 msgid "It is the amount you plan to have that you cannot depreciate." -msgstr "" +msgstr "Adalah besaran yang anda rencanakan yang tidak dapat di depresiasi." #. module: account_asset #: help:account.asset.asset,method_period:0 msgid "The amount of time between two depreciations, in months" -msgstr "" +msgstr "Waktu antara dua depresiasi, dalam bulan" #. module: account_asset #: field:account.asset.depreciation.line,depreciation_date:0 #: view:asset.asset.report:0 #: field:asset.asset.report,depreciation_date:0 msgid "Depreciation Date" -msgstr "" +msgstr "Tanggal Depresiasi" #. module: account_asset #: constraint:account.asset.asset:0 msgid "Error ! You cannot create recursive assets." -msgstr "" +msgstr "Salah ! Anda tidak dapat membuat aset rekursif" #. module: account_asset #: field:asset.asset.report,posted_value:0 msgid "Posted Amount" -msgstr "" +msgstr "Jumlah terposting" #. module: account_asset #: view:account.asset.asset:0 @@ -173,12 +175,12 @@ msgstr "" #: model:ir.ui.menu,name:account_asset.menu_finance_assets #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets msgid "Assets" -msgstr "" +msgstr "Aset" #. module: account_asset #: field:account.asset.category,account_depreciation_id:0 msgid "Depreciation Account" -msgstr "" +msgstr "Akun Depresiasi" #. module: account_asset #: view:account.asset.asset:0 @@ -187,34 +189,34 @@ msgstr "" #: view:asset.modify:0 #: field:asset.modify,note:0 msgid "Notes" -msgstr "" +msgstr "Catatan" #. module: account_asset #: field:account.asset.depreciation.line,move_id:0 msgid "Depreciation Entry" -msgstr "" +msgstr "Entri Depresiasi" #. module: account_asset #: code:addons/account_asset/account_asset.py:82 #, python-format msgid "Error!" -msgstr "" +msgstr "Ada Kesalahan !" #. module: account_asset #: view:asset.asset.report:0 #: field:asset.asset.report,nbr:0 msgid "# of Depreciation Lines" -msgstr "" +msgstr "# Baris Depresiasi" #. module: account_asset #: field:account.asset.asset,method_period:0 msgid "Number of Months in a Period" -msgstr "" +msgstr "Jumlah Bulan dalam Satu Periode" #. module: account_asset #: view:asset.asset.report:0 msgid "Assets in draft state" -msgstr "" +msgstr "Aset pada kondisi draft" #. module: account_asset #: field:account.asset.asset,method_end:0 @@ -222,37 +224,37 @@ msgstr "" #: selection:account.asset.category,method_time:0 #: selection:account.asset.history,method_time:0 msgid "Ending Date" -msgstr "" +msgstr "Tanggal Akhir" #. module: account_asset #: field:account.asset.asset,code:0 msgid "Reference" -msgstr "" +msgstr "Referensi" #. module: account_asset #: view:account.asset.asset:0 msgid "Account Asset" -msgstr "" +msgstr "Akun Aset" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard msgid "Compute Assets" -msgstr "" +msgstr "Hitung Aset" #. module: account_asset #: field:account.asset.category,method_period:0 #: field:account.asset.history,method_period:0 #: field:asset.modify,method_period:0 msgid "Period Length" -msgstr "" +msgstr "Lama Periode" #. module: account_asset #: selection:account.asset.asset,state:0 #: view:asset.asset.report:0 #: selection:asset.asset.report,state:0 msgid "Draft" -msgstr "" +msgstr "Draft" #. module: account_asset #: view:asset.asset.report:0 @@ -262,24 +264,24 @@ msgstr "Tanggal pembelian aset" #. module: account_asset #: view:account.asset.asset:0 msgid "Change Duration" -msgstr "" +msgstr "Ubah Durasi" #. module: account_asset #: help:account.asset.asset,method_number:0 #: help:account.asset.category,method_number:0 #: help:account.asset.history,method_number:0 msgid "The number of depreciations needed to depreciate your asset" -msgstr "" +msgstr "Jumlah depresiasi yang dibutuhkan untuk mendepresiasi aset anda" #. module: account_asset #: view:account.asset.category:0 msgid "Analytic Information" -msgstr "" +msgstr "Informasi Analitik" #. module: account_asset #: field:account.asset.category,account_analytic_id:0 msgid "Analytic account" -msgstr "" +msgstr "Akun Analitik" #. module: account_asset #: field:account.asset.asset,method:0 @@ -297,24 +299,24 @@ msgstr "" #. module: account_asset #: field:account.asset.depreciation.line,remaining_value:0 msgid "Next Period Depreciation" -msgstr "" +msgstr "Periode Depresiasi Berikutnya" #. module: account_asset #: help:account.asset.history,method_period:0 msgid "Time in month between two depreciations" -msgstr "" +msgstr "Waktu dalam bulan antara dua depresiasi" #. module: account_asset #: view:asset.modify:0 #: model:ir.actions.act_window,name:account_asset.action_asset_modify #: model:ir.model,name:account_asset.model_asset_modify msgid "Modify Asset" -msgstr "" +msgstr "Ubah Aktiva" #. module: account_asset #: field:account.asset.asset,salvage_value:0 msgid "Salvage Value" -msgstr "" +msgstr "Nilai Likuidasi Aset" #. module: account_asset #: field:account.asset.asset,category_id:0 @@ -322,68 +324,68 @@ msgstr "" #: field:account.invoice.line,asset_category_id:0 #: view:asset.asset.report:0 msgid "Asset Category" -msgstr "" +msgstr "Kategori Aktiva" #. module: account_asset #: view:account.asset.asset:0 msgid "Assets in closed state" -msgstr "" +msgstr "Aktiva pada kondisi tertutup" #. module: account_asset #: field:account.asset.asset,parent_id:0 msgid "Parent Asset" -msgstr "" +msgstr "Aktiva induk" #. module: account_asset #: view:account.asset.history:0 #: model:ir.model,name:account_asset.model_account_asset_history msgid "Asset history" -msgstr "" +msgstr "Histori Aktiva" #. module: account_asset #: view:account.asset.category:0 msgid "Search Asset Category" -msgstr "" +msgstr "Cari Kategori Aktiva" #. module: account_asset #: view:asset.modify:0 msgid "months" -msgstr "" +msgstr "bulan" #. module: account_asset #: model:ir.model,name:account_asset.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Baris Tagihan" #. module: account_asset #: view:account.asset.asset:0 msgid "Depreciation Board" -msgstr "" +msgstr "Papan Depresiasi" #. module: account_asset #: field:asset.asset.report,unposted_value:0 msgid "Unposted Amount" -msgstr "" +msgstr "Jumlah Belum Terposting" #. module: account_asset #: field:account.asset.asset,method_time:0 #: field:account.asset.category,method_time:0 #: field:account.asset.history,method_time:0 msgid "Time Method" -msgstr "" +msgstr "Metode Waktu" #. module: account_asset #: view:asset.depreciation.confirmation.wizard:0 #: view:asset.modify:0 msgid "or" -msgstr "" +msgstr "atau" #. module: account_asset #: field:account.asset.asset,note:0 #: field:account.asset.category,note:0 #: field:account.asset.history,note:0 msgid "Note" -msgstr "" +msgstr "Catatan" #. module: account_asset #: help:account.asset.history,method_time:0 @@ -394,6 +396,12 @@ msgid "" "Ending Date: Choose the time between 2 depreciations and the date the " "depreciations won't go beyond." msgstr "" +"Metode yang digunakan untuk menghitung tanggal dan angka pada baris " +"depresiasi.\n" +"Angka Depresiasi: Angka tetap dari baris depresiasi dan waktu antara 2 " +"depresiasi.\n" +"Tanggal Akhir: Pilih waktu antara 2 depresiasi dimana tanggal depresiasi " +"tidak melebihinya." #. module: account_asset #: help:account.asset.asset,method_time:0 @@ -406,16 +414,22 @@ msgid "" " * Ending Date: Choose the time between 2 depreciations and the date the " "depreciations won't go beyond." msgstr "" +"Pilih metode untuk digunakan untuk menghitung tanggal dan jumlah baris " +"depresiasi.\n" +" * Jumlah Depresiasi: Angkat baris depresiasi tetap dan waktu antara 2 " +"depresiasi.\n" +" * Tanggal Akhir: Pilih waktu antara 2 depresiasi dan tanggal depresiasi " +"tidak boleh melebihinya." #. module: account_asset #: view:asset.asset.report:0 msgid "Assets in running state" -msgstr "" +msgstr "Aktiva pada kondisi berjalan" #. module: account_asset #: view:account.asset.asset:0 msgid "Closed" -msgstr "" +msgstr "Ditutup" #. module: account_asset #: help:account.asset.asset,state:0 @@ -426,43 +440,48 @@ msgid "" "You can manually close an asset when the depreciation is over. If the last " "line of depreciation is posted, the asset automatically goes in that status." msgstr "" +"Saat aktiva dibuat, statusnya adalah 'Draft'.\n" +"Jika aktiva di konfirmasi, statusnya menjadi 'Berjalan' dan baris depresiasi " +"dapat di posting pada pembukuan.\n" +"Anda dapat menutup secara manual suatu aktiva saat depresiasi sudah " +"berakhir. Jika baris akhir depresiasi dimasukkan, aktiva otomatis tertutup." #. module: account_asset #: field:account.asset.asset,state:0 #: field:asset.asset.report,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_asset #: field:account.asset.asset,partner_id:0 #: field:asset.asset.report,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: account_asset #: view:asset.asset.report:0 msgid "Posted depreciation lines" -msgstr "" +msgstr "Baris depresiasi terposting" #. module: account_asset #: field:account.asset.asset,child_ids:0 msgid "Children Assets" -msgstr "" +msgstr "Aktiva anak" #. module: account_asset #: view:asset.asset.report:0 msgid "Date of depreciation" -msgstr "" +msgstr "Tanggal depresiasi" #. module: account_asset #: field:account.asset.history,user_id:0 msgid "User" -msgstr "" +msgstr "Pengguna" #. module: account_asset #: field:account.asset.category,account_asset_id:0 msgid "Asset Account" -msgstr "" +msgstr "Akun Aktiva" #. module: account_asset #: view:asset.asset.report:0 @@ -473,17 +492,17 @@ msgstr "Filter Tambahan..." #: view:account.asset.asset:0 #: view:asset.depreciation.confirmation.wizard:0 msgid "Compute" -msgstr "" +msgstr "Hitung" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "" +msgstr "Histori Aktiva" #. module: account_asset #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard msgid "asset.depreciation.confirmation.wizard" -msgstr "" +msgstr "wizard.konfirmasi.depresiasi.aktiva" #. module: account_asset #: field:account.asset.asset,active:0 @@ -493,12 +512,12 @@ msgstr "Aktif" #. module: account_asset #: field:account.asset.depreciation.line,parent_state:0 msgid "State of Asset" -msgstr "" +msgstr "Status Aktiva" #. module: account_asset #: field:account.asset.depreciation.line,name:0 msgid "Depreciation Name" -msgstr "" +msgstr "Nama Depresiasi" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/account_cancel/i18n/id.po b/addons/account_cancel/i18n/id.po index 637c294a34c..7b29df9011b 100644 --- a/addons/account_cancel/i18n/id.po +++ b/addons/account_cancel/i18n/id.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-11 08:23+0000\n" +"Last-Translator: williamlsd \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account_cancel #: view:account.invoice:0 msgid "Cancel Invoice" -msgstr "" +msgstr "Batalkan Tagihan" #~ msgid "Cancel" #~ msgstr "Batal" diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index f68f714f3a6..2fc05f0f3f0 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-04 13:05+0000\n" +"PO-Revision-Date: 2014-03-11 17:54+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-05 05:57+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -2430,7 +2430,8 @@ msgstr "Bedrag" #: field:stock.config.settings,module_stock_invoice_directly:0 msgid "Create and open the invoice when the user finish a delivery order" msgstr "" -"Maak en open de factuur wanneer de gebruiker klaar is met de uitgaande order" +"Maak en open de factuur wanneer de gebruiker klaar is met de uitgaande " +"levering" #. module: stock #: model:ir.model,name:stock.model_stock_return_picking_memory diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 3c305085902..d8117d175fa 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-02-14 11:58+0000\n" +"PO-Revision-Date: 2014-03-11 08:04+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-15 07:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-12 05:26+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -3323,6 +3323,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊增加一個追蹤號碼。\n" +"

\n" +" 這是您所有的包裹清單。當您選擇一個「包裹」，\n" +" 即可讀取這個包裹內含產品的上下游追溯資料。\n" +"

\n" +" " #. module: stock #: code:addons/stock/stock.py:2545 @@ -3406,7 +3413,7 @@ msgstr "已排程" #. module: stock #: view:stock.picking:0 msgid "Add an internal note..." -msgstr "" +msgstr "增加一個內部備註" #. module: stock #: model:ir.actions.act_window,name:stock.action_warehouse_form @@ -3417,26 +3424,26 @@ msgstr "倉庫" #. module: stock #: field:stock.journal,user_id:0 msgid "Responsible" -msgstr "" +msgstr "負責人" #. module: stock #: view:stock.move:0 msgid "Process Entirely" -msgstr "" +msgstr "全部處理" #. module: stock #: help:product.template,property_stock_procurement:0 msgid "" "This stock location will be used, instead of the default one, as the source " "location for stock moves generated by procurements." -msgstr "" +msgstr "此倉位將會替代預設倉位，用在因採購而產生的庫存調動的來源倉位。" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_inventory_report #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report #: view:report.stock.inventory:0 msgid "Inventory Analysis" -msgstr "" +msgstr "庫存分析" #. module: stock #: field:stock.invoice.onshipping,journal_id:0 @@ -3453,7 +3460,7 @@ msgstr "庫存" #: code:addons/stock/wizard/stock_return_picking.py:226 #, python-format msgid "Returned Picking" -msgstr "" +msgstr "退貨提貨" #. module: stock #: model:ir.model,name:stock.model_product_product @@ -3503,33 +3510,33 @@ msgstr "" #. module: stock #: view:stock.return.picking:0 msgid "Return" -msgstr "" +msgstr "退貨" #. module: stock #: field:stock.return.picking,invoice_state:0 msgid "Invoicing" -msgstr "" +msgstr "發票開立" #. module: stock #: view:stock.picking:0 msgid "Assigned Internal Moves" -msgstr "" +msgstr "指定的內部調動" #. module: stock #: code:addons/stock/stock.py:804 #, python-format msgid "You cannot process picking without stock moves." -msgstr "" +msgstr "沒有庫存調動，您不能進行提貨。" #. module: stock #: field:stock.production.lot,move_ids:0 msgid "Moves for this serial number" -msgstr "" +msgstr "該序號的庫存調動" #. module: stock #: field:stock.move,product_uos:0 msgid "Product UOS" -msgstr "" +msgstr "貨品銷售計量單位" #. module: stock #: field:stock.location,posz:0 @@ -3561,7 +3568,7 @@ msgstr "走廊 (X)" #. module: stock #: field:stock.config.settings,group_stock_packaging:0 msgid "Allow to define several packaging methods on products" -msgstr "" +msgstr "允許產品定義多種包裝方式" #. module: stock #: model:stock.location,name:stock.stock_location_7 @@ -3584,12 +3591,12 @@ msgstr "各分類產品" #: selection:stock.picking.in,state:0 #: selection:stock.picking.out,state:0 msgid "Waiting Another Operation" -msgstr "" +msgstr "正在等待其它作業" #. module: stock #: view:stock.location:0 msgid "Supplier Locations" -msgstr "" +msgstr "供應商倉位" #. module: stock #: field:stock.partial.move.line,wizard_id:0 @@ -3601,7 +3608,7 @@ msgstr "精靈" #. module: stock #: view:report.stock.move:0 msgid "Completed Stock-Moves" -msgstr "" +msgstr "已完成的庫存調動" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_location_product @@ -3612,7 +3619,7 @@ msgstr "各地點產品" #. module: stock #: view:stock.config.settings:0 msgid "Logistic" -msgstr "" +msgstr "物流" #. module: stock #: model:ir.actions.act_window,help:stock.action_location_form @@ -3656,7 +3663,7 @@ msgstr "貨架 1" #. module: stock #: field:stock.tracking,name:0 msgid "Pack Reference" -msgstr "" +msgstr "包裹編號" #. module: stock #: view:report.stock.move:0 @@ -3670,12 +3677,12 @@ msgstr "來源地點" #. module: stock #: view:product.template:0 msgid "Accounting Entries" -msgstr "" +msgstr "會計分錄" #. module: stock #: model:res.groups,name:stock.group_stock_manager msgid "Manager" -msgstr "" +msgstr "主管" #. module: stock #: code:addons/stock/wizard/stock_partial_picking.py:192 @@ -3689,17 +3696,17 @@ msgstr "" #. module: stock #: model:stock.location,name:stock.stock_location_intermediatelocation0 msgid "Internal Shippings" -msgstr "" +msgstr "內部運送" #. module: stock #: field:stock.change.standard.price,enable_stock_in_out_acc:0 msgid "Enable Related Account" -msgstr "" +msgstr "啟動相關科目" #. module: stock #: field:stock.location.product,type:0 msgid "Analyse Type" -msgstr "" +msgstr "分析類型" #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree4 @@ -3731,7 +3738,7 @@ msgstr "一次過" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_open msgid "Inventory Move" -msgstr "" +msgstr "存貨調動" #. module: stock #: code:addons/stock/product.py:476 @@ -3764,35 +3771,35 @@ msgstr "" #: model:ir.actions.act_window,name:stock.action_stock_config_settings #: view:stock.config.settings:0 msgid "Configure Warehouse" -msgstr "" +msgstr "倉庫設定" #. module: stock #: view:stock.picking:0 #: view:stock.picking.in:0 msgid "To Invoice" -msgstr "" +msgstr "待開發票" #. module: stock #: view:stock.return.picking:0 msgid "Return lines" -msgstr "" +msgstr "退貨明細" #. module: stock #: view:stock.inventory:0 msgid "Search Inventory" -msgstr "" +msgstr "搜尋庫存" #. module: stock #: model:ir.model,name:stock.model_report_stock_lines_date #: view:report.stock.lines.date:0 msgid "Dates of Inventories" -msgstr "" +msgstr "盤點日期" #. module: stock #: model:ir.actions.act_window,name:stock.action_receive_move #: view:product.product:0 msgid "Receptions" -msgstr "" +msgstr "接收" #. module: stock #: view:report.stock.move:0 @@ -3802,7 +3809,7 @@ msgstr "總內送量" #. module: stock #: field:report.stock.move,product_qty_out:0 msgid "Out Qty" -msgstr "" +msgstr "出貨數量" #. module: stock #: view:report.stock.inventory:0 @@ -3827,7 +3834,7 @@ msgstr "公司" #: field:stock.move.consume,product_uom:0 #: field:stock.move.scrap,product_uom:0 msgid "Product Unit of Measure" -msgstr "" +msgstr "產品度量單位" #. module: stock #: view:stock.move:0 From 6c96d110ab1ad4e29aa24bb43264c2571d85b5ea Mon Sep 17 00:00:00 2001 From: "Somesh Khare (OpenERP)" Date: Wed, 12 Mar 2014 11:15:35 +0530 Subject: [PATCH 12/50] [FIX]audittrail:on deletion of record from one2many and saving the parent form error raised as list index out of range (Ref: Case 604750) bzr revid: skh@openerp.com-20140312054535-kjlqltscnojb7lce --- addons/audittrail/audittrail.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index 63b505e0007..b68a8e201c6 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -466,14 +466,12 @@ class audittrail_objects_proxy(object_proxy): # if at least one modification has been found for model_id, resource_id in lines: line_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, model_id).model - name = pool.get(line_model).name_get(cr, uid, [resource_id])[0][1] vals = { 'method': method, 'object_id': model_id, 'user_id': uid, 'res_id': resource_id, - 'name': name, } if (model_id, resource_id) not in old_values and method not in ('copy', 'read'): # the resource was not existing so we are forcing the method to 'create' @@ -484,7 +482,11 @@ class audittrail_objects_proxy(object_proxy): # the resource is not existing anymore so we are forcing the method to 'unlink' # (because it could also come with the value 'write' if we are deleting the # record through a one2many field) + name = old_values[(model_id, resource_id)]['value'].get('name',False) vals.update({'method': 'unlink'}) + else : + name = pool[line_model].name_get(cr, uid, [resource_id])[0][1] + vals.update({'name': name}) # create the audittrail log in super admin mode, only if a change has been detected if lines[(model_id, resource_id)]: log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals) From e9228e2c5a16c3adfb5392d8d8a0469e3814c43b Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 12 Mar 2014 12:03:03 +0100 Subject: [PATCH 13/50] [FIX] account_check_writing: set the amount_in_word even if the check is not created through the voucher form (for example, for checks created through pay wizard of invoices) bzr revid: dle@openerp.com-20140312110303-x82juu3i2nox3u3j --- .../account_check_writing/account_voucher.py | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py index f7b35dccacc..6e47139c626 100644 --- a/addons/account_check_writing/account_voucher.py +++ b/addons/account_check_writing/account_voucher.py @@ -41,6 +41,23 @@ class account_voucher(osv.osv): 'number': fields.char('Number', size=32), } + def _amount_to_text(self, cr, uid, amount, currency_id, context=None): + # Currency complete name is not available in res.currency model + # Exceptions done here (EUR, USD, BRL) cover 75% of cases + # For other currencies, display the currency code + currency = self.pool['res.currency'].browse(cr, uid, currency_id, context=context) + if currency.name.upper() == 'EUR': + currency_name = 'Euro' + elif currency.name.upper() == 'USD': + currency_name = 'Dollars' + elif currency.name.upper() == 'BRL': + currency_name = 'reais' + else: + currency_name = currency.name + #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed + #amount_in_word = amount_to_text(amount, context=context) + return amount_to_text(amount, currency=currency_name) + def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None): """ Inherited - add amount_in_word and allow_check_writting in returned value dictionary """ if not context: @@ -48,22 +65,7 @@ class account_voucher(osv.osv): default = super(account_voucher, self).onchange_amount(cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=context) if 'value' in default: amount = 'amount' in default['value'] and default['value']['amount'] or amount - - # Currency complete name is not available in res.currency model - # Exceptions done here (EUR, USD, BRL) cover 75% of cases - # For other currencies, display the currency code - currency = self.pool['res.currency'].browse(cr, uid, currency_id, context=context) - if currency.name.upper() == 'EUR': - currency_name = 'Euro' - elif currency.name.upper() == 'USD': - currency_name = 'Dollars' - elif currency.name.upper() == 'BRL': - currency_name = 'reais' - else: - currency_name = currency.name - #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed - #amount_in_word = amount_to_text(amount, context=context) - amount_in_word = amount_to_text(amount, currency=currency_name) + amount_in_word = self._amount_to_text(cr, uid, amount, currency_id, context=context) default['value'].update({'amount_in_word':amount_in_word}) if journal_id: allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing @@ -92,6 +94,19 @@ class account_voucher(osv.osv): }, 'nodestroy': True } + def create(self, cr, uid, vals, context=None): + if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals: + vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \ + self.pool['account.journal'].browse(cr, uid, vals['journal_id'], context=context).currency.id or \ + self.pool['res.company'].browse(cr, uid, vals['company_id']).currency_id.id, context=context) + return super(account_voucher, self).create(cr, uid, vals, context=context) + + def write(self, cr, uid, ids, vals, context=None): + if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals: + vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \ + self.pool['account.journal'].browse(cr, uid, vals['journal_id'], context=context).currency.id or \ + self.pool['res.company'].browse(cr, uid, vals['company_id']).currency_id.id, context=context) + return super(account_voucher, self).write(cr, uid, ids, vals, context=context) def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): """ From 1a5d2e77c48c3f923bbbc44cd97b2fef341709d7 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 12 Mar 2014 13:09:04 +0100 Subject: [PATCH 14/50] [FIX] account: using float_round instead of native python round method, to apply half-up tie-breaking rule (1.655 with precision 2 is now 1.66 instead of 1.65). bzr revid: dle@openerp.com-20140312120904-ucixsl1szfi1q0ea --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 4ccdac59ee8..c45c337f019 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -30,7 +30,7 @@ from openerp import SUPERUSER_ID from openerp import pooler, tools from openerp.osv import fields, osv, expression from openerp.tools.translate import _ -from openerp.tools.float_utils import float_round +from openerp.tools.float_utils import float_round as round import openerp.addons.decimal_precision as dp @@ -2155,7 +2155,7 @@ class account_tax(osv.osv): tax_compute_precision = precision if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally': tax_compute_precision += 5 - totalin = totalex = float_round(price_unit * quantity, precision) + totalin = totalex = round(price_unit * quantity, precision) tin = [] tex = [] for tax in taxes: From 6ab74d0d8db3bc72940d25c95db84d05fc5e55fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2?= Date: Wed, 12 Mar 2014 14:05:22 +0100 Subject: [PATCH 15/50] [FIX] account: change decimal precision to avoid erasing tax and base values when updating a tax with coefficients on more than 2 decimals bzr revid: nel@tinyerp.com-20140312130522-qr5e010onc7ejrz5 --- addons/account/account.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index c45c337f019..2910d3d64a1 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1949,15 +1949,15 @@ class account_tax(osv.osv): # 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."), 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."), - 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), - 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), + 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()), + 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()), # Same fields for refund invoices 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."), 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."), - 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), - 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), + 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()), + 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()), 'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"), 'company_id': fields.many2one('res.company', 'Company', required=True), 'description': fields.char('Tax Code'), From c9bca78bb166d3d227371b49fbf9f333561e8bbb Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 12 Mar 2014 15:05:15 +0100 Subject: [PATCH 16/50] [FIX] base_import: avoid name clash when importing ir.translation records. Call the orm method directly. This hack is needed in 7.0 to avoid changes in the API. Renaming the method is the proper solution for trunk (done revision 5018) bzr revid: mat@openerp.com-20140312140515-tisj9cye0mzfprsw --- addons/base_import/models.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/base_import/models.py b/addons/base_import/models.py index 996dbf7964d..3fd34b98bfe 100644 --- a/addons/base_import/models.py +++ b/addons/base_import/models.py @@ -11,6 +11,7 @@ except ImportError: import psycopg2 from openerp.osv import orm, fields +from openerp.osv.orm import BaseModel from openerp.tools.translate import _ FIELDS_RECURSION_LIMIT = 2 @@ -316,8 +317,12 @@ class ir_import(orm.TransientModel): }] _logger.info('importing %d rows...', len(data)) - import_result = self.pool[record.res_model].load( - cr, uid, import_fields, data, context=context) + # DO NOT FORWARD PORT, already fixed in trunk + # hack to avoid to call the load method from ir_translation (name clash) + if record.res_model == 'ir.translation': + import_result = BaseModel.load(self.pool[record.res_model], cr, uid, import_fields, data, context=context) + else: + import_result = self.pool[record.res_model].load(cr, uid, import_fields, data, context=context) _logger.info('done') # If transaction aborted, RELEASE SAVEPOINT is going to raise From 5873f0abe6da5eeb14172b64da0430af285bebd0 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 12 Mar 2014 18:18:19 +0100 Subject: [PATCH 17/50] [FIX] add the logging handler only to the root logger. let the loggers propagate to allow more than one handler bzr revid: chs@openerp.com-20140312171819-bnj3md07w4le2m7m --- openerp/netsvc.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index d96449cbf2b..6e477f3ea36 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2012 OpenERP SA () +# Copyright (C) 2004-2014 OpenERP SA () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -149,7 +149,13 @@ class ColoredFormatter(DBFormatter): record.levelname = COLOR_PATTERN % (30 + fg_color, 40 + bg_color, record.levelname) return DBFormatter.format(self, record) +_logger_init = False def init_logger(): + global _logger_init + if _logger_init: + return + _logger_init = True + from tools.translate import resetlocale resetlocale() @@ -197,6 +203,8 @@ def init_logger(): formatter = DBFormatter(format) handler.setFormatter(formatter) + logging.getLogger().addHandler(handler) + # Configure handlers default_config = [ 'openerp.netsvc.rpc.request:INFO', @@ -233,11 +241,7 @@ def init_logger(): loggername, level = logconfig_item.split(':') level = getattr(logging, level, logging.INFO) logger = logging.getLogger(loggername) - logger.handlers = [] logger.setLevel(level) - logger.addHandler(handler) - if loggername != '': - logger.propagate = False for logconfig_item in default_config + pseudo_config + logconfig: _logger.debug('logger level set: "%s"', logconfig_item) From ba823b0a63fe71ab3ce8382ff63b7f8963877ba6 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 13 Mar 2014 07:15:40 +0000 Subject: [PATCH 18/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140313071540-nhiuwlanpkvorb8h --- addons/account/i18n/ko.po | 2 +- addons/crm/i18n/ja.po | 10 +- addons/l10n_be_invoice_bba/i18n/zh_CN.po | 146 +++++++++++++++++++++++ 3 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 addons/l10n_be_invoice_bba/i18n/zh_CN.po diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index bf5699cfb5d..13dcd8f6408 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" "X-Generator: Launchpad (build 16963)\n" #. module: account diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po index 629e5b211fc..10d497309d3 100644 --- a/addons/crm/i18n/ja.po +++ b/addons/crm/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-01-07 16:56+0000\n" -"PO-Revision-Date: 2014-03-05 21:13+0000\n" +"PO-Revision-Date: 2014-03-12 13:24+0000\n" "Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: crm #: view:crm.lead.report:0 @@ -1218,7 +1218,7 @@ msgstr "この項目をチェックした場合、この段階が各営業チー msgid "" "This field is used to distinguish stages related to Leads from stages " "related to Opportunities, or to specify stages available for both types." -msgstr "" +msgstr "このフィールドは商談とリードの区別、あるいは両方を指定するために使用します。" #. module: crm #: model:mail.message.subtype,name:crm.mt_lead_create @@ -1423,7 +1423,7 @@ msgstr "" #. module: crm #: help:crm.case.stage,sequence:0 msgid "Used to order stages. Lower is better." -msgstr "" +msgstr "ステージの順位に使用します。 低いほど良好です。" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po new file mode 100644 index 00000000000..e37a65d62d0 --- /dev/null +++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.po @@ -0,0 +1,146 @@ +# Chinese (Simplified) translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-11-24 02:53+0000\n" +"PO-Revision-Date: 2014-03-13 03:38+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" +"X-Generator: Launchpad (build 16963)\n" + +#. module: l10n_be_invoice_bba +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "发票号必须在公司范围内唯一" + +#. module: l10n_be_invoice_bba +#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice +msgid "Invoice" +msgstr "发票" + +#. module: l10n_be_invoice_bba +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "错误，您不能创建循环引用的会员用户" + +#. module: l10n_be_invoice_bba +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "BBA结构化传输有误！" + +#. module: l10n_be_invoice_bba +#: selection:res.partner,out_inv_comm_algorithm:0 +msgid "Random" +msgstr "随机" + +#. module: l10n_be_invoice_bba +#: help:res.partner,out_inv_comm_type:0 +msgid "Select Default Communication Type for Outgoing Invoices." +msgstr "" + +#. module: l10n_be_invoice_bba +#: help:res.partner,out_inv_comm_algorithm:0 +msgid "" +"Select Algorithm to generate the Structured Communication on Outgoing " +"Invoices." +msgstr "" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:109 +#: code:addons/l10n_be_invoice_bba/invoice.py:135 +#, python-format +msgid "" +"The daily maximum of outgoing invoices with an automatically generated BBA " +"Structured Communications has been exceeded!\n" +"Please create manually a unique BBA Structured Communication." +msgstr "自动生成结构化BBA传输已超出每日销售发票的最大值,请手动建立BBA结构化传输" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:150 +#, python-format +msgid "Error!" +msgstr "" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:121 +#, python-format +msgid "" +"The Partner should have a 3-7 digit Reference Number for the generation of " +"BBA Structured Communications!\n" +"Please correct the Partner record." +msgstr "" + +#. module: l10n_be_invoice_bba +#: constraint:res.partner:0 +msgid "Error: Invalid ean code" +msgstr "错误：无效的EAN编码" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:108 +#: code:addons/l10n_be_invoice_bba/invoice.py:120 +#: code:addons/l10n_be_invoice_bba/invoice.py:134 +#: code:addons/l10n_be_invoice_bba/invoice.py:162 +#: code:addons/l10n_be_invoice_bba/invoice.py:172 +#: code:addons/l10n_be_invoice_bba/invoice.py:197 +#, python-format +msgid "Warning!" +msgstr "警告！" + +#. module: l10n_be_invoice_bba +#: selection:res.partner,out_inv_comm_algorithm:0 +msgid "Customer Reference" +msgstr "客户参考号" + +#. module: l10n_be_invoice_bba +#: field:res.partner,out_inv_comm_type:0 +msgid "Communication Type" +msgstr "讯息类型" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:173 +#: code:addons/l10n_be_invoice_bba/invoice.py:198 +#, python-format +msgid "" +"The BBA Structured Communication has already been used!\n" +"Please create manually a unique BBA Structured Communication." +msgstr "" + +#. module: l10n_be_invoice_bba +#: selection:res.partner,out_inv_comm_algorithm:0 +msgid "Date" +msgstr "事务处理日期" + +#. module: l10n_be_invoice_bba +#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner +msgid "Partner" +msgstr "合作伙伴" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:151 +#, python-format +msgid "" +"Unsupported Structured Communication Type Algorithm '%s' !\n" +"Please contact your OpenERP support channel." +msgstr "不支持的结构化传输算法类型\"%s\"!请联系你的OpenERP 维护人员" + +#. module: l10n_be_invoice_bba +#: field:res.partner,out_inv_comm_algorithm:0 +msgid "Communication Algorithm" +msgstr "" + +#. module: l10n_be_invoice_bba +#: code:addons/l10n_be_invoice_bba/invoice.py:163 +#, python-format +msgid "" +"Empty BBA Structured Communication!\n" +"Please fill in a unique BBA Structured Communication." +msgstr "" From 71d8f8f1c4631c7dcbe3d9db449c16c611649e16 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 13 Mar 2014 13:38:11 +0100 Subject: [PATCH 19/50] [FIX] pager: show the pagger earlier to avoid slow loading to mix list and form pagers when fast switching bzr revid: mat@openerp.com-20140313123811-ej7lu53xp51kn6gu --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index edb44e7ea06..f1b30f6b8e1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -276,6 +276,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM filter: 'alpha(opacity = 0)' }); this.$el.add(this.$buttons).removeClass('oe_form_dirty'); + this.$pager.toggle(this.dataset.ids.length > 1); var shown = this.has_been_loaded; if (options.reload !== false) { @@ -420,7 +421,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.do_update_pager(); }, do_update_pager: function(hide_index) { - this.$pager.toggle(this.dataset.ids.length > 1); if (hide_index) { $(".oe_form_pager_state", this.$pager).html(""); } else { From fc1607071a3cc0fa899763bfb0caa1f500504aeb Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 13 Mar 2014 14:44:38 +0100 Subject: [PATCH 20/50] [FIX] stock: use fully qualified xmlid in *_view_ref context keys bzr revid: chs@openerp.com-20140313134438-jcwhrm3demu4i99q --- addons/stock/stock_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 72adde4ef20..8a787475e4f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -776,7 +776,7 @@ - + @@ -910,7 +910,7 @@ - +
@@ -1037,7 +1037,7 @@ - +
From 3e7b87398757b20ab489c8f7ddf9914e43df237d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 13 Mar 2014 16:08:23 +0100 Subject: [PATCH 21/50] [FIX] base_calendar: correct the invert call to the function field rrule. Create new hook method with valid signature. Keep the old one for compatibility reasons. Force the value of 'byday' (type selection) to be a string instead of integer. bzr revid: mat@openerp.com-20140313150823-vba9qulj549v37t9 --- addons/base_calendar/base_calendar.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 44c598f5ef6..fd45cab01c0 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1015,15 +1015,18 @@ class calendar_event(osv.osv): result[event] = "" return result + # hook method to fix the wrong signature + def _set_rulestring(self, cr, uid, ids, field_name, field_value, args, context=None): + return self._rrule_write(self, cr, uid, ids, field_name, field_value, args, context=context) + def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None): data = self._get_empty_rrule_data() if field_value: data['recurrency'] = True for event in self.browse(cr, uid, ids, context=context): - rdate = rule_date or event.date - update_data = self._parse_rrule(field_value, dict(data), rdate) + update_data = self._parse_rrule(field_value, dict(data), event.date) data.update(update_data) - super(calendar_event, obj).write(cr, uid, ids, data, context=context) + super(calendar_event, self).write(cr, uid, ids, data, context=context) return True _columns = { @@ -1051,7 +1054,7 @@ defines the list of date/time exceptions for a recurring calendar component."), 'exrule': fields.char('Exception Rule', size=352, help="Defines a \ rule or repeating pattern of time to exclude from the recurring rule."), 'rrule': fields.function(_get_rulestring, type='char', size=124, \ - fnct_inv=_rrule_write, store=True, string='Recurrent Rule'), + fnct_inv=_set_rulestring, store=True, string='Recurrent Rule'), 'rrule_type': fields.selection([ ('daily', 'Day(s)'), ('weekly', 'Week(s)'), @@ -1375,7 +1378,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), #repeat monthly by nweekday ((weekday, weeknumber), ) if r._bynweekday: data['week_list'] = day_list[r._bynweekday[0][0]].upper() - data['byday'] = r._bynweekday[0][1] + data['byday'] = str(r._bynweekday[0][1]) data['select1'] = 'day' data['rrule_type'] = 'monthly' From 125261499ddd0ebfeb0f974262962366a8800525 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 13 Mar 2014 16:16:12 +0100 Subject: [PATCH 22/50] [FIX] if only one id, convert to list bzr revid: mat@openerp.com-20140313151612-saoc3a73x1cwvgbg --- addons/base_calendar/base_calendar.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index fd45cab01c0..fc4261afe82 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1020,6 +1020,8 @@ class calendar_event(osv.osv): return self._rrule_write(self, cr, uid, ids, field_name, field_value, args, context=context) def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None): + if not isinstance(ids, list): + ids = [ids] data = self._get_empty_rrule_data() if field_value: data['recurrency'] = True From b43ffa52c2b84a0d6f52ead7e172f60753ea9da1 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 13 Mar 2014 16:35:35 +0100 Subject: [PATCH 23/50] [FIX] pad: use server to get pad content bzr revid: chs@openerp.com-20140313153535-ogyip9tfm2hkwn1f --- addons/pad/static/src/js/pad.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index 97f87196cb9..31ba8c42330 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -50,9 +50,7 @@ openerp.pad = function(instance) { this._dirty_flag = true; } else { this.content = '
... Loading pad ...
'; - this.pad_loading_request = $.get(value + '/export/html').done(function(data) { - groups = /\<\s*body\s*\>(.*?)\<\s*\/body\s*\>/.exec(data); - data = (groups || []).length >= 2 ? groups[1] : ''; + this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) { self.$('.oe_pad_content').html('
'); self.$('.oe_pad_readonly').html(data); }).fail(function() { From 219e1a62182ed178389a0f60141f9bda7853423b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 13 Mar 2014 16:37:57 +0100 Subject: [PATCH 24/50] [IMP] add test bzr revid: mat@openerp.com-20140313153757-nj9nn52u7kxpfg8i --- .../base_calendar/test/base_calendar_test.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index 7afd2e49551..c280bfe298a 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/base_calendar/test/base_calendar_test.yml @@ -52,3 +52,20 @@ - !python {model: calendar.event}: | self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")}) +- + I create a recuring rule for my event +- + !record {model: crm.meeting, id: crm_meeting_sprintreview1}: + name: Begin of month meeting + date: !eval time.strftime('%Y-%m-%d 12:00:00') + recurrency: true + rrule: FREQ=MONTHLY;INTERVAL=1;COUNT=12;BYDAY=1MO +- + I check that the attributes are set correctly +- + !assert {model: crm.meeting, id: crm_meeting_sprintreview1}: + - rrule_type == 'monthly' + - count == 12 + - select1 == 'day' + - byday == '1' + - week_list == 'MO' From 90af5e0d3a4083ea56ca3b388f642815ae27cdbc Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Thu, 13 Mar 2014 19:14:15 +0100 Subject: [PATCH 25/50] [FIX] Change password wizard: reload webclient after changing your own password. Because your session is dead after the changing ! bzr revid: jke@openerp.com-20140313181415-3rwlxhpevev3tlsq --- .../base/res/wizard/change_password_wizard.py | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/res/wizard/change_password_wizard.py b/openerp/addons/base/res/wizard/change_password_wizard.py index 5812460f8da..5ebe9a5a751 100644 --- a/openerp/addons/base/res/wizard/change_password_wizard.py +++ b/openerp/addons/base/res/wizard/change_password_wizard.py @@ -50,15 +50,21 @@ class change_password_wizard(osv.TransientModel): def change_password_button(self, cr, uid, id, context=None): wizard = self.browse(cr, uid, id, context=context)[0] - user_ids = [] - for user in wizard.user_ids: - user_ids.append(user.id) - self.pool.get('change.password.user').change_password_button(cr, uid, user_ids, context=context) + need_reload = any(uid == user.user_id.id for user in wizard.user_ids) + line_ids = [user.id for user in wizard.user_ids] + + self.pool.get('change.password.user').change_password_button(cr, uid, line_ids, context=context) # don't keep temporary password copies in the database longer than necessary - self.pool.get('change.password.user').unlink(cr, uid, user_ids) - return { - 'type': 'ir.actions.act_window_close', - } + self.pool.get('change.password.user').write(cr, uid, line_ids, {'new_passwd': False}, context=context) + + if need_reload: + return { + 'type': 'ir.actions.client', + 'tag': 'reload' + } + + return {'type': 'ir.actions.act_window_close'} + class change_password_user(osv.TransientModel): """ From aba3459889d4ece501018856ee9e70a2cbc9b3bc Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 14 Mar 2014 06:58:36 +0000 Subject: [PATCH 26/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065823-xdw7aa9ye4j200pp bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065836-tn2fv9smot0omj8f --- addons/crm/i18n/ja.po | 6 +++--- addons/l10n_be_invoice_bba/i18n/zh_CN.po | 2 +- openerp/addons/base/i18n/nl.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po index 10d497309d3..80739d4ba7a 100644 --- a/addons/crm/i18n/ja.po +++ b/addons/crm/i18n/ja.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-01-07 16:56+0000\n" -"PO-Revision-Date: 2014-03-12 13:24+0000\n" +"PO-Revision-Date: 2014-03-13 08:00+0000\n" "Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" +"X-Launchpad-Export-Date: 2014-03-14 06:58+0000\n" "X-Generator: Launchpad (build 16963)\n" #. module: crm @@ -2227,7 +2227,7 @@ msgstr "" msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." -msgstr "" +msgstr "ステータスバーやかんばんビューで表示すべきレコードが存在しない場合、このステージは表示されません。" #. module: crm #: field:crm.lead.report,nbr:0 diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po index e37a65d62d0..6fd75287904 100644 --- a/addons/l10n_be_invoice_bba/i18n/zh_CN.po +++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" +"X-Launchpad-Export-Date: 2014-03-14 06:58+0000\n" "X-Generator: Launchpad (build 16963)\n" #. module: l10n_be_invoice_bba diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 04b3c4e54d1..b3e5afffd5c 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2014-03-07 12:12+0000\n" +"PO-Revision-Date: 2014-03-13 08:48+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-14 06:58+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -14768,7 +14768,7 @@ msgstr "Luxemburg" #. module: base #: view:res.partner:0 msgid "(edit company address)" -msgstr "(bijwerken adres bedrijf)" +msgstr "(bijwerken bedrijfsadres)" #. module: base #: model:ir.module.module,summary:base.module_base_calendar From 44a99c0976a557f614446feb46f27089e8e1022f Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 14 Mar 2014 10:48:09 +0100 Subject: [PATCH 27/50] [FIX] calendar: correct recurrency end date computation bzr revid: chs@openerp.com-20140314094809-0wuus62tob8vtyi0 --- addons/base_calendar/base_calendar.py | 37 +++++++++++++++------------ addons/mail/mail_thread.py | 1 + 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index fc4261afe82..2ba55ce7351 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1507,7 +1507,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), # set end_date for calendar searching if vals.get('recurrency', True) and vals.get('end_type', 'count') in ('count', unicode('count')) and \ (vals.get('rrule_type') or vals.get('count') or vals.get('date') or vals.get('date_deadline')): - for data in self.read(cr, uid, ids, ['date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context): + for data in self.read(cr, uid, ids, ['end_date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context): end_date = self._set_recurrency_end_date(data, context=context) super(calendar_event, self).write(cr, uid, [data['id']], {'end_date': end_date}, context=context) @@ -1630,21 +1630,23 @@ rule or repeating pattern of time to exclude from the recurring rule."), return res def _set_recurrency_end_date(self, data, context=None): + if not data.get('recurrency'): + return False + + end_type = data.get('end_type') end_date = data.get('end_date') - rel_date = False - if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')): - data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S') - if data.get('rrule_type') in ('daily', unicode('count')): - rel_date = relativedelta(days=data.get('count')+1) - elif data.get('rrule_type') in ('weekly', unicode('weekly')): - rel_date = relativedelta(days=(data.get('count')+1)*7) - elif data.get('rrule_type') in ('monthly', unicode('monthly')): - rel_date = relativedelta(months=data.get('count')+1) - elif data.get('rrule_type') in ('yearly', unicode('yearly')): - rel_date = relativedelta(years=data.get('count')+1) - end_date = data_date_deadline - if rel_date: - end_date += rel_date + + if end_type == 'count' and all(data.get(key) for key in ['count', 'rrule_type', 'date_deadline']): + count = data['count'] + 1 + delay, mult = { + 'daily': ('days', 1), + 'weekly': ('days', 7), + 'monthly': ('months', 1), + 'yearly': ('years', 1), + }[data['rrule_type']] + + deadline = datetime.strptime(data['date_deadline'], tools.DEFAULT_SERVER_DATETIME_FORMAT) + return deadline + relativedelta(**{delay: count * mult}) return end_date def create(self, cr, uid, vals, context=None): @@ -1654,9 +1656,12 @@ rule or repeating pattern of time to exclude from the recurring rule."), if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'): vals['vtimezone'] = vals['vtimezone'][40:] - vals['end_date'] = self._set_recurrency_end_date(vals, context=context) res = super(calendar_event, self).create(cr, uid, vals, context) + data = self.read(cr, uid, [res], ['end_date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context)[0] + end_date = self._set_recurrency_end_date(data, context=context) + self.write(cr, uid, [res], {'end_date': end_date}, context=context) + alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) self.create_attendees(cr, uid, [res], context) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 40a4fefa8a8..bf3cad538a8 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -111,6 +111,7 @@ class mail_thread(osv.AbstractModel): if res[id]['message_unread_count']: title = res[id]['message_unread_count'] > 1 and _("You have %d unread messages") % res[id]['message_unread_count'] or _("You have one unread message") res[id]['message_summary'] = "9 %d %s" % (title, res[id].pop('message_unread_count'), _("New")) + res[id].pop('message_unread_count') # remove internal value return res def _get_subscription_data(self, cr, uid, ids, name, args, context=None): From 9e002d923386ccee597eab1cd0e4e57bf9f5c730 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 14 Mar 2014 11:46:05 +0100 Subject: [PATCH 28/50] [FIX] mail.thread: avoid error if `message_unread_count` has been popped 1 line earlier bzr revid: odo@openerp.com-20140314104605-qi7eqj2g37dvxvc3 --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index bf3cad538a8..0c911bc51fe 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -111,7 +111,7 @@ class mail_thread(osv.AbstractModel): if res[id]['message_unread_count']: title = res[id]['message_unread_count'] > 1 and _("You have %d unread messages") % res[id]['message_unread_count'] or _("You have one unread message") res[id]['message_summary'] = "9 %d %s" % (title, res[id].pop('message_unread_count'), _("New")) - res[id].pop('message_unread_count') # remove internal value + res[id].pop('message_unread_count', None) return res def _get_subscription_data(self, cr, uid, ids, name, args, context=None): From 08e07af590759fd08118e70edf4d8004690e755e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 14 Mar 2014 12:27:09 +0100 Subject: [PATCH 29/50] [FIX] pager: do not try to toggle the visibility if the pager do not exists yet bzr revid: mat@openerp.com-20140314112709-0sqq6tcpmza34q1e --- addons/web/static/src/js/view_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f1b30f6b8e1..cd220ca9ece 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -271,12 +271,14 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.$buttons) { this.$buttons.show(); } + if (this.$pager) { + this.$pager.toggle(this.dataset.ids.length > 1); + } this.$el.show().css({ opacity: '0', filter: 'alpha(opacity = 0)' }); this.$el.add(this.$buttons).removeClass('oe_form_dirty'); - this.$pager.toggle(this.dataset.ids.length > 1); var shown = this.has_been_loaded; if (options.reload !== false) { From b93ae13482df30ded3be1550d7b343c6664920d9 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 14 Mar 2014 12:59:36 +0100 Subject: [PATCH 30/50] [FIX] share wizard: delete wizard lines in cascade bzr revid: chs@openerp.com-20140314115936-8y6eg51tzmsdlb85 --- addons/share/wizard/share_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index b5072f243f6..e9d83be85cb 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -925,7 +925,7 @@ class share_result_line(osv.osv_memory): 'login': fields.related('user_id', 'login', string='Login', type='char', size=64, required=True, readonly=True), 'password': fields.char('Password', size=64, readonly=True), 'share_url': fields.function(_share_url, string='Share URL', type='char', size=512), - 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True), + 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True, ondelete='cascade'), 'newly_created': fields.boolean('Newly created', readonly=True), } _defaults = { From a9f98e49909f047939565a1f68a4390aa075d64d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 14 Mar 2014 14:18:49 +0100 Subject: [PATCH 31/50] [FIX] pad: improve pad bootstrap, prevent creating useless empty pads, avoid edition warning in read-only mode for new pads, translate messages Added a small method to detect the proper server configuration, and make it degrade gracefully if the method is not present. This avoids having to force a pad URL generation in order to test the config (possibly creating useless pads). Add a user-friendly message when the pad has not yet been initialized for a given record, in read-only mode. bzr revid: odo@openerp.com-20140314131849-rnjvk1pqpiyvtc1c --- addons/pad/pad.py | 4 ++ addons/pad/static/src/css/etherpad.css | 1 + addons/pad/static/src/js/pad.js | 96 +++++++++++++++----------- 3 files changed, 62 insertions(+), 39 deletions(-) diff --git a/addons/pad/pad.py b/addons/pad/pad.py index 22e8931d12a..0a72e2abde3 100644 --- a/addons/pad/pad.py +++ b/addons/pad/pad.py @@ -14,6 +14,10 @@ _logger = logging.getLogger(__name__) class pad_common(osv.osv_memory): _name = 'pad.common' + def pad_is_configured(self, cr, uid, context=None): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return bool(user.company_id.pad_server) + def pad_generate_url(self, cr, uid, context=None): company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id; diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css index facf15b28de..d2d8b748ab5 100644 --- a/addons/pad/static/src/css/etherpad.css +++ b/addons/pad/static/src/css/etherpad.css @@ -71,6 +71,7 @@ .oe_pad_loading{ text-align: center; opacity: 0.75; + font-style: italic; } .etherpad_readonly ul, .etherpad_readonly ol { diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index 31ba8c42330..e04184bc8f7 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -1,63 +1,81 @@ openerp.pad = function(instance) { + var _t = instance.web._t; instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeWidgetMixin, { template: 'FieldPad', content: "", init: function() { + var self = this; this._super.apply(this, arguments); - this.set("configured", true); - this.on("change:configured", this, this.switch_configured); + this._configured_deferred = this.view.dataset.call('pad_is_configured').done(function(data) { + self.set("configured", !!data); + }).fail(function(data, event) { + event.preventDefault(); + self.set("configured", true); + }); }, initialize_content: function() { var self = this; - this.switch_configured(); this.$('.oe_pad_switch').click(function() { self.$el.toggleClass('oe_pad_fullscreen'); self.view.$el.find('.oe_chatter').toggle(); }); + this._configured_deferred.always(function() { + var configured = self.get('configured'); + self.$(".oe_unconfigured").toggle(!configured); + self.$(".oe_configured").toggle(configured); + }); this.render_value(); }, - switch_configured: function() { - this.$(".oe_unconfigured").toggle(! this.get("configured")); - this.$(".oe_configured").toggle(this.get("configured")); - }, render_value: function() { - var self = this; - if (this.get("configured") && ! this.get("value")) { - self.view.dataset.call('pad_generate_url', { - context: { - model: self.view.model, - field_name: self.name, - object_id: self.view.datarecord.id - }, - }).done(function(data) { - if (! data.url) { - self.set("configured", false); + var self = this; + this._configured_deferred.always(function() { + if (! self.get('configured')) { + return; + }; + var value = self.get('value'); + if (self.get('effective_readonly')) { + if (_.str.startsWith(value, 'http')) { + this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) { + self.$('.oe_pad_content').removeClass('oe_pad_loading').html('
'); + self.$('.oe_pad_readonly').html(data); + }).fail(function() { + self.$('.oe_pad_content').text(_t('Unable to load pad')); + }); } else { - self.set("value", data.url); + self.$('.oe_pad_content').addClass('oe_pad_loading').show().text(_t("This pad will be initialized on first edit")); } - }); - } - this.$('.oe_pad_content').html(""); - var value = this.get('value'); - if (this.pad_loading_request) { - this.pad_loading_request.abort(); - } - if (_.str.startsWith(value, 'http')) { - if (! this.get('effective_readonly')) { - var content = ''; - this.$('.oe_pad_content').html(content); - this._dirty_flag = true; - } else { - this.content = '
... Loading pad ...
'; - this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) { - self.$('.oe_pad_content').html('
'); - self.$('.oe_pad_readonly').html(data); - }).fail(function() { - self.$('.oe_pad_content').text('Unable to load pad'); + } + else { + var def = $.when(); + if (! value || !_.str.startsWith(value, 'http')) { + def = self.view.dataset.call('pad_generate_url', { + context: { + model: self.view.model, + field_name: self.name, + object_id: self.view.datarecord.id + }, + }).done(function(data) { + if (! data.url) { + self.set("configured", false); + } else { + self.set("value", data.url); + } + }); + } + def.then(function() { + value = self.get('value'); + if (_.str.startsWith(value, 'http')) { + var content = ''; + self.$('.oe_pad_content').html(content); + self._dirty_flag = true; + } + else { + self.$('.oe_pad_content').text(value); + } }); } - } + }); }, }); From 53922c95930716b69b60170acceea60dab5cc9de Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 14 Mar 2014 14:28:54 +0100 Subject: [PATCH 32/50] [FIX] pager: revert of revision 4159, the pager was disapearing when going in editable mode (which is more problematic that the issue rev 4159 was trying to fix) bzr revid: mat@openerp.com-20140314132854-8ie8sosx9xecuww4 --- addons/web/static/src/js/view_form.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cd220ca9ece..edb44e7ea06 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -271,9 +271,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (this.$buttons) { this.$buttons.show(); } - if (this.$pager) { - this.$pager.toggle(this.dataset.ids.length > 1); - } this.$el.show().css({ opacity: '0', filter: 'alpha(opacity = 0)' @@ -423,6 +420,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.do_update_pager(); }, do_update_pager: function(hide_index) { + this.$pager.toggle(this.dataset.ids.length > 1); if (hide_index) { $(".oe_form_pager_state", this.$pager).html(""); } else { From 9965b2c434152a0fda76b3c4ffe1f8f88763fe59 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 17 Mar 2014 05:09:59 +0000 Subject: [PATCH 33/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0 bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo --- addons/crm/i18n/sl.po | 12 +- addons/crm_claim/i18n/sl.po | 8 +- addons/hr_contract/i18n/sl.po | 22 +- addons/hr_recruitment/i18n/lt.po | 1280 +++++++++++++++++ addons/marketing_campaign_crm_demo/i18n/sl.po | 48 +- addons/mrp/i18n/ja.po | 22 +- addons/project_timesheet/i18n/sl.po | 93 +- 7 files changed, 1401 insertions(+), 84 deletions(-) create mode 100644 addons/hr_recruitment/i18n/lt.po diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po index 7113b501a85..382d65aa2b3 100644 --- a/addons/crm/i18n/sl.po +++ b/addons/crm/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-01-07 16:56+0000\n" -"PO-Revision-Date: 2014-02-03 10:25+0000\n" +"PO-Revision-Date: 2014-03-14 14:54+0000\n" "Last-Translator: Darja Zorman \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-04 06:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: crm #: view:crm.lead.report:0 @@ -233,7 +233,7 @@ msgstr "Telefonski klic" #. module: crm #: field:crm.lead,opt_out:0 msgid "Opt-Out" -msgstr "" +msgstr "Opt-Out" #. module: crm #: view:crm.lead:0 @@ -1629,7 +1629,7 @@ msgstr "Visoka" #. module: crm #: model:process.node,note:crm.process_node_partner0 msgid "Convert to prospect to business partner" -msgstr "" +msgstr "Spremeni v poslovnega partnerja" #. module: crm #: model:ir.model,name:crm.model_crm_payment_mode @@ -2471,7 +2471,7 @@ msgstr "" #. module: crm #: field:crm.case.stage,fold:0 msgid "Fold by Default" -msgstr "" +msgstr "Prizeto stanje - Zaprto" #. module: crm #: field:crm.case.stage,state:0 diff --git a/addons/crm_claim/i18n/sl.po b/addons/crm_claim/i18n/sl.po index 5f87a08b228..005048d1e89 100644 --- a/addons/crm_claim/i18n/sl.po +++ b/addons/crm_claim/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-11-09 10:57+0000\n" +"PO-Revision-Date: 2014-03-14 14:55+0000\n" "Last-Translator: Darja Zorman \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:05+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: crm_claim #: help:crm.claim.stage,fold:0 @@ -354,7 +354,7 @@ msgstr "Datumi" #. module: crm_claim #: help:crm.claim,email_from:0 msgid "Destination email for email gateway." -msgstr "" +msgstr "Namembno el.sporočilo za email vozlišče (gateway)" #. module: crm_claim #: code:addons/crm_claim/crm_claim.py:194 diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po index 34042c43678..770f36dd49b 100644 --- a/addons/hr_contract/i18n/sl.po +++ b/addons/hr_contract/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-11-22 15:36+0000\n" -"Last-Translator: Darja Zorman \n" +"PO-Revision-Date: 2014-03-14 14:57+0000\n" +"Last-Translator: Dušan Laznik (Mentis) \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-23 06:26+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: hr_contract #: field:hr.contract,wage:0 @@ -92,18 +92,18 @@ msgstr "Zaposlitev" #. module: hr_contract #: field:hr.contract,advantages:0 msgid "Advantages" -msgstr "" +msgstr "Prednosti" #. module: hr_contract #: view:hr.contract:0 msgid "Work Permit" -msgstr "" +msgstr "Dovoljenje za delo" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type msgid "Contract Types" -msgstr "" +msgstr "Vrste pogodb" #. module: hr_contract #: view:hr.employee:0 @@ -140,7 +140,7 @@ msgstr "Opombe" #. module: hr_contract #: field:hr.contract,permit_no:0 msgid "Work Permit No" -msgstr "" +msgstr "Št. dovoljenja za delo" #. module: hr_contract #: view:hr.contract:0 @@ -169,12 +169,12 @@ msgstr "Delovni urnik" #. module: hr_contract #: view:hr.contract:0 msgid "Salary and Advantages" -msgstr "" +msgstr "Plača in bonitete" #. module: hr_contract #: field:hr.contract,job_id:0 msgid "Job Title" -msgstr "" +msgstr "Naziv delovnega mesta" #. module: hr_contract #: constraint:hr.contract:0 @@ -199,7 +199,7 @@ msgstr "Št. vizuma" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 msgid "Home-Work Dist." -msgstr "" +msgstr "Delo od doma" #. module: hr_contract #: field:hr.employee,place_of_birth:0 diff --git a/addons/hr_recruitment/i18n/lt.po b/addons/hr_recruitment/i18n/lt.po new file mode 100644 index 00000000000..76a4866f3d0 --- /dev/null +++ b/addons/hr_recruitment/i18n/lt.po @@ -0,0 +1,1280 @@ +# Lithuanian translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-03-16 13:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-03-17 05:09+0000\n" +"X-Generator: Launchpad (build 16963)\n" + +#. module: hr_recruitment +#: help:hr.applicant,active:0 +msgid "" +"If the active field is set to false, it will allow you to hide the case " +"without removing it." +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.stage:0 +#: field:hr.recruitment.stage,requirements:0 +msgid "Requirements" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Application Summary" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Start Interview" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Mobile:" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.stage,fold:0 +msgid "" +"This stage is not visible, for example in status bar or kanban view, when " +"there are no records in that stage to display." +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate +msgid "Graduate" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Group By..." +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Filter and view on next actions and date" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,department_id:0 +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,department_id:0 +msgid "Department" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,date_action:0 +msgid "Next Action Date" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,salary_expected_extra:0 +msgid "Expected Salary Extra" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Jobs" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Extra advantages..." +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Pending Jobs" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,message_unread:0 +msgid "Unread Messages" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,company_id:0 +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.source:0 +#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action +#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source +msgid "Sources of Applicants" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/hr_recruitment.py:435 +#, python-format +msgid "You must define Applied Job for this applicant." +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Job" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.partner.create,close:0 +msgid "Close job request" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job +msgid "" +"

\n" +" Click to add a new job applicant.\n" +"

\n" +" OpenERP helps you track applicants in the recruitment\n" +" process and follow up all operations: meetings, interviews, " +"etc.\n" +"

\n" +" If you setup the email gateway, applicants and their " +"attached\n" +" CV are created automatically when an email is sent to\n" +" jobs@yourcompany.com. If you install the document " +"management\n" +" modules, all resumes are indexed automatically, so that you " +"can\n" +" easily search through their content.\n" +"

\n" +" " +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job +#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job +msgid "Applications" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,day_open:0 +msgid "Days to Open" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,emp_id:0 +msgid "employee" +msgstr "" + +#. module: hr_recruitment +#: field:hr.config.settings,fetchmail_applicants:0 +msgid "Create applicants from an incoming email account" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,day:0 +msgid "Day" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.partner.create:0 +#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create +msgid "Create Contact" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Refuse" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced +msgid "Master Degree" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,partner_mobile:0 +msgid "Mobile" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Next Actions" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38 +#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56 +#, python-format +msgid "Error!" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5 +msgid "Doctoral Degree" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,job_id:0 +#: field:hr.recruitment.report,job_id:0 +msgid "Applied Job" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.stage,department_id:0 +msgid "" +"Stages of the recruitment process may be different per department. If this " +"stage is common to all departments, keep this field empty." +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,color:0 +msgid "Color Index" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting +msgid "Meetings" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status +msgid "Applicants Status" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "My Recruitment" +msgstr "" + +#. module: hr_recruitment +#: field:hr.job,survey_id:0 +msgid "Interview Form" +msgstr "" + +#. module: hr_recruitment +#: help:hr.job,survey_id:0 +msgid "" +"Choose an interview form for this job position and you will be able to " +"print/answer this interview from all applicants who apply for this job" +msgstr "" + +#. module: hr_recruitment +#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment +msgid "Recruitment" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/hr_recruitment.py:435 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,salary_prop:0 +msgid "Salary Proposed" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Avg Proposed Salary" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,availability:0 +#: field:hr.recruitment.report,available:0 +msgid "Availability" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,salary_proposed:0 +#: view:hr.recruitment.report:0 +msgid "Proposed Salary" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source +msgid "Source of Applicants" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.partner.create:0 +msgid "Convert To Partner" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report +msgid "Recruitments Statistics" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Print interview report" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Hired employees" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_job +msgid "Job Description" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,source_id:0 +msgid "Source" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,year:0 +msgid "Year" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.source,name:hr_recruitment.source_monster +msgid "Monster" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired +msgid "Applicant Hired" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,email_from:0 +msgid "Email" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act +msgid "" +"

\n" +" Click to add a new stage in the recruitment process.\n" +"

\n" +" Define here your stages of the recruitment process, for " +"example:\n" +" qualification call, first interview, second interview, refused,\n" +" hired.\n" +"

\n" +" " +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Available" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,title_action:0 +msgid "Next Action" +msgstr "" + +#. module: hr_recruitment +#: help:hr.job,alias_id:0 +msgid "" +"Email alias for this job position. New emails will automatically create new " +"applicants for this job position." +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,priority:0 +#: selection:hr.recruitment.report,priority:0 +msgid "Good" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "August" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,create_date:0 +#: view:hr.recruitment.report:0 +msgid "Creation Date" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee +#: model:ir.model,name:hr_recruitment.model_hired_employee +msgid "Create Employee" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,priority:0 +#: field:hr.recruitment.report,priority:0 +msgid "Appreciation" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1 +msgid "Initial Qualification" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Print Interview" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,stage_id:0 +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,stage_id:0 +#: view:hr.recruitment.stage:0 +msgid "Stage" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3 +msgid "Second Interview" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act +msgid "Recruitment / Applicants Stages" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,salary_expected:0 +#: view:hr.recruitment.report:0 +msgid "Expected Salary" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "July" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,email_cc:0 +msgid "Watchers Emails" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Applicants" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/hr_recruitment.py:351 +#, python-format +msgid "No Subject" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,salary_exp:0 +msgid "Salary Expected" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_applicant +msgid "Applicant" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.stage,sequence:0 +msgid "Gives the sequence order when displaying a list of stages." +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,partner_id:0 +msgid "Contact" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,salary_expected_extra:0 +msgid "Salary Expected by Applicant, extra advantages" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,state:0 +msgid "" +"The status is set to 'Draft', when a case is created. " +"If the case is in progress the status is set to 'Open'. " +"When the case is over, the status is set to 'Done'. If " +"the case needs to be reviewed then the status is set " +"to 'Pending'." +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "March" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.stage:0 +#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act +#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage +msgid "Stages" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Draft recruitment" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Delete" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "In progress" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Hire & Create Employee" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired +msgid "Applicant hired" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Jobs - Recruitment Form" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,probability:0 +msgid "Probability" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "April" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "September" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "December" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39 +#, python-format +msgid "A contact is already defined on this job request." +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,categ_ids:0 +msgid "Tags" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_applicant_category +msgid "Category of applicant" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "e.g. Call for interview" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,month:0 +msgid "Month" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Answer related job question" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree +msgid "Degree of Recruitment" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,write_date:0 +msgid "Update Date" +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +msgid "Yes" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,name:0 +msgid "Subject" +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +#: view:hr.recruitment.partner.create:0 +msgid "or" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused +msgid "Applicant Refused" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Schedule Meeting" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,partner_name:0 +msgid "Applicant's Name" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,priority:0 +#: selection:hr.recruitment.report,priority:0 +msgid "Very Good" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,user_email:0 +msgid "User Email" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,date_open:0 +msgid "Opened" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Group By ..." +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +msgid "No" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,salary_expected:0 +msgid "Salary Expected by Applicant" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "All Initial Jobs" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" + +#. module: hr_recruitment +#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree +msgid "Degrees" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,date_closed:0 +#: field:hr.recruitment.report,date_closed:0 +msgid "Closed" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.stage:0 +msgid "Stage Definition" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,delay_close:0 +msgid "Avg. Delay to Close" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,salary_proposed:0 +msgid "Salary Proposed by the Organisation" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: selection:hr.applicant,state:0 +#: view:hr.recruitment.report:0 +#: selection:hr.recruitment.report,state:0 +#: selection:hr.recruitment.stage,state:0 +msgid "Pending" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,state:0 +#: field:hr.recruitment.report,state:0 +#: field:hr.recruitment.stage,state:0 +msgid "Status" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Schedule interview with this applicant" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/hr_recruitment.py:397 +#, python-format +msgid "Applicant created" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,type_id:0 +#: view:hr.recruitment.degree:0 +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,type_id:0 +#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action +msgid "Degree" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,partner_phone:0 +msgid "Phone" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "June" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,day_close:0 +msgid "Days to Close" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,user_id:0 +msgid "User" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,priority:0 +#: selection:hr.recruitment.report,priority:0 +msgid "Excellent" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,active:0 +msgid "Active" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: field:hr.recruitment.report,nbr:0 +msgid "# of Applications" +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act +msgid "" +"

\n" +" Click to add a new stage in the recruitment process.\n" +"

\n" +" Don't forget to specify the department if your recruitment " +"process\n" +" is different according to the job position.\n" +"

\n" +" " +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,response:0 +msgid "Response" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "October" +msgstr "" + +#. module: hr_recruitment +#: field:hr.config.settings,module_document_ftp:0 +msgid "Allow the automatic indexation of resumes" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,salary_proposed_extra:0 +msgid "Proposed Salary Extra" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "January" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56 +#, python-format +msgid "A contact is already existing with the same name." +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer +msgid "Review Recruitment Stages" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Contact:" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Search Jobs" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,date:0 +#: field:hr.recruitment.report,date:0 +msgid "Date" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,survey:0 +msgid "Survey" +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +msgid "Would you like to create an employee ?" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Degree:" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: hr_recruitment +#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer +msgid "" +"Check if the following stages are matching your recruitment process. Don't " +"forget to specify the department if your recruitment process is different " +"according to the job position." +msgstr "" + +#. module: hr_recruitment +#: view:hr.config.settings:0 +msgid "Configure" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4 +msgid "Contract Proposed" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.source,name:hr_recruitment.source_website_company +msgid "Company Website" +msgstr "" + +#. module: hr_recruitment +#: sql_constraint:hr.recruitment.degree:0 +msgid "The name of the Degree of Recruitment must be unique!" +msgstr "" + +#. module: hr_recruitment +#: code:addons/hr_recruitment/hr_recruitment.py:349 +#, python-format +msgid "Contact Email" +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +#: view:hr.recruitment.partner.create:0 +msgid "Cancel" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.partner.create:0 +msgid "Are you sure you want to create a contact based on this job request ?" +msgstr "" + +#. module: hr_recruitment +#: help:hr.config.settings,fetchmail_applicants:0 +msgid "" +"Allow applicants to send their job application to an email address " +"(jobs@mycompany.com),\n" +" and create automatically application documents in the system." +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: selection:hr.applicant,state:0 +#: selection:hr.recruitment.stage,state:0 +msgid "In Progress" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Subject / Applicant" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.degree,sequence:0 +msgid "Gives the sequence order when displaying a list of degrees." +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed +msgid "Stage changed" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,user_id:0 +#: view:hr.recruitment.report:0 +msgid "Responsible" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all +#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all +msgid "Recruitment Analysis" +msgstr "" + +#. module: hr_recruitment +#: view:hired.employee:0 +msgid "Create New Employee" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.source,name:hr_recruitment.source_linkedin +msgid "LinkedIn" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant +msgid "New Applicant" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage +msgid "Stage of Recruitment" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Cases By Stage and Estimates" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +#: selection:hr.applicant,state:0 +#: view:hr.recruitment.report:0 +#: selection:hr.recruitment.report,state:0 +#: selection:hr.recruitment.stage,state:0 +msgid "New" +msgstr "" + +#. module: hr_recruitment +#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview +#: view:hr.job:0 +msgid "Interview" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.source,name:0 +msgid "Source Name" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Day(s)" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,description:0 +msgid "Description" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed +msgid "Stage Changed" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "May" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5 +msgid "Contract Signed" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.source,name:hr_recruitment.source_word +msgid "Word of Mouth" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.stage,fold:0 +msgid "Hide in views if empty" +msgstr "" + +#. module: hr_recruitment +#: help:hr.config.settings,module_document_ftp:0 +msgid "" +"Manage your CV's and motivation letter related to all applicants.\n" +" This installs the module document_ftp. This will install the " +"knowledge management module in order to allow you to search using specific " +"keywords through the content of all documents (PDF, .DOCx...)" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,state:0 +#: selection:hr.recruitment.report,state:0 +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6 +#: selection:hr.recruitment.stage,state:0 +msgid "Refused" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,state:0 +#: view:hr.recruitment.report:0 +#: selection:hr.recruitment.report,state:0 +#: selection:hr.recruitment.stage,state:0 +msgid "Hired" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,reference:0 +msgid "Referred By" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Departement:" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,priority:0 +#: selection:hr.recruitment.report,priority:0 +msgid "On Average" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2 +msgid "First Interview" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,salary_prop_avg:0 +msgid "Avg. Proposed Salary" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Open Jobs" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "February" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.applicant,priority:0 +#: selection:hr.recruitment.report,priority:0 +msgid "Not Good" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant_category,name:0 +#: field:hr.recruitment.degree,name:0 +#: field:hr.recruitment.stage,name:0 +msgid "Name" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,month:0 +msgid "November" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.report,salary_exp_avg:0 +msgid "Avg. Expected Salary" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Avg Expected Salary" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create +msgid "Create Partner from job application" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,email_from:0 +msgid "These people will receive email." +msgstr "" + +#. module: hr_recruitment +#: field:hr.job,alias_id:0 +msgid "Alias" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Feedback of interviews..." +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "Pending recruitment" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Contract" +msgstr "" + +#. module: hr_recruitment +#: field:hr.applicant,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: hr_recruitment +#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused +msgid "Applicant refused" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.stage,department_id:0 +msgid "Specific to a Department" +msgstr "" + +#. module: hr_recruitment +#: view:hr.recruitment.report:0 +msgid "In progress recruitment" +msgstr "" + +#. module: hr_recruitment +#: field:hr.recruitment.degree,sequence:0 +#: field:hr.recruitment.stage,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: hr_recruitment +#: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor +msgid "Bachelor Degree" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Unassigned Recruitments" +msgstr "" + +#. module: hr_recruitment +#: model:ir.model,name:hr_recruitment.model_hr_config_settings +msgid "hr.config.settings" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.stage,state:0 +msgid "" +"The related status for the stage. The status of your document will " +"automatically change according to the selected stage. Example, a stage is " +"related to the status 'Close', when your document reach this stage, it will " +"be automatically closed." +msgstr "" + +#. module: hr_recruitment +#: help:hr.applicant,salary_proposed_extra:0 +msgid "Salary Proposed by the Organisation, extra advantages" +msgstr "" + +#. module: hr_recruitment +#: help:hr.recruitment.report,delay_close:0 +msgid "Number of Days to close the project issue" +msgstr "" + +#. module: hr_recruitment +#: selection:hr.recruitment.report,state:0 +msgid "Open" +msgstr "" + +#. module: hr_recruitment +#: view:board.board:0 +msgid "Applications to be Processed" +msgstr "" + +#. module: hr_recruitment +#: view:hr.applicant:0 +msgid "Schedule Interview" +msgstr "" diff --git a/addons/marketing_campaign_crm_demo/i18n/sl.po b/addons/marketing_campaign_crm_demo/i18n/sl.po index e5ae1e81e5a..3b39a4af717 100644 --- a/addons/marketing_campaign_crm_demo/i18n/sl.po +++ b/addons/marketing_campaign_crm_demo/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-02-03 11:37+0000\n" -"Last-Translator: Dušan Laznik (Mentis) \n" +"PO-Revision-Date: 2014-03-14 12:53+0000\n" +"Last-Translator: Darja Zorman \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:19+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: marketing_campaign_crm_demo #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8 @@ -41,12 +41,12 @@ msgstr "" #. module: marketing_campaign_crm_demo #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report msgid "Marketing campaign demo report" -msgstr "Marketing campaign demo report" +msgstr "Demo poročilo o marketinški kampanji" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_8 msgid "Thanks for subscribing to technical training" -msgstr "Thanks for subscribing to technical training" +msgstr "Hvala za prijavo na tehnično usposabljanje" #. module: marketing_campaign_crm_demo #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_3 @@ -68,12 +68,12 @@ msgstr "" #. module: marketing_campaign_crm_demo #: report:crm.lead.demo:0 msgid "Company :" -msgstr "Company :" +msgstr "Podjetje" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_4 msgid "Thanks for buying the OpenERP book" -msgstr "Thanks for buying the OpenERP book" +msgstr "Hvala za nakup OpenERP knjige" #. module: marketing_campaign_crm_demo #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_6 @@ -86,23 +86,23 @@ msgid "" "reply to this message.

\n" "

Regards,OpenERP Team,

" msgstr "" -"

Hello,

\n" -"

We have very good offer that might suit you.\n" -" For our silver partners,We are paid technical training on " -"june,2010.

\n" -"

If any further information is required, do not hesitate to " -"reply to this message.

\n" -"

Regards,OpenERP Team,

" +"

Pozdravljeni,

\n" +"

Imamo zelo dobro ponudbo, ki bi vam lahko ustrezala.\n" +" Za naše Srebrne partnerje plačamo tehnično usposabljanje junija " +"2010.

\n" +"

Če potrebujete dodatne informacije, prosimo, odgovorite na to " +"sporočilo.

\n" +"

Pozdrav,OpenERP Team,

" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_1 msgid "Thanks for showing interest in OpenERP" -msgstr "Thanks for showing interest in OpenERP" +msgstr "Hvala za izkazan interes za OpenERP" #. module: marketing_campaign_crm_demo #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy msgid "Dummy Action" -msgstr "Dummy Action" +msgstr "Navidezna aktivnost" #. module: marketing_campaign_crm_demo #: report:crm.lead.demo:0 @@ -150,12 +150,12 @@ msgstr "" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_2 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010" -msgstr "Propose to subscribe to the OpenERP Discovery Day on May 2010" +msgstr "Predlog za prijavo na OpenERP raziskovalni dan maja 2010" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_3 msgid "Thanks for subscribing to the OpenERP Discovery Day" -msgstr "Thanks for subscribing to the OpenERP Discovery Day" +msgstr "Hvala za prijavo na OpenERP raziskovanli dan" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_7 @@ -165,7 +165,7 @@ msgstr "Propose gold partnership to silver partners" #. module: marketing_campaign_crm_demo #: model:email.template,subject:marketing_campaign_crm_demo.email_template_6 msgid "Propose paid training to Silver partners" -msgstr "Propose paid training to Silver partners" +msgstr "Predlagaj plačano usposabljanje Srebrnim partnerjem" #. module: marketing_campaign_crm_demo #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_4 @@ -175,10 +175,10 @@ msgid "" " If any further information required kindly revert back.\n" "

Regards,OpenERP Team,

" msgstr "" -"

Hello,

\n" -"

Thanks for showing interest and buying the OpenERP book.

\n" -" If any further information required kindly revert back.\n" -"

Regards,OpenERP Team,

" +"

Pozdravljeni,

\n" +"

Hvala za izkazan interes in nakup knjige OpenERP.

\n" +" Za dodatne informacije prosimo, da odgovorite.\n" +"

Pozdrav, OpenERP Team,

" #. module: marketing_campaign_crm_demo #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_7 diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po index 0cd252364bf..3d43edf53c1 100644 --- a/addons/mrp/i18n/ja.po +++ b/addons/mrp/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-07 05:43+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-03-15 16:58+0000\n" +"Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-08 06:54+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-16 06:06+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -29,6 +29,14 @@ msgid "" " * Notes for the technician and for the final customer.\n" " This installs the module mrp_repair." msgstr "" +"すべての製品の修理を管理できます。\n" +"* 修復する製品の追加/削除\n" +"* 在庫への影響\n" +"* 請求(製品とサービス)\n" +"* 保証コンセプト\n" +"* 修理見積報告\n" +"* 技術者および最終的な顧客のための注記\n" +"mrp_repairモジュールがインスツールされます。" #. module: mrp #: report:mrp.production.order:0 @@ -290,7 +298,7 @@ msgid "" "When processing a sales order for this product, the delivery order\n" " will contain the raw materials, instead of " "the finished product." -msgstr "" +msgstr "この製品の受注を処理した時、配送は完成品ではなく原材料を含みます。" #. module: mrp #: report:mrp.production.order:0 @@ -2057,6 +2065,8 @@ msgid "" " With this module: A + B + C -> D + E.\n" " This installs the module mrp_byproduct." msgstr "" +"部品表の中に副製品を構成できます。このモジュールを使用しない場合は A + B + C -> D ですが、使用する場合は A + B + C -> D " +"+ E にできます。mrp_byproductモジュールがインストールされます。" #. module: mrp #: field:procurement.order,bom_id:0 @@ -2286,6 +2296,8 @@ msgid "" "product, it will be sold and shipped as a set of components, instead of " "being produced." msgstr "" +"副製品がいくつかの製品で使用される場合、それ自身のBOMを作成するためにも有用です。この副製品の製造オーダーを望まない場合、BOMタイプとしてセット/架空" +"を選択します。架空BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷をします。" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_mrp_configuration diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po index f8103a7b342..c89d2538cac 100644 --- a/addons/project_timesheet/i18n/sl.po +++ b/addons/project_timesheet/i18n/sl.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-02-23 22:05+0000\n" -"Last-Translator: Dušan Laznik (Mentis) \n" +"PO-Revision-Date: 2014-03-14 12:50+0000\n" +"Last-Translator: Matjaž Mozetič (Matmoz) \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Tasks by User" -msgstr "Naloge po uporabniku" +msgstr "Opravila po uporabniku" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" -msgstr "" +msgstr "Združi po letnicah datuma" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -44,18 +44,20 @@ msgid "" "You cannot delete a partner which is assigned to project, but you can " "uncheck the active box." msgstr "" +"Partnerja, ki je dodeljen projektu, ne morete izbrisati, lahko pa odznačite " +"polje \"aktiven\"" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task_work msgid "Project Task Work" -msgstr "" +msgstr "Delo na projektnih opravilih" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:294 #, python-format msgid "" "You cannot select a Analytic Account which is in Close or Cancelled state." -msgstr "" +msgstr "Analitičnega konta v stanju Zaprto ali Preklicano ne morete izbrati." #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -77,7 +79,7 @@ msgstr "Časovnice" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "Plačljivo" +msgstr "Zaračunljivo" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -90,21 +92,28 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Kliknite za dodajanje pogodbe s kupcem.\n" +"

\n" +" Tu najdete pogodbe povezane s projekti kupcev\n" +" za potrebe sledenja napredovanja obračuna.\n" +"

\n" +" " #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic Account/Project" -msgstr "" +msgstr "Analitični konto/Projekt" #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic account/project" -msgstr "" +msgstr "Analitični konto/projekt" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Projekti kupca" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:89 @@ -114,6 +123,8 @@ msgid "" "employee.\n" "Fill in the HR Settings tab of the employee form." msgstr "" +"Določite konto proizvoda in kategorije proizvoda za povezani kader.\n" +"Izpolnite tabelo HR Settings (Nastavitve kadrov) v obrazcu zaposleni." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line @@ -128,12 +139,12 @@ msgstr "Avgust" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0 msgid "Task invoice" -msgstr "" +msgstr "Obračun opravila" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_taskwork0 msgid "Task Work" -msgstr "Delo na nalogi" +msgstr "Delo na opravilu" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -147,6 +158,8 @@ msgid "" "Please define journal on the related employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Določite prosim dnevnik za povezani kader.\n" +"Izpolnite tabelo časovnice v obrazcu zaposlenih." #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in @@ -156,7 +169,7 @@ msgstr "Prijavi/odjavi se iz projekta" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Zaračunljiv projekt" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts @@ -171,12 +184,12 @@ msgstr "Ure" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by month of date" -msgstr "" +msgstr "Združi po mesecih datuma" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task msgid "Task" -msgstr "Naloga" +msgstr "Opravilo" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -198,12 +211,12 @@ msgstr "Julij" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_timesheettask0 msgid "Complete Your Timesheet." -msgstr "" +msgstr "Izpolni svojo časovnico" #. module: project_timesheet #: field:report.timesheet.task.user,task_hrs:0 msgid "Task Hours" -msgstr "Ure po nalogi" +msgstr "Ure na opravilu" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -221,21 +234,28 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Tu najdete časovnice in nabavo za pogodbe, ki jih lahko " +"zaračunate kupcu.\n" +" Če želite vknjižiti nova opravila za obračun, uporabite menu " +"časovnice.\n" +"

\n" +" " #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_timesheettask0 msgid "Timesheet task" -msgstr "" +msgstr "Opravilo časovnice" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskencoding0 msgid "Task encoding" -msgstr "" +msgstr "Knjiženje opravil" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0 msgid "Task summary is comes into the timesheet line" -msgstr "" +msgstr "Povzetek opravila kot bo prikazano na postavki časovnice" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -245,7 +265,7 @@ msgstr "Januar" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_triggerinvoice0 msgid "Trigger Invoice" -msgstr "" +msgstr "Sproži račun" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -275,13 +295,13 @@ msgstr "report.timesheet.task.user" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskencoding0 msgid "Encode how much time u spent on your task" -msgstr "" +msgstr "Vknjiži čas porabljen na opravilu" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:85 #, python-format msgid "Please define employee for user \"%s\". You must create one." -msgstr "" +msgstr "Določite ali ustvarite zaposlenega za uporabnika \"%s\"." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_res_partner @@ -292,12 +312,12 @@ msgstr "Partner" #: code:addons/project_timesheet/project_timesheet.py:294 #, python-format msgid "Invalid Analytic Account !" -msgstr "" +msgstr "Neveljaven analitični konto !" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Timesheet/Task hours Report Per Month" -msgstr "" +msgstr "Mesečno poročilo o Časovnicah/Urah na opravilih" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:84 @@ -316,7 +336,7 @@ msgstr "Fakturiranje" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_triggerinvoice0 msgid "Trigger invoices from sales order lines" -msgstr "" +msgstr "Sproži izdajo računov iz postavk prodajnega naloga" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:100 @@ -326,6 +346,8 @@ msgid "" "employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Določite konto proizvoda in kategorije proizvoda za dotični kader.\n" +"Izpolnite tabelo Časovnica v obrazcu zaposleni/kadri." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:60 @@ -334,24 +356,26 @@ msgid "" "

Timesheets on this project may be invoiced to %s, according to the terms " "defined in the contract.

" msgstr "" +"

Časovnice tega projekta se lahko zaračuna %s, glede na pogodbena " +"določila.

" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_taskwork0 msgid "Work on task" -msgstr "Delo na nalogi" +msgstr "Delo na opravilu" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line msgid "Invoice Tasks" -msgstr "" +msgstr "Zaračunaj opravila" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user #: view:report.timesheet.task.user:0 msgid "Task Hours Per Month" -msgstr "" +msgstr "Delovne ure na opravilih po mesecih" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -366,7 +390,7 @@ msgstr "December" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "Po dokončanju opravila ustvari račun." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:266 @@ -387,11 +411,12 @@ msgid "" "

Record your timesheets for the project " "'%s'.

" msgstr "" +"

Vknjiži časovnice za projekt '%s'.

" #. module: project_timesheet #: field:report.timesheet.task.user,timesheet_hrs:0 msgid "Timesheet Hours" -msgstr "" +msgstr "Ure časovnice" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -402,4 +427,4 @@ msgstr "Leto" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0 msgid "Fill Timesheet" -msgstr "" +msgstr "Izpolni časovnico" From 112fe223472821d0d56cac7978e505454f495237 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 17 Mar 2014 17:41:31 +0100 Subject: [PATCH 34/50] [FIX] point_of_sale: prevent duplicated order posting bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a --- addons/point_of_sale/point_of_sale.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 206b4a80e67..f79b8b3d61c 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -488,10 +488,14 @@ class pos_order(osv.osv): _description = "Point of Sale" _order = "id desc" - def create_from_ui(self, cr, uid, orders, context=None): - #_logger.info("orders: %r", orders) + def create_from_ui(self, cr, uid, orders, context=None): + # Keep only new orders + submitted_references = [o['data']['name'] for o in orders] + existing_orders = self.search_read(cr, uid, domain=[('pos_reference', 'in', submitted_references)], fields=['pos_reference'], context=context) + existing_references = set([o['pos_reference'] for o in existing_orders]) + orders_to_save = [o for o in orders if o['data']['name'] not in existing_references] order_ids = [] - for tmp_order in orders: + for tmp_order in orders_to_save: order = tmp_order['data'] order_id = self.create(cr, uid, { 'name': order['name'], @@ -529,7 +533,10 @@ class pos_order(osv.osv): }, context=context) order_ids.append(order_id) wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr) + try: + wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr) + except Exception: + _logger.error('ERROR: Could not mark POS Order as Paid.', exc_info=True) return order_ids def write(self, cr, uid, ids, vals, context=None): From 596cc96b7e7e908893fbb03f297680b865c237b4 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 18 Mar 2014 06:21:35 +0000 Subject: [PATCH 35/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762 --- addons/delivery/i18n/fr.po | 10 +++--- addons/stock/i18n/fr.po | 10 +++--- addons/stock/i18n/zh_TW.po | 67 ++++++++++++++++++++++++++++---------- 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po index 363685d1707..b13330edfe7 100644 --- a/addons/delivery/i18n/fr.po +++ b/addons/delivery/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-05-21 16:09+0000\n" -"Last-Translator: Florian Hatat \n" +"PO-Revision-Date: 2014-03-17 13:18+0000\n" +"Last-Translator: WANTELLET Sylvain \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: delivery #: report:sale.shipping:0 @@ -619,7 +619,7 @@ msgstr "Prix de vente" #. module: delivery #: view:stock.picking.out:0 msgid "Print Delivery Order" -msgstr "Imprimer le bordereau de livraison" +msgstr "Imprimer le bon de livraison" #. module: delivery #: view:delivery.grid:0 diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index 28386e20ed9..c8aa04e8c11 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-01-03 09:46+0000\n" -"Last-Translator: Florian Hatat \n" +"PO-Revision-Date: 2014-03-17 13:11+0000\n" +"Last-Translator: Lionel Sausin - Numérigraphe \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-07 07:11+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -5364,7 +5364,7 @@ msgstr "Optionnel : mouvement de stock suivant quand il est enchainé." #. module: stock #: view:stock.picking.out:0 msgid "Print Delivery Slip" -msgstr "Imprimer le bordereau de livraison" +msgstr "Imprimer le bon de préparation" #. module: stock #: view:report.stock.inventory:0 diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index d8117d175fa..4ab2c01cc96 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-11 08:04+0000\n" +"PO-Revision-Date: 2014-03-17 08:03+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-12 05:26+0000\n" +"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" "X-Generator: Launchpad (build 16963)\n" #. module: stock @@ -3506,6 +3506,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊開始進行盤點。 \n" +"

\n" +" 定期盤點是使用在計算每個倉位的可用產品數量。\n" +" 您可每年執行年度盤點時使用或在您需要調整某 一\n" +" 產品的庫存水平的時候。\n" +"

\n" +" " #. module: stock #: view:stock.return.picking:0 @@ -3649,6 +3657,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊新增倉位。\n" +"

\n" +" 依您的倉庫架構及公司組織定義您的倉位。 OpenERP 能夠管理實\n" +" 際倉位 (倉庫、貨架、箱等等)、業務夥伴倉位(客戶、供應商。)及\n" +" 作為庫存作業對應的虛擬庫位，例如生產製造消耗、盤點作業等\n" +" 等。\n" +"

\n" +" 在 OpenERP 中的每一個庫存作業都是將產品從一個倉位移動到另\n" +" 外一個。舉例來說，假如您由供應商收到產品， OpenERP 會將產\n" +" 品由供應商倉位移動到庫存倉位。每張報表都能在實際、夥伴或虛\n" +" 擬倉位完成。\n" +"

\n" +" " #. module: stock #: field:stock.fill.inventory,recursive:0 @@ -3722,6 +3744,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊以開立收貨單。 \n" +"

\n" +" 收貨單是您從供應商收到的所有訂單的清單。\n" +" 收貨單包含了依原始採購訂單收貨的產品列表。\n" +"

\n" +" " #. module: stock #: view:stock.move:0 @@ -3839,7 +3868,7 @@ msgstr "產品度量單位" #. module: stock #: view:stock.move:0 msgid "Put in current pack" -msgstr "" +msgstr "放入目前的包裹" #. module: stock #: view:stock.inventory:0 @@ -3870,12 +3899,12 @@ msgstr "批次存貨" #: field:stock.report.prodlots,prodlot_id:0 #: field:stock.return.picking.memory,prodlot_id:0 msgid "Serial Number" -msgstr "" +msgstr "序號" #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "分批提貨處理精靈" #. module: stock #: field:stock.location,icon:0 @@ -3894,7 +3923,7 @@ msgstr "公司間轉移的中途倉位" #: field:stock.partial.picking,hide_tracking:0 #: field:stock.partial.picking.line,tracking:0 msgid "Tracking" -msgstr "" +msgstr "追蹤" #. module: stock #: view:stock.inventory.line.split:0 @@ -3902,7 +3931,7 @@ msgstr "" #: view:stock.move.scrap:0 #: view:stock.split.into:0 msgid "Ok" -msgstr "" +msgstr "確定" #. module: stock #: help:product.category,property_stock_account_output_categ:0 @@ -3920,7 +3949,7 @@ msgstr "" #: field:stock.picking.in,message_ids:0 #: field:stock.picking.out,message_ids:0 msgid "Messages" -msgstr "" +msgstr "訊息" #. module: stock #: model:stock.location,name:stock.stock_location_8 @@ -3963,6 +3992,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊定義一個新的倉庫。\n" +"

\n" +" " #. module: stock #: selection:report.stock.inventory,state:0 @@ -3978,7 +4011,7 @@ msgstr "取消" #. module: stock #: view:stock.picking:0 msgid "Confirmed Delivery Orders" -msgstr "" +msgstr "確認出貨單" #. module: stock #: view:stock.move:0 @@ -4004,7 +4037,7 @@ msgstr "" #. module: stock #: model:stock.location,name:stock.stock_location_shop0 msgid "Your Company, Chicago shop" -msgstr "" +msgstr "您的公司，芝加哥分店" #. module: stock #: selection:report.stock.move,type:0 @@ -4014,7 +4047,7 @@ msgstr "" #: selection:stock.picking.in,type:0 #: selection:stock.picking.out,type:0 msgid "Getting Goods" -msgstr "" +msgstr "收貨" #. module: stock #: help:stock.location,chained_location_type:0 @@ -4037,23 +4070,23 @@ msgstr "" msgid "" "By changing this quantity here, you accept the new quantity as complete: " "OpenERP will not automatically generate a back order." -msgstr "" +msgstr "通過修改此處的數量，視新的數量為已完成： OpenERP 不會自動建立延期交貨單。" #. module: stock #: view:stock.production.lot.revision:0 msgid "Serial Number Revisions" -msgstr "" +msgstr "序號版本" #. module: stock #: code:addons/stock/stock.py:1134 #, python-format msgid "Error, no partner!" -msgstr "" +msgstr "錯誤，沒有業務夥伴！" #. module: stock #: view:stock.picking:0 msgid "Delivery orders already processed" -msgstr "" +msgstr "出貨單已處理" #. module: stock #: field:product.template,loc_case:0 @@ -4076,12 +4109,12 @@ msgstr "確認" #. module: stock #: help:stock.location,icon:0 msgid "Icon show in hierarchical tree view" -msgstr "" +msgstr "以階層樹狀檢視時顯示圖示" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories msgid "Merge inventories" -msgstr "" +msgstr "合併實地盤點" #. module: stock #: view:stock.location:0 From 1225c8b530415360e95afa44da7cc82457fd1b88 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 18 Mar 2014 16:14:56 +0100 Subject: [PATCH 36/50] [FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm --- addons/purchase/purchase.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 8102ef6b469..344da2e70a6 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -633,10 +633,9 @@ class purchase_order(osv.osv): 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'), 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), 'date': self.date_to_datetime(cr, uid, order.date_order, context), - 'partner_id': order.dest_address_id.id or order.partner_id.id, + 'partner_id': order.partner_id.id, 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', 'type': 'in', - 'partner_id': order.dest_address_id.id or order.partner_id.id, 'purchase_id': order.id, 'company_id': order.company_id.id, 'move_lines' : [], From 903270996f6ac6b643e7a79ea675b9542cf7ca4c Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Wed, 19 Mar 2014 11:48:47 +0100 Subject: [PATCH 37/50] [FIX] Fix the yml test with option --test-file. 1 - There was a confusing between kind and mode. Due to the mode 'test', there are many part of code who was not executed. The right value is kind='test', and arbitrary mode='init' (or 'update') 2 - The yml test was always roolbacked, without check that command line had '--test-commit'. It's has been fixed, now we check if param --test-commit is existing, else we roolback the transaction. Rem for forward: function in trunk=saas-4 has been moved in : openerp/service/server.py - def load_test_file_yml bzr revid: jke@openerp.com-20140319104847-6r2c70gapocn2wxq --- openerp/cli/server.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openerp/cli/server.py b/openerp/cli/server.py index 943ce9a53a8..ec5516a4786 100644 --- a/openerp/cli/server.py +++ b/openerp/cli/server.py @@ -105,8 +105,15 @@ def run_test_file(dbname, test_file): db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update']) cr = db.cursor() _logger.info('loading test file %s', test_file) - openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True) - cr.rollback() + openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'init') + + if config['test_commit']: + _logger.info('test %s has been commited', test_file) + cr.commit() + else: + _logger.info('test %s has been rollbacked', test_file) + cr.rollback() + cr.close() except Exception: _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file) From 1f3c4f852f2e887b3582f8fe9ac707b8cd5a71dd Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 20 Mar 2014 06:19:44 +0000 Subject: [PATCH 38/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2 --- addons/account/i18n/fr_CA.po | 170 +++-- addons/account/i18n/sv.po | 9 +- addons/contacts/i18n/sv.po | 17 +- addons/google_docs/i18n/hi.po | 188 +++++ addons/hr/i18n/am.po | 979 +++++++++++++++++++++++++++ addons/hr/i18n/sv.po | 47 +- addons/hr_attendance/i18n/sv.po | 26 +- addons/hr_timesheet/i18n/sv.po | 74 +- addons/hr_timesheet_sheet/i18n/sv.po | 24 +- addons/mail/i18n/sv.po | 40 +- addons/membership/i18n/zh_CN.po | 14 +- addons/mrp/i18n/ja.po | 29 +- addons/product_margin/i18n/am.po | 283 ++++++++ addons/stock/i18n/zh_TW.po | 16 +- 14 files changed, 1755 insertions(+), 161 deletions(-) create mode 100644 addons/google_docs/i18n/hi.po create mode 100644 addons/hr/i18n/am.po create mode 100644 addons/product_margin/i18n/am.po diff --git a/addons/account/i18n/fr_CA.po b/addons/account/i18n/fr_CA.po index 3096f7b7c17..08fcbe3a655 100644 --- a/addons/account/i18n/fr_CA.po +++ b/addons/account/i18n/fr_CA.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-19 18:14+0000\n" +"PO-Revision-Date: 2014-03-19 14:03+0000\n" "Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-20 05:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -27,6 +27,8 @@ msgstr "" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"La position fiscale d'un compte peut être définie seulement une fois pour ce " +"compte" #. module: account #: help:account.tax.code,sequence:0 @@ -225,12 +227,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select msgid "Move line reconcile select" -msgstr "" +msgstr "Sélection des écritures à réconcilier" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries are an input of the reconciliation." -msgstr "" +msgstr "Les écritures comptables sont une entrée de la réconciliation" #. module: account #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports @@ -254,11 +256,15 @@ msgid "" "legal reports, and set the rules to close a fiscal year and generate opening " "entries." msgstr "" +"Le type de compte est utilisé comme indication pour l'utilisateur, ainsi que " +"pour créer des rapports comptables spécifiques à certains pays, et enfin " +"pour gérer les clotûres d'exercices fiscaux (et établir les écritures " +"correspondantes)" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Prochain numéro de note de crédit" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -281,7 +287,7 @@ msgstr "" #. module: account #: view:account.analytic.chart:0 msgid "Select the Period for Analysis" -msgstr "" +msgstr "Sélectionnez la période à analyser" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 @@ -298,6 +304,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Cliquez pour ajouter une note de crédit.\n" +"

\n" +" Une note de crédit est un document qui crédite une facture\n" +" complètement ou partiellement.\n" +"

\n" +" Au lieu de créer manuellement une note de crédit client, " +"vous\n" +" pouvez le générer directement depuis la facture client\n" +" correspondante.\n" +"

\n" +" " #. module: account #: help:account.installer,charts:0 @@ -309,7 +327,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_unreconcile msgid "Account Unreconcile" -msgstr "" +msgstr "Annuler la réconcilliation" #. module: account #: field:account.config.settings,module_account_budget:0 @@ -328,11 +346,14 @@ msgid "" "leave the automatic formatting, it will be computed based on the financial " "reports hierarchy (auto-computed field 'level')." msgstr "" +"Vous pouvez déterminer ici le format que vous souhaitez voir affiché pour " +"l'enregistrement. Si vous laissez le formatage automatique, il va être " +"établi à partir de la hiérarchie des rapports (champ auto-généré 'niveau')" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Autoriser les devises multiples" #. module: account #: code:addons/account/account_invoice.py:77 @@ -366,7 +387,7 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Vendeur" #. module: account #: view:account.bank.statement:0 @@ -393,7 +414,7 @@ msgstr "" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "" +msgstr "Note de crédit fournisseur" #. module: account #: selection:account.journal,type:0 @@ -426,6 +447,14 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Ceci permet de gérer les notes de crédit d'une société ou d'un individu.\n" +" Il garde l'historique des dépréciations sur ces notes de " +"crédit, et crée une opération de compte pour ces lignes de dépréciation.\n" +" Il installe le module account_asset. Si vous ne cochez pas " +"cette case, vous serez en mesure d'effectuer la facturation et les " +"paiements,\n" +" mais pas la comptabilité (enregistrements dans Journal , " +"Plan Comptable, ...)" #. module: account #: help:account.bank.statement.line,name:0 @@ -451,6 +480,8 @@ msgstr "" #: selection:account.invoice.refund,filter_refund:0 msgid "Modify: create refund, reconcile and create a new draft invoice" msgstr "" +"Modifier : Créer une note de crédit, la réconcilier et créer une nouvelle " +"facture" #. module: account #: help:account.config.settings,tax_calculation_rounding_method:0 @@ -554,12 +585,12 @@ msgstr "" #: help:account.vat.declaration,chart_account_id:0 #: help:accounting.report,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "" +msgstr "Sélectionner le plan comptable" #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" -msgstr "" +msgstr "Note de crédit" #. module: account #: report:account.overdue:0 @@ -569,7 +600,7 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "" +msgstr "Transactions non réconciliées" #. module: account #: report:account.general.ledger:0 @@ -582,13 +613,13 @@ msgstr "" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "" +msgstr "Affectation des taxes" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "" +msgstr "Fermer un exercice" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 @@ -691,7 +722,7 @@ msgstr "" #: code:addons/account/account.py:3201 #, python-format msgid "SAJ" -msgstr "" +msgstr "JV" #. module: account #: code:addons/account/account.py:1591 @@ -747,6 +778,9 @@ msgid "" "lines for refunds. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Définissez le compte analytique qui sera utilisé par défaut sur les lignes " +"de notes de crédit. Laissez vide si vous ne voulez pas utiliser de compte " +"analytique sur les lignes de notes de crédit." #. module: account #: view:account.account:0 @@ -769,7 +803,7 @@ msgstr "" #. module: account #: view:account.invoice.refund:0 msgid "Create Refund" -msgstr "" +msgstr "Créer note de crédit" #. module: account #: constraint:account.move.line:0 @@ -781,7 +815,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "" +msgstr "Rapport de Grand Livre" #. module: account #: view:account.invoice:0 @@ -791,7 +825,7 @@ msgstr "" #. module: account #: view:account.use.model:0 msgid "Are you sure you want to create entries?" -msgstr "" +msgstr "Etes vous sûr de vouloir saisir des écritures ?" #. module: account #: code:addons/account/account_invoice.py:1361 @@ -811,6 +845,9 @@ msgid "" "Cannot %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only refund this invoice." msgstr "" +"Vous ne pouvez pas %s la facture, qui est déjà réconciliée : la " +"réconciliation doit d'abord être annulée. Vous pouvez seulement créer une " +"note de crédit." #. module: account #: view:account.account:0 @@ -831,7 +868,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_charts msgid "Charts" -msgstr "" +msgstr "Graphiques" #. module: account #: code:addons/account/project/wizard/project_account_analytic_line.py:47 @@ -843,7 +880,7 @@ msgstr "" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Method" -msgstr "" +msgstr "Méthode de notes de crédit" #. module: account #: model:ir.ui.menu,name:account.menu_account_report @@ -888,20 +925,20 @@ msgstr "" #. module: account #: view:account.invoice.report:0 msgid "Supplier Invoices And Refunds" -msgstr "" +msgstr "Factures et notes de crédit fournisseurs" #. module: account #: code:addons/account/account_move_line.py:851 #, python-format msgid "Entry is already reconciled." -msgstr "" +msgstr "Cette entrée a déjà fait l'objet d'une réconciliation." #. module: account #: view:account.move.line.unreconcile.select:0 #: view:account.unreconcile.reconcile:0 #: model:ir.model,name:account.model_account_move_line_unreconcile_select msgid "Unreconciliation" -msgstr "" +msgstr "Non réconcilié" #. module: account #: model:ir.model,name:account.model_account_analytic_journal_report @@ -947,7 +984,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Latest Manual Reconciliation Processed:" -msgstr "" +msgstr "Dernières reconciliation manuelles traitées:" #. module: account #: selection:account.subscription,period_type:0 @@ -977,6 +1014,8 @@ msgid "" " opening/closing fiscal " "year process." msgstr "" +"Impossible d'annuler la réconciliation d'écritures qui ont été générées par " +"le processus d'ouverture/de fermeture d'exercice" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -987,7 +1026,7 @@ msgstr "" #: view:account.payment.term:0 #: field:account.payment.term.line,value:0 msgid "Computation" -msgstr "" +msgstr "Calcul" #. module: account #: field:account.journal.cashbox.line,pieces:0 @@ -1004,12 +1043,12 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create 3 Months Periods" -msgstr "" +msgstr "Créer des périodes trimestrielles" #. module: account #: report:account.overdue:0 msgid "Due" -msgstr "" +msgstr "Payable" #. module: account #: field:account.config.settings,purchase_journal_id:0 @@ -1025,7 +1064,7 @@ msgstr "" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Approve" -msgstr "" +msgstr "Approbation" #. module: account #: view:account.invoice:0 @@ -1037,7 +1076,7 @@ msgstr "" #. module: account #: help:account.invoice,supplier_invoice_number:0 msgid "The reference of this invoice as provided by the supplier." -msgstr "" +msgstr "La référence de la facture tel que fournie par le fournisseur" #. module: account #: selection:account.account,type:0 @@ -1051,7 +1090,7 @@ msgstr "" #: model:account.financial.report,name:account.account_financial_report_liability0 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0 msgid "Liability" -msgstr "" +msgstr "Passif" #. module: account #: code:addons/account/account_invoice.py:899 @@ -1072,7 +1111,7 @@ msgstr "" #. module: account #: selection:account.journal,type:0 msgid "Sale Refund" -msgstr "" +msgstr "Note de crédit de vente" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 @@ -1082,7 +1121,7 @@ msgstr "" #. module: account #: field:account.analytic.line,move_id:0 msgid "Move Line" -msgstr "" +msgstr "Ligne d'écriture" #. module: account #: help:account.move.line,tax_amount:0 @@ -1095,7 +1134,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 msgid "Purchases" -msgstr "" +msgstr "Achats" #. module: account #: field:account.model,lines_id:0 @@ -1117,12 +1156,12 @@ msgstr "" #: report:account.partner.balance:0 #: field:account.period,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: account #: view:account.config.settings:0 msgid "Features" -msgstr "" +msgstr "Fonctionnalités" #. module: account #: code:addons/account/account.py:2346 @@ -1140,7 +1179,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance #: model:ir.ui.menu,name:account.menu_account_partner_balance_report msgid "Partner Balance" -msgstr "" +msgstr "Balance des partenaires" #. module: account #: model:ir.actions.act_window,help:account.action_account_gain_loss @@ -1189,7 +1228,7 @@ msgstr "" #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" -msgstr "" +msgstr "Choisissez un exercice à fermer" #. module: account #: help:account.account.template,user_type:0 @@ -1201,12 +1240,14 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Refund " -msgstr "" +msgstr "Note de crédit " #. module: account #: help:account.config.settings,company_footer:0 msgid "Bank accounts as printed in the footer of each printed document" msgstr "" +"Comptes en banque tel qu'imprimé dans le pied de page de chaque document " +"imprimé" #. module: account #: view:account.tax:0 @@ -1223,12 +1264,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree #: model:ir.ui.menu,name:account.journal_cash_move_lines msgid "Cash Registers" -msgstr "" +msgstr "Caisses enregistreuses" #. module: account #: field:account.config.settings,sale_refund_journal_id:0 msgid "Sale refund journal" -msgstr "" +msgstr "Journal auxilaire - Compte clients" #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -1264,7 +1305,7 @@ msgstr "" #. module: account #: view:account.tax:0 msgid "Refunds" -msgstr "" +msgstr "Notes de crédit" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -1282,7 +1323,7 @@ msgstr "" #: field:account.fiscal.position.tax,tax_dest_id:0 #: field:account.fiscal.position.tax.template,tax_dest_id:0 msgid "Replacement Tax" -msgstr "" +msgstr "Impôt de remplacement" #. module: account #: selection:account.move.line,centralisation:0 @@ -1293,7 +1334,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Modèles de code de taxe" #. module: account #: view:account.invoice.cancel:0 @@ -1338,12 +1379,12 @@ msgstr "" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "" +msgstr "L'écriture de cette ligne d'entrée." #. module: account #: field:account.move.line.reconcile,trans_nbr:0 msgid "# of Transaction" -msgstr "" +msgstr "# de transactions" #. module: account #: report:account.general.ledger:0 @@ -1351,7 +1392,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Entry Label" -msgstr "" +msgstr "Libellé de l'écriture" #. module: account #: help:account.invoice,origin:0 @@ -1363,7 +1404,7 @@ msgstr "" #: view:account.analytic.line:0 #: view:account.journal:0 msgid "Others" -msgstr "" +msgstr "Autres" #. module: account #: view:account.subscription:0 @@ -1408,13 +1449,13 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_entries_report_all #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all msgid "Entries Analysis" -msgstr "" +msgstr "Analyse des écritures" #. module: account #: field:account.account,level:0 #: field:account.financial.report,level:0 msgid "Level" -msgstr "" +msgstr "Niveau" #. module: account #: code:addons/account/wizard/account_change_currency.py:38 @@ -1434,7 +1475,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_tax_report #: model:ir.ui.menu,name:account.next_id_27 msgid "Taxes" -msgstr "" +msgstr "Taxes" #. module: account #: code:addons/account/wizard/account_financial_report.py:70 @@ -1446,12 +1487,12 @@ msgstr "" #: model:account.financial.report,name:account.account_financial_report_profitandloss0 #: model:ir.actions.act_window,name:account.action_account_report_pl msgid "Profit and Loss" -msgstr "" +msgstr "Résultats" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "" +msgstr "Modèles de comptes" #. module: account #: view:account.tax.code.template:0 @@ -1463,19 +1504,19 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_reconcile_select #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile msgid "Reconcile Entries" -msgstr "" +msgstr "Écritures de réconcilliation" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "" +msgstr "Paiement en souffrance" #. module: account #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Initial Balance" -msgstr "" +msgstr "Solde initial" #. module: account #: view:account.invoice:0 @@ -1501,12 +1542,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_entries_report msgid "Journal Items Analysis" -msgstr "" +msgstr "Analyse des écritures comptables du journal" #. module: account #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" -msgstr "" +msgstr "Partenaires" #. module: account #: help:account.bank.statement,state:0 @@ -1535,12 +1576,12 @@ msgstr "" #: model:process.node,name:account.process_node_bankstatement0 #: model:process.node,name:account.process_node_supplierbankstatement0 msgid "Bank Statement" -msgstr "" +msgstr "Relevé bancaire" #. module: account #: field:res.partner,property_account_receivable:0 msgid "Account Receivable" -msgstr "" +msgstr "Compte client" #. module: account #: code:addons/account/account.py:612 @@ -1558,7 +1599,7 @@ msgstr "" #: selection:account.partner.balance,display_partner:0 #: selection:account.report.general.ledger,display_account:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Compte dont le solde n'est pas 0" #. module: account #: code:addons/account/account.py:1483 @@ -1591,7 +1632,7 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,max_amount:0 msgid "Maximum write-off amount" -msgstr "" +msgstr "Montant maximum des écarts de réconcilliation" #. module: account #. openerp-web @@ -1601,6 +1642,9 @@ msgid "" "There is nothing to reconcile. All invoices and payments\n" " have been reconciled, your partner balance is clean." msgstr "" +"Il n'y a rien à réconcillier. Toutes les factures et paiements\n" +" ont été réconcilliés, le solde de votre partenaire " +"est équilibré." #. module: account #: field:account.chart.template,code_digits:0 diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 9986dc8919e..d619f29648f 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-11-04 11:13+0000\n" -"Last-Translator: Anders Eriksson, Mobila System \n" +"PO-Revision-Date: 2014-03-18 12:33+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:53+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-19 06:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -27,6 +27,7 @@ msgstr "Systembetalning" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"Ett kontos skatteregion kan endast definieras en gång för varje konto." #. module: account #: help:account.tax.code,sequence:0 diff --git a/addons/contacts/i18n/sv.po b/addons/contacts/i18n/sv.po index 4c135cee29e..6f089cd27f5 100644 --- a/addons/contacts/i18n/sv.po +++ b/addons/contacts/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-01-17 23:49+0000\n" -"Last-Translator: Mikael Dúi Bolinder \n" +"PO-Revision-Date: 2014-03-19 07:46+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: contacts #: model:ir.actions.act_window,help:contacts.action_contacts @@ -29,6 +29,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att lägga till en kontakt i adressboken.\n" +" \n" +" OpenERP hjälper dig att enkelt spåra alla aktiviteter " +"relaterade till\n" +" en kund, diskussioner, historia av affärsmöjligheter,\n" +" dokument, etc.\n" +" \n" +" " #. module: contacts #: model:ir.actions.act_window,name:contacts.action_contacts diff --git a/addons/google_docs/i18n/hi.po b/addons/google_docs/i18n/hi.po new file mode 100644 index 00000000000..7b7f84e728b --- /dev/null +++ b/addons/google_docs/i18n/hi.po @@ -0,0 +1,188 @@ +# Hindi translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2014-03-18 11:17+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-03-19 06:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:167 +#, python-format +msgid "Key Error!" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a presentation (slide show) document with url like " +"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id" +".p`, the ID is `presentation:123456789`" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a text document with url like " +"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is " +"`document:123456789`" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,gdocs_resource_id:0 +msgid "Google Resource ID to Use as Template" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a drawing document with url like " +"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is " +"`drawings:123456789`" +msgstr "" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/xml/gdocs.xml:6 +#, python-format +msgid "Add Google Doc..." +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"This is the id of the template document, on google side. You can find it " +"thanks to its URL:" +msgstr "" + +#. module: google_docs +#: model:ir.model,name:google_docs.model_google_docs_config +msgid "Google Docs templates config" +msgstr "" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/js/gdocs.js:25 +#, python-format +msgid "" +"The user google credentials are not set yet. Contact your administrator for " +"help." +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a spreadsheet document with url like " +"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, " +"the ID is `spreadsheet:123456789`" +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:129 +#, python-format +msgid "" +"Your resource id is not correct. You can find the id in the google docs URL." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:153 +#, python-format +msgid "Creating google docs may only be done by one at a time." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:83 +#: code:addons/google_docs/google_docs.py:129 +#: code:addons/google_docs/google_docs.py:153 +#, python-format +msgid "Google Docs Error!" +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:83 +#, python-format +msgid "Check your google configuration in Users/Users/Synchronization tab." +msgstr "" + +#. module: google_docs +#: model:ir.ui.menu,name:google_docs.menu_gdocs_config +msgid "Google Docs configuration" +msgstr "" + +#. module: google_docs +#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config +#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config +msgid "Models configuration" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,model_id:0 +msgid "Model" +msgstr "" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/js/gdocs.js:28 +#, python-format +msgid "User Google credentials are not yet set." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:167 +#, python-format +msgid "Your Google Doc Name Pattern's key does not found in object." +msgstr "" + +#. module: google_docs +#: help:google.docs.config,name_template:0 +msgid "" +"Choose how the new google docs will be named, on google side. Eg. " +"gdoc_%(field_name)s" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "Google Docs Configuration" +msgstr "" + +#. module: google_docs +#: help:google.docs.config,gdocs_resource_id:0 +msgid "" +"\n" +"This is the id of the template document, on google side. You can find it " +"thanks to its URL: \n" +"*for a text document with url like " +"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is " +"`document:123456789`\n" +"*for a spreadsheet document with url like " +"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, " +"the ID is `spreadsheet:123456789`\n" +"*for a presentation (slide show) document with url like " +"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id" +".p`, the ID is `presentation:123456789`\n" +"*for a drawing document with url like " +"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is " +"`drawings:123456789`\n" +"...\n" +msgstr "" + +#. module: google_docs +#: model:ir.model,name:google_docs.model_ir_attachment +msgid "ir.attachment" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,name_template:0 +msgid "Google Doc Name Pattern" +msgstr "" diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po new file mode 100644 index 00000000000..8d2024b436c --- /dev/null +++ b/addons/hr/i18n/am.po @@ -0,0 +1,979 @@ +# Amharic translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-03-19 08:27+0000\n" +"Last-Translator: biniyam \n" +"Language-Team: Amharic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" + +#. module: hr +#: model:process.node,name:hr.process_node_openerpuser0 +msgid "Openerp user" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_timesheet_sheet:0 +msgid "Allow timesheets validation by managers" +msgstr "" + +#. module: hr +#: field:hr.job,requirements:0 +msgid "Requirements" +msgstr "አስፈላጊ" + +#. module: hr +#: model:process.transition,name:hr.process_transition_contactofemployee0 +msgid "Link the employee to information" +msgstr "የሰራተኞች መረጃ ማገናኘት" + +#. module: hr +#: field:hr.employee,sinid:0 +msgid "SIN No" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_board_hr +#: model:ir.ui.menu,name:hr.menu_hr_dashboard +#: model:ir.ui.menu,name:hr.menu_hr_main +#: model:ir.ui.menu,name:hr.menu_hr_reporting +#: model:ir.ui.menu,name:hr.menu_hr_root +#: model:ir.ui.menu,name:hr.menu_human_resources_configuration +msgid "Human Resources" +msgstr "የሰው ሀይል አስተዳደር" + +#. module: hr +#: help:hr.employee,image_medium:0 +msgid "" +"Medium-sized photo of the employee. It is automatically resized as a " +"128x128px image, with aspect ratio preserved. Use this field in form views " +"or some kanban views." +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Time Tracking" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: view:hr.job:0 +msgid "Group By..." +msgstr "በቡድን" + +#. module: hr +#: model:ir.actions.act_window,name:hr.view_department_form_installer +msgid "Create Your Departments" +msgstr "" + +#. module: hr +#: help:hr.job,no_of_employee:0 +msgid "Number of employees currently occupying this job position." +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_evaluation:0 +msgid "Organize employees periodic evaluation" +msgstr "" + +#. module: hr +#: view:hr.department:0 +#: view:hr.employee:0 +#: field:hr.employee,department_id:0 +#: view:hr.job:0 +#: field:hr.job,department_id:0 +#: model:ir.model,name:hr.model_hr_department +msgid "Department" +msgstr "የስራ ክፍል" + +#. module: hr +#: field:hr.employee,work_email:0 +msgid "Work Email" +msgstr "የስራ ኢሜይል" + +#. module: hr +#: help:hr.employee,image:0 +msgid "" +"This field holds the image used as photo for the employee, limited to " +"1024x1024px." +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_holidays:0 +msgid "This installs the module hr_holidays." +msgstr "" + +#. module: hr +#: view:hr.job:0 +msgid "Jobs" +msgstr "ስራ" + +#. module: hr +#: view:hr.job:0 +msgid "In Recruitment" +msgstr "ቅጥር" + +#. module: hr +#: field:hr.job,message_unread:0 +msgid "Unread Messages" +msgstr "ያልተነበቡ መልእክቶች" + +#. module: hr +#: field:hr.department,company_id:0 +#: view:hr.employee:0 +#: view:hr.job:0 +#: field:hr.job,company_id:0 +msgid "Company" +msgstr "ድርጅት" + +#. module: hr +#: field:hr.job,no_of_recruitment:0 +msgid "Expected in Recruitment" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Other Information ..." +msgstr "" + +#. module: hr +#: constraint:hr.employee.category:0 +msgid "Error! You cannot create recursive Categories." +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_recruitment:0 +msgid "This installs the module hr_recruitment." +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Birth" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_view_categ_form +#: model:ir.ui.menu,name:hr.menu_view_employee_category_form +msgid "Employee Tags" +msgstr "" + +#. module: hr +#: view:hr.job:0 +msgid "Launch Recruitement" +msgstr "" + +#. module: hr +#: model:process.transition,name:hr.process_transition_employeeuser0 +msgid "Link a user to an employee" +msgstr "" + +#. module: hr +#: field:hr.department,parent_id:0 +msgid "Parent Department" +msgstr "" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config +msgid "Leaves" +msgstr "" + +#. module: hr +#: selection:hr.employee,marital:0 +msgid "Married" +msgstr "" + +#. module: hr +#: field:hr.job,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Talent Management" +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_timesheet_sheet:0 +msgid "This installs the module hr_timesheet_sheet." +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Mobile:" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Position" +msgstr "" + +#. module: hr +#: help:hr.job,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: hr +#: field:hr.employee,color:0 +msgid "Color Index" +msgstr "" + +#. module: hr +#: model:process.transition,note:hr.process_transition_employeeuser0 +msgid "" +"The Related user field on the Employee form allows to link the OpenERP user " +"(and her rights) to the employee." +msgstr "" + +#. module: hr +#: field:hr.employee,image_medium:0 +msgid "Medium-sized photo" +msgstr "" + +#. module: hr +#: field:hr.employee,identification_id:0 +msgid "Identification No" +msgstr "" + +#. module: hr +#: selection:hr.employee,gender:0 +msgid "Female" +msgstr "" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config +msgid "Attendance" +msgstr "" + +#. module: hr +#: field:hr.employee,work_phone:0 +msgid "Work Phone" +msgstr "" + +#. module: hr +#: field:hr.employee.category,child_ids:0 +msgid "Child Categories" +msgstr "" + +#. module: hr +#: field:hr.job,description:0 +#: model:ir.model,name:hr.model_hr_job +msgid "Job Description" +msgstr "" + +#. module: hr +#: field:hr.employee,work_location:0 +msgid "Office Location" +msgstr "" + +#. module: hr +#: field:hr.job,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: model:ir.model,name:hr.model_hr_employee +#: model:process.node,name:hr.process_node_employee0 +msgid "Employee" +msgstr "" + +#. module: hr +#: model:process.node,note:hr.process_node_employeecontact0 +msgid "Other information" +msgstr "" + +#. module: hr +#: help:hr.employee,image_small:0 +msgid "" +"Small-sized photo of the employee. It is automatically resized as a 64x64px " +"image, with aspect ratio preserved. Use this field anywhere a small image is " +"required." +msgstr "" + +#. module: hr +#: field:hr.employee,birthday:0 +msgid "Date of Birth" +msgstr "" + +#. module: hr +#: help:hr.job,no_of_recruitment:0 +msgid "Number of new employees you expect to recruit." +msgstr "" + +#. module: hr +#: model:ir.actions.client,name:hr.action_client_hr_menu +msgid "Open HR Menu" +msgstr "" + +#. module: hr +#: help:hr.job,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_account_analytic_analysis:0 +msgid "" +"This installs the module account_analytic_analysis, which will install sales " +"management too." +msgstr "" + +#. module: hr +#: view:board.board:0 +msgid "Human Resources Dashboard" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,job_id:0 +#: view:hr.job:0 +msgid "Job" +msgstr "" + +#. module: hr +#: field:hr.job,no_of_employee:0 +msgid "Current Number of Employees" +msgstr "" + +#. module: hr +#: field:hr.department,member_ids:0 +msgid "Members" +msgstr "" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_hr_configuration +msgid "Configuration" +msgstr "" + +#. module: hr +#: model:process.node,note:hr.process_node_employee0 +msgid "Employee form and structure" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_expense:0 +msgid "Manage employees expenses" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Tel:" +msgstr "" + +#. module: hr +#: selection:hr.employee,marital:0 +msgid "Divorced" +msgstr "" + +#. module: hr +#: field:hr.employee.category,parent_id:0 +msgid "Parent Category" +msgstr "" + +#. module: hr +#: view:hr.department:0 +#: model:ir.actions.act_window,name:hr.open_module_tree_department +#: model:ir.ui.menu,name:hr.menu_hr_department_tree +msgid "Departments" +msgstr "" + +#. module: hr +#: model:process.node,name:hr.process_node_employeecontact0 +msgid "Employee Contact" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "e.g. Part Time" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,help:hr.action_hr_job +msgid "" +"

\n" +" Click to define a new job position.\n" +"

\n" +" Job Positions are used to define jobs and their " +"requirements.\n" +" You can keep track of the number of employees you have per " +"job\n" +" position and follow the evolution according to what you " +"planned\n" +" for the future.\n" +"

\n" +" You can attach a survey to a job position. It will be used " +"in\n" +" the recruitment process to evaluate the applicants for this " +"job\n" +" position.\n" +"

\n" +" " +msgstr "" + +#. module: hr +#: selection:hr.employee,gender:0 +msgid "Male" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "" +"$('.oe_employee_picture').load(function() { if($(this).width() > " +"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });" +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_evaluation:0 +msgid "This installs the module hr_evaluation." +msgstr "" + +#. module: hr +#: constraint:hr.employee:0 +msgid "Error! You cannot create recursive hierarchy of Employee(s)." +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_attendance:0 +msgid "This installs the module hr_attendance." +msgstr "" + +#. module: hr +#: field:hr.employee,image_small:0 +msgid "Smal-sized photo" +msgstr "" + +#. module: hr +#: view:hr.employee.category:0 +#: model:ir.model,name:hr.model_hr_employee_category +msgid "Employee Category" +msgstr "" + +#. module: hr +#: field:hr.employee,category_ids:0 +msgid "Tags" +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_contract:0 +msgid "This installs the module hr_contract." +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Related User" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "or" +msgstr "" + +#. module: hr +#: field:hr.employee.category,name:0 +msgid "Category" +msgstr "" + +#. module: hr +#: view:hr.job:0 +msgid "Stop Recruitment" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_attendance:0 +msgid "Install attendances feature" +msgstr "" + +#. module: hr +#: help:hr.employee,bank_account_id:0 +msgid "Employee bank salary account" +msgstr "" + +#. module: hr +#: field:hr.department,note:0 +msgid "Note" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_view_employee_tree +msgid "Employees Structure" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Contact Information" +msgstr "" + +#. module: hr +#: field:res.users,employee_ids:0 +msgid "Related employees" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_holidays:0 +msgid "Manage holidays, leaves and allocation requests" +msgstr "" + +#. module: hr +#: field:hr.department,child_ids:0 +msgid "Child Departments" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: view:hr.job:0 +#: field:hr.job,state:0 +msgid "Status" +msgstr "" + +#. module: hr +#: field:hr.employee,otherid:0 +msgid "Other Id" +msgstr "" + +#. module: hr +#: model:process.process,name:hr.process_process_employeecontractprocess0 +msgid "Employee Contract" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Contracts" +msgstr "" + +#. module: hr +#: help:hr.job,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: hr +#: field:hr.employee,ssnid:0 +msgid "SSN No" +msgstr "" + +#. module: hr +#: field:hr.job,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_recruitment:0 +msgid "Manage the recruitment process" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Active" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Human Resources Management" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Install your country's payroll" +msgstr "" + +#. module: hr +#: field:hr.employee,bank_account_id:0 +msgid "Bank Account Number" +msgstr "" + +#. module: hr +#: view:hr.department:0 +msgid "Companies" +msgstr "" + +#. module: hr +#: field:hr.job,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: hr +#: model:process.transition,note:hr.process_transition_contactofemployee0 +msgid "" +"In the Employee form, there are different kind of information like Contact " +"information." +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,help:hr.open_view_employee_list_my +msgid "" +"

\n" +" Click to add a new employee.\n" +"

\n" +" With just a quick glance on the OpenERP employee screen, " +"you\n" +" can easily find all the information you need for each " +"person;\n" +" contact data, job position, availability, etc.\n" +"

\n" +" " +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "HR Settings" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Citizenship & Other Info" +msgstr "" + +#. module: hr +#: constraint:hr.department:0 +msgid "Error! You cannot create recursive departments." +msgstr "" + +#. module: hr +#: field:hr.employee,address_id:0 +msgid "Working Address" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Public Information" +msgstr "" + +#. module: hr +#: field:hr.employee,marital:0 +msgid "Marital Status" +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_ir_actions_act_window +msgid "ir.actions.act_window" +msgstr "" + +#. module: hr +#: field:hr.employee,last_login:0 +msgid "Latest Connection" +msgstr "" + +#. module: hr +#: field:hr.employee,image:0 +msgid "Photo" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Cancel" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,help:hr.open_module_tree_department +msgid "" +"

\n" +" Click to create a department.\n" +"

\n" +" OpenERP's department structure is used to manage all " +"documents\n" +" related to employees by departments: expenses, timesheets,\n" +" leaves and holidays, recruitments, etc.\n" +"

\n" +" " +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_timesheet:0 +msgid "This installs the module hr_timesheet." +msgstr "" + +#. module: hr +#: help:hr.job,expected_employees:0 +msgid "" +"Expected number of employees for this job position after new recruitment." +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,help:hr.view_department_form_installer +msgid "" +"

\n" +" Click to define a new department.\n" +"

\n" +" Your departments structure is used to manage all documents\n" +" related to employees by departments: expenses and " +"timesheets,\n" +" leaves and holidays, recruitments, etc.\n" +"

\n" +" " +msgstr "" + +#. module: hr +#: view:hr.employee:0 +msgid "Personal Information" +msgstr "" + +#. module: hr +#: field:hr.employee,city:0 +msgid "City" +msgstr "" + +#. module: hr +#: field:hr.employee,passport_id:0 +msgid "Passport No" +msgstr "" + +#. module: hr +#: field:hr.employee,mobile_phone:0 +msgid "Work Mobile" +msgstr "" + +#. module: hr +#: selection:hr.job,state:0 +msgid "Recruitement in Progress" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_account_analytic_analysis:0 +msgid "" +"Allow invoicing based on timesheets (the sale application will be installed)" +msgstr "" + +#. module: hr +#: code:addons/hr/hr.py:221 +#, python-format +msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!" +msgstr "" + +#. module: hr +#: view:hr.employee.category:0 +msgid "Employees Categories" +msgstr "" + +#. module: hr +#: field:hr.employee,address_home_id:0 +msgid "Home Address" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_timesheet:0 +msgid "Manage timesheets" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_payroll_modules +msgid "Payroll" +msgstr "" + +#. module: hr +#: selection:hr.employee,marital:0 +msgid "Single" +msgstr "" + +#. module: hr +#: field:hr.job,name:0 +msgid "Job Name" +msgstr "" + +#. module: hr +#: view:hr.job:0 +msgid "In Position" +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_payroll:0 +msgid "This installs the module hr_payroll." +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_contract:0 +msgid "Record contracts per employee" +msgstr "" + +#. module: hr +#: view:hr.department:0 +msgid "department" +msgstr "" + +#. module: hr +#: field:hr.employee,country_id:0 +msgid "Nationality" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Additional Features" +msgstr "" + +#. module: hr +#: field:hr.employee,notes:0 +msgid "Notes" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action2 +msgid "Subordinate Hierarchy" +msgstr "" + +#. module: hr +#: field:hr.employee,resource_id:0 +msgid "Resource" +msgstr "" + +#. module: hr +#: field:hr.department,complete_name:0 +#: field:hr.employee,name_related:0 +#: field:hr.employee.category,complete_name:0 +msgid "Name" +msgstr "" + +#. module: hr +#: field:hr.employee,gender:0 +msgid "Gender" +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee.category,employee_ids:0 +#: field:hr.job,employee_ids:0 +#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree +#: model:ir.actions.act_window,name:hr.open_view_employee_list +#: model:ir.actions.act_window,name:hr.open_view_employee_list_my +#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my +msgid "Employees" +msgstr "" + +#. module: hr +#: help:hr.employee,sinid:0 +msgid "Social Insurance Number" +msgstr "" + +#. module: hr +#: field:hr.department,name:0 +msgid "Department Name" +msgstr "" + +#. module: hr +#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet +msgid "Reports" +msgstr "" + +#. module: hr +#: field:hr.config.settings,module_hr_payroll:0 +msgid "Manage payroll" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +#: model:ir.actions.act_window,name:hr.action_human_resources_configuration +msgid "Configure Human Resources" +msgstr "" + +#. module: hr +#: selection:hr.job,state:0 +msgid "No Recruitment" +msgstr "" + +#. module: hr +#: help:hr.employee,ssnid:0 +msgid "Social Security Number" +msgstr "" + +#. module: hr +#: model:process.node,note:hr.process_node_openerpuser0 +msgid "Creation of a OpenERP user" +msgstr "" + +#. module: hr +#: field:hr.employee,login:0 +msgid "Login" +msgstr "" + +#. module: hr +#: field:hr.job,expected_employees:0 +msgid "Total Forecasted Employees" +msgstr "" + +#. module: hr +#: help:hr.job,state:0 +msgid "" +"By default 'In position', set it to 'In Recruitment' if recruitment process " +"is going on for this job position." +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_res_users +msgid "Users" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action_hr_job +#: model:ir.ui.menu,name:hr.menu_hr_job +msgid "Job Positions" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,help:hr.open_board_hr +msgid "" +"
\n" +"

\n" +" Human Resources dashboard is empty.\n" +"

\n" +" To add your first report into this dashboard, go to any\n" +" menu, switch to list or graph view, and click 'Add " +"to\n" +" Dashboard' in the extended search options.\n" +"

\n" +" You can filter and group data before inserting into the\n" +" dashboard using the search options.\n" +"

\n" +"
\n" +" " +msgstr "" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,coach_id:0 +msgid "Coach" +msgstr "" + +#. module: hr +#: sql_constraint:hr.job:0 +msgid "The name of the job position must be unique per company!" +msgstr "" + +#. module: hr +#: help:hr.config.settings,module_hr_expense:0 +msgid "This installs the module hr_expense." +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_hr_config_settings +msgid "hr.config.settings" +msgstr "" + +#. module: hr +#: field:hr.department,manager_id:0 +#: view:hr.employee:0 +#: field:hr.employee,parent_id:0 +msgid "Manager" +msgstr "" + +#. module: hr +#: selection:hr.employee,marital:0 +msgid "Widower" +msgstr "" + +#. module: hr +#: field:hr.employee,child_ids:0 +msgid "Subordinates" +msgstr "" + +#. module: hr +#: view:hr.config.settings:0 +msgid "Apply" +msgstr "" diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po index ba8c57ea3b2..1f4d5260e94 100644 --- a/addons/hr/i18n/sv.po +++ b/addons/hr/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-19 07:39+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:10+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -25,7 +25,7 @@ msgstr "OpenERP användare" #. module: hr #: field:hr.config.settings,module_hr_timesheet_sheet:0 msgid "Allow timesheets validation by managers" -msgstr "" +msgstr "Tillåter att tidrapporter granskas av närmaste chef" #. module: hr #: field:hr.job,requirements:0 @@ -63,7 +63,7 @@ msgstr "" #. module: hr #: view:hr.config.settings:0 msgid "Time Tracking" -msgstr "" +msgstr "Tidrapporter" #. module: hr #: view:hr.employee:0 @@ -79,12 +79,12 @@ msgstr "Skapa din avdelning" #. module: hr #: help:hr.job,no_of_employee:0 msgid "Number of employees currently occupying this job position." -msgstr "" +msgstr "Antal anställda som förnärvarande innehar denna befattning." #. module: hr #: field:hr.config.settings,module_hr_evaluation:0 msgid "Organize employees periodic evaluation" -msgstr "" +msgstr "Anordna strukturerad utvärdering av personalen" #. module: hr #: view:hr.department:0 @@ -107,11 +107,12 @@ msgid "" "This field holds the image used as photo for the employee, limited to " "1024x1024px." msgstr "" +"Detta fält innehåller ett foto av den anställde, begränsat till 1024x1024px." #. module: hr #: help:hr.config.settings,module_hr_holidays:0 msgid "This installs the module hr_holidays." -msgstr "" +msgstr "Detta installerar modulen hr_holidays" #. module: hr #: view:hr.job:0 @@ -126,7 +127,7 @@ msgstr "I anställningsprocessen" #. module: hr #: field:hr.job,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Olästa meddelanden" #. module: hr #: field:hr.department,company_id:0 @@ -144,12 +145,12 @@ msgstr "Rekryteringsbehov" #. module: hr #: view:hr.employee:0 msgid "Other Information ..." -msgstr "" +msgstr "Övrig information ..." #. module: hr #: constraint:hr.employee.category:0 msgid "Error! You cannot create recursive Categories." -msgstr "" +msgstr "Fel! Du kan inte skapa rekursiva kategorier." #. module: hr #: help:hr.config.settings,module_hr_recruitment:0 @@ -159,7 +160,7 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Birth" -msgstr "" +msgstr "Född" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_form @@ -195,12 +196,12 @@ msgstr "Gift" #. module: hr #: field:hr.job,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Meddelanden" #. module: hr #: view:hr.config.settings:0 msgid "Talent Management" -msgstr "" +msgstr "Begåvningsutveckling" #. module: hr #: help:hr.config.settings,module_hr_timesheet_sheet:0 @@ -210,17 +211,17 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Mobile:" -msgstr "" +msgstr "Mobil:" #. module: hr #: view:hr.employee:0 msgid "Position" -msgstr "" +msgstr "Tjänst" #. module: hr #: help:hr.job,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet" #. module: hr #: field:hr.employee,color:0 @@ -280,7 +281,7 @@ msgstr "Kontorsplats" #. module: hr #: field:hr.job,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Följare" #. module: hr #: view:hr.employee:0 @@ -346,7 +347,7 @@ msgstr "Jobb" #. module: hr #: field:hr.job,no_of_employee:0 msgid "Current Number of Employees" -msgstr "" +msgstr "Aktuellt antal anställda" #. module: hr #: field:hr.department,member_ids:0 @@ -366,12 +367,12 @@ msgstr "Anställdsformulär och struktur" #. module: hr #: field:hr.config.settings,module_hr_expense:0 msgid "Manage employees expenses" -msgstr "" +msgstr "Utläggshantering" #. module: hr #: view:hr.employee:0 msgid "Tel:" -msgstr "" +msgstr "Tel:" #. module: hr #: selection:hr.employee,marital:0 @@ -766,7 +767,7 @@ msgstr "HemAdress" #. module: hr #: field:hr.config.settings,module_hr_timesheet:0 msgid "Manage timesheets" -msgstr "" +msgstr "Administrera tidrapporter" #. module: hr #: model:ir.actions.act_window,name:hr.open_payroll_modules diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po index b43515b5df2..5dd39961d5a 100644 --- a/addons/hr_attendance/i18n/sv.po +++ b/addons/hr_attendance/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-19 07:45+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:10+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: hr_attendance #: model:ir.model,name:hr_attendance.model_hr_attendance_month @@ -30,7 +30,7 @@ msgstr "Närvarosökning" #. module: hr_attendance #: field:hr.employee,last_sign:0 msgid "Last Sign" -msgstr "" +msgstr "Senaste stämpling" #. module: hr_attendance #: view:hr.attendance:0 @@ -44,12 +44,14 @@ msgstr "Närvarande" #: code:addons/hr_attendance/static/src/js/attendance.js:34 #, python-format msgid "Last sign in: %s,
%s.
Click to sign out." -msgstr "" +msgstr "Senaste instämpling: %s,
%s.
Klicka för att stämpla ut." #. module: hr_attendance #: constraint:hr.attendance:0 msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" msgstr "" +"Fel ! Stämpla in (resp stämpla ut) måste följas av utstämpling (resp " +"instämpling)" #. module: hr_attendance #: help:hr.action.reason,name:0 @@ -72,7 +74,7 @@ msgstr "Skriv ut månatlig närvarorapport" #: code:addons/hr_attendance/report/timesheet.py:120 #, python-format msgid "Attendances by Week" -msgstr "" +msgstr "Veckonärvaro" #. module: hr_attendance #: selection:hr.action.reason,action_type:0 @@ -111,7 +113,7 @@ msgstr "Logga ut" #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49 #, python-format msgid "No records are found for your selection!" -msgstr "" +msgstr "Rader saknas för urvalet!" #. module: hr_attendance #: view:hr.attendance.error:0 @@ -193,7 +195,7 @@ msgstr "juni" #: code:addons/hr_attendance/report/attendance_by_month.py:190 #, python-format msgid "Attendances by Month" -msgstr "" +msgstr "Månadsnärvaro" #. module: hr_attendance #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week @@ -333,7 +335,7 @@ msgstr "januari" #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49 #, python-format msgid "No Data Available !" -msgstr "" +msgstr "Data saknas!" #. module: hr_attendance #: selection:hr.attendance.month,month:0 @@ -413,7 +415,7 @@ msgstr "" #: code:addons/hr_attendance/static/src/js/attendance.js:36 #, python-format msgid "Click to Sign In at %s." -msgstr "" +msgstr "Klicka för instämpling vid %s." #. module: hr_attendance #: field:hr.action.reason,action_type:0 @@ -463,7 +465,7 @@ msgstr "" #: view:hr.attendance.month:0 #: view:hr.attendance.week:0 msgid "or" -msgstr "" +msgstr "eller" #. module: hr_attendance #: help:hr.attendance,action_desc:0 diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po index 717f002fb4e..ef6e8ac7fcc 100644 --- a/addons/hr_timesheet/i18n/sv.po +++ b/addons/hr_timesheet/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-19 07:22+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: hr_timesheet #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue @@ -42,6 +42,26 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Ännu ingen aktivitet på detta kontrakt.\n" +" \n" +" I OpenERP är kontrakt och projekt implementerade som " +"objektkonton, \n" +" så att kostnader och intäkter är spårbara och enkla att " +"analysera.\n" +" \n" +" Kostnaderna kommer att skapas automatiskt när du " +"registrerar leverantörs-\n" +" fakturor, kostnader eller tidrapporter.\n" +" \n" +" Intäkterna skapas automatiskt när du skapar kund-\n" +" fakturor. Kundfakturor kan skapas baserat på " +"försäljningsorder\n" +" (fastpris fakturor), på tidrapporter (baserat på det " +"arbete) eller\n" +" på kostnader (t.ex. faktiska resekostnader).\n" +" \n" +" " #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:44 @@ -75,7 +95,7 @@ msgstr "" #. module: hr_timesheet #: field:hr.employee,uom_id:0 msgid "Unit of Measure" -msgstr "" +msgstr "Måttenhet" #. module: hr_timesheet #: field:hr.employee,journal_id:0 @@ -103,7 +123,7 @@ msgstr "Tidrapport" #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43 #, python-format msgid "Please define employee for this user!" -msgstr "" +msgstr "Vänligen ange anställd för denna användare!" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:44 @@ -129,7 +149,7 @@ msgstr "Fri" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours msgid "Timesheet Activities" -msgstr "" +msgstr "Tidrapporteringsrader" #. module: hr_timesheet #: field:hr.sign.out.project,analytic_amount:0 @@ -166,12 +186,12 @@ msgstr "Skriv ut tidrapport för anställda" #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132 #, python-format msgid "Please define employee for your user." -msgstr "" +msgstr "Vänligen ange anställd för ditt användareid." #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue msgid "Costs & Revenues" -msgstr "" +msgstr "Kostnader och intäkter" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:44 @@ -188,7 +208,7 @@ msgstr "Objekt" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Costs and Revenues" -msgstr "" +msgstr "Kostnader och intäkter" #. module: hr_timesheet #: code:addons/hr_timesheet/hr_timesheet.py:150 @@ -198,7 +218,7 @@ msgstr "" #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43 #, python-format msgid "Warning!" -msgstr "" +msgstr "Varning!" #. module: hr_timesheet #: field:hr.analytic.timesheet,partner_id:0 @@ -244,6 +264,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att registrera aktiviteter.\n" +" \n" +" Du kan registrera och spåra dina arbetstimmar med projekt " +"varje\n" +" dag. Varje tid på ett projekt kommer att bli en kostnad i\n" +" objektredovisning / kontrakt och kan faktureras\n" +" kunder om så önskas.\n" +" \n" +" " #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 @@ -254,7 +284,7 @@ msgstr "Skriv ut" #. module: hr_timesheet #: help:account.analytic.account,use_timesheets:0 msgid "Check this field if this project manages timesheets" -msgstr "" +msgstr "Kryssa detta fält, om projektet hanterar tidrapporter" #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 @@ -280,7 +310,7 @@ msgstr "Startdatum" #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77 #, python-format msgid "Please define cost unit for this employee." -msgstr "" +msgstr "Vänligen ange kostnadsenhet för denna antällda." #. module: hr_timesheet #: help:hr.employee,product_id:0 @@ -294,6 +324,8 @@ msgid "" "No analytic account is defined on the project.\n" "Please set one or we cannot automatically fill the timesheet." msgstr "" +"Objektkonto saknas för detta projekt.\n" +"Vänligen ange ett, annars går det inte att fylla i tidrapporten." #. module: hr_timesheet #: view:hr.analytic.timesheet:0 @@ -307,6 +339,8 @@ msgid "" "No 'Analytic Journal' is defined for employee %s \n" "Define an employee for the selected user and assign an 'Analytic Journal'!" msgstr "" +"Ingen 'Objektjournal' finns för denna anställda %s \n" +"Ange en anställd för den valda användaren och knyt till en 'Objektjournal'!" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:41 @@ -348,7 +382,7 @@ msgstr "Arbetsbeskrivning" #: view:hr.sign.in.project:0 #: view:hr.sign.out.project:0 msgid "or" -msgstr "" +msgstr "eller" #. module: hr_timesheet #: xsl:hr.analytical.timesheet:0 @@ -421,6 +455,8 @@ msgid "" "No analytic journal defined for '%s'.\n" "You should assign an analytic journal on the employee form." msgstr "" +"Objektjournal saknas för '%s'.\n" +"En objektjournal bör knytas till den anställde i anställningsformuläret." #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:41 @@ -435,7 +471,7 @@ msgstr "June" #: field:hr.sign.in.project,state:0 #: field:hr.sign.out.project,state:0 msgid "Current Status" -msgstr "" +msgstr "Nuvarande Status" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 @@ -501,7 +537,7 @@ msgstr "Anställningsnummer" #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 msgid "Period" -msgstr "" +msgstr "Period" #. module: hr_timesheet #: view:hr.sign.out.project:0 @@ -614,6 +650,8 @@ msgid "" "Please create an employee for this user, using the menu: Human Resources > " "Employees." msgstr "" +"Vänligen skapa en anställd för denna användare, via menyn: Personal > " +"Anställda." #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 @@ -643,7 +681,7 @@ msgstr "April" #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132 #, python-format msgid "User Error!" -msgstr "" +msgstr "Användarfel!" #. module: hr_timesheet #: view:hr.sign.in.project:0 @@ -659,7 +697,7 @@ msgstr "År" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Duration" -msgstr "" +msgstr "Varaktighet" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po index 20bb174760c..c9008c07c33 100644 --- a/addons/hr_timesheet_sheet/i18n/sv.po +++ b/addons/hr_timesheet_sheet/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-19 07:52+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 @@ -34,7 +34,7 @@ msgstr "Tjänst" #: field:hr.timesheet.report,quantity:0 #: field:timesheet.report,quantity:0 msgid "Time" -msgstr "" +msgstr "Tid" #. module: hr_timesheet_sheet #: help:hr.config.settings,timesheet_max_difference:0 @@ -93,7 +93,7 @@ msgstr "# Kostnad" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Olästa meddelanden" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 @@ -123,7 +123,7 @@ msgstr "Satt till utkast" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Timesheet Period" -msgstr "" +msgstr "Tidrapportperiod" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_to:0 @@ -134,7 +134,7 @@ msgstr "Datum till" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "to" -msgstr "" +msgstr "till" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0 @@ -157,7 +157,7 @@ msgstr "Gruppera på dagen i datumet" #. module: hr_timesheet_sheet #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current msgid "My Current Timesheet" -msgstr "My Current Timesheet" +msgstr "Min aktuella tidrapport" #. module: hr_timesheet_sheet #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0 @@ -189,7 +189,7 @@ msgstr "Avslå" #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet msgid "Timesheet Activities" -msgstr "" +msgstr "Tidrapporteringsrader" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 @@ -776,7 +776,7 @@ msgstr "" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Submit to Manager" -msgstr "" +msgstr "Skicka till chef" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 @@ -835,6 +835,8 @@ msgid "" "You cannot have 2 timesheets that overlap!\n" "Please use the menu 'My Current Timesheet' to avoid this problem." msgstr "" +"Du kan inte ha överlappande tidrapporter!\n" +"Använd menyn \"Min aktuella tidrapport\" för att undvika detta problem." #. module: hr_timesheet_sheet #: view:hr.timesheet.current.open:0 diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po index ae6a0cb7831..cae90248617 100644 --- a/addons/mail/i18n/sv.po +++ b/addons/mail/i18n/sv.po @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-11-21 01:48+0000\n" +"PO-Revision-Date: 2014-03-18 12:47+0000\n" "Last-Translator: Anders Wallenquist \n" "Language-Team: Svenska \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-22 06:02+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-19 06:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: mail #: view:mail.followers:0 @@ -168,6 +168,13 @@ msgid "" "discussions\n" "- All Messages: for every notification you receive in your Inbox" msgstr "" +"Policy för mottagen e-post för nya meddelanden som skickas till sin " +"personliga inkorg:\n" +"- Aldrig: ingen e-post är skickad\n" +"- Endast inkommande meddelanden: för meddelanden som inkommit per e-post\n" +"- Inkommande e-post och diskussioner: för inkommande e-post tillsammans med " +"meddelanden från interna diskussioner \n" +"- Alla meddelanden: för samtliga notifikationer som du tar emot i din inkorg" #. module: mail #: field:mail.group,message_unread:0 @@ -754,6 +761,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Inga privata meddelanden.\n" +"

\n" +" Denna lista innehåller meddelanden skickade till dig.\n" +"

\n" +" " #. module: mail #: model:mail.group,name:mail.group_rd @@ -775,7 +788,7 @@ msgstr "Avancerat" #: code:addons/mail/static/src/xml/mail.xml:244 #, python-format msgid "Move to Inbox" -msgstr "Flytta till inboxen" +msgstr "Flytta till inkorgen" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:193 @@ -906,6 +919,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Snyggt jobbat! Din inkorg är tom.\n" +"

\n" +" Din inkorg innehåller privata meddelanden eller e-post " +"som skickats till dig\n" +" tillsammans med information knuten till dokument eller " +"personer du\n" +" följer.\n" +"

\n" +" " #. module: mail #: field:mail.mail,notification:0 @@ -1799,6 +1822,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Inget 'att göra'.\n" +"

\n" +" När du arbetar med dina meddelanden i inkorgen, kan du " +"märka vissa\n" +" med att göra. Från denna meny, kommer du åt din " +"att göra-lista.\n" +"

\n" +" " #. module: mail #: selection:mail.mail,state:0 diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po index 909f869e9ba..30a4be5b6a5 100644 --- a/addons/membership/i18n/zh_CN.po +++ b/addons/membership/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-20 04:52+0000\n" +"Last-Translator: jack lee \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: membership #: model:process.transition,name:membership.process_transition_invoicetoassociate0 @@ -233,7 +233,7 @@ msgstr "来自" #. module: membership #: constraint:membership.membership_line:0 msgid "Error, this membership product is out of date" -msgstr "错误，这个会员产品已过期" +msgstr "错误，这个会员卡已过期" #. module: membership #: model:process.transition.action,name:membership.process_transition_action_create0 @@ -326,7 +326,7 @@ msgstr "会员资格到哪一天结束" #. module: membership #: view:product.product:0 msgid "Membership products" -msgstr "会员产品" +msgstr "会员卡" #. module: membership #: field:res.partner,membership_state:0 @@ -398,7 +398,7 @@ msgstr "业务伙伴为免费会员。" #. module: membership #: view:res.partner:0 msgid "Buy Membership" -msgstr "购买会员" +msgstr "购买会员资格" #. module: membership #: field:report.membership,associate_member_id:0 diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po index 3d43edf53c1..9ac046daeec 100644 --- a/addons/mrp/i18n/ja.po +++ b/addons/mrp/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-15 16:58+0000\n" +"PO-Revision-Date: 2014-03-20 05:56+0000\n" "Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-16 06:06+0000\n" -"X-Generator: Launchpad (build 16963)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -290,7 +290,7 @@ msgstr "1製造オーダにて複数製品を生産（連産品/副産品）" msgid "" "The selection of the right Bill of Material to use will depend on the " "properties specified on the sales order and the Bill of Material." -msgstr "" +msgstr "適切な部品表の選択は受注や部品表で指定された属性に依存します。" #. module: mrp #: view:mrp.bom:0 @@ -318,7 +318,7 @@ msgstr "予定済製品" #. module: mrp #: selection:mrp.bom,type:0 msgid "Sets / Phantom" -msgstr "設定 / 模型" +msgstr "セット / 仮想部品" #. module: mrp #: view:mrp.production:0 @@ -628,6 +628,10 @@ msgid "" "assembly operation.\n" " This installs the module stock_no_autopicking." msgstr "" +"このモジュールは製造オーダーに原材料を供給する中間のピッキングプロセスを可能にします。\n" +"例えば、調達先(下請け)の生産を管理します。\n" +"これを達成するため、「自動ピッキングなし」で委託した組立品の配置や組立作業の工程における調達先の場所を指定します。\n" +"stock_no_autopickingモジュールがインストールされます。" #. module: mrp #: selection:mrp.production,state:0 @@ -753,6 +757,12 @@ msgid "" " * Product Attributes.\n" " This installs the module product_manufacturer." msgstr "" +"製品には以下の定義ができます。\n" +"* メーカー\n" +"* 製品名\n" +"* 製品コード\n" +"* 製品の属性\n" +"product_manufacturerモジュールがインストールされます。" #. module: mrp #: view:mrp.product_price:0 @@ -1144,6 +1154,9 @@ msgid "" " cases entail a small performance impact.\n" " This installs the module mrp_jit." msgstr "" +"調達オーダーでジャストインタイムの計算を可能にします。\n" +"すべての調達はすぐに処理され、いくつかのケースでは生産力に小さな影響を及ぼすかもしれません。\n" +"mrp_jitモジュールがインストールされます。" #. module: mrp #: help:mrp.workcenter,costs_hour:0 @@ -1469,6 +1482,8 @@ msgid "" "are attached to bills of materials\n" " that will define the required raw materials." msgstr "" +"ルーティングは製品のオーダーから生産においてワークセンター内で従うべき製造作業の作成と管理を可能にします。\n" +"これらは必要な原材料を定義する部品表に添付されます。" #. module: mrp #: view:report.workcenter.load:0 @@ -2296,8 +2311,8 @@ msgid "" "product, it will be sold and shipped as a set of components, instead of " "being produced." msgstr "" -"副製品がいくつかの製品で使用される場合、それ自身のBOMを作成するためにも有用です。この副製品の製造オーダーを望まない場合、BOMタイプとしてセット/架空" -"を選択します。架空BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷をします。" +"副製品がいくつかの製品で使用される場合、それ自身のBOMを作成するためにも有用です。この副製品の製造オーダーを望まない場合、BOMタイプとしてセット/仮想" +"部品を選択します。架空BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷をします。" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_mrp_configuration diff --git a/addons/product_margin/i18n/am.po b/addons/product_margin/i18n/am.po new file mode 100644 index 00000000000..759a5679951 --- /dev/null +++ b/addons/product_margin/i18n/am.po @@ -0,0 +1,283 @@ +# Amharic translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2014-03-18 11:07+0000\n" +"Last-Translator: biniyam \n" +"Language-Team: Amharic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-03-19 06:30+0000\n" +"X-Generator: Launchpad (build 16963)\n" + +#. module: product_margin +#: view:product.product:0 +#: field:product.product,turnover:0 +msgid "Turnover" +msgstr "ተመላሽ" + +#. module: product_margin +#: field:product.product,expected_margin_rate:0 +msgid "Expected Margin (%)" +msgstr "" + +#. module: product_margin +#: field:product.margin,from_date:0 +msgid "From" +msgstr "ከ" + +#. module: product_margin +#: help:product.product,total_cost:0 +msgid "" +"Sum of Multiplication of Invoice price and quantity of Supplier Invoices " +msgstr "" + +#. module: product_margin +#: field:product.margin,to_date:0 +msgid "To" +msgstr "ለ" + +#. module: product_margin +#: help:product.product,total_margin:0 +msgid "Turnover - Standard price" +msgstr "የተመላሽ መደበኛ ዋጋ" + +#. module: product_margin +#: field:product.product,total_margin_rate:0 +msgid "Total Margin Rate(%)" +msgstr "" + +#. module: product_margin +#: selection:product.margin,invoice_state:0 +#: selection:product.product,invoice_state:0 +msgid "Draft, Open and Paid" +msgstr "ያልተከፈለና የተከፈለ ደረሰኞች" + +#. module: product_margin +#: code:addons/product_margin/wizard/product_margin.py:73 +#: model:ir.actions.act_window,name:product_margin.product_margin_act_window +#: model:ir.ui.menu,name:product_margin.menu_action_product_margin +#: view:product.product:0 +#, python-format +msgid "Product Margins" +msgstr "የእቃው አይነት በአንድ መጠን ሲጨምር" + +#. module: product_margin +#: field:product.product,purchase_avg_price:0 +#: field:product.product,sale_avg_price:0 +msgid "Avg. Unit Price" +msgstr "የእቃዎች መካከለኛ ዋጋ" + +#. module: product_margin +#: field:product.product,sale_num_invoiced:0 +msgid "# Invoiced in Sale" +msgstr "" + +#. module: product_margin +#: view:product.product:0 +msgid "Catalog Price" +msgstr "ቅናሽ ዋጋ" + +#. module: product_margin +#: selection:product.margin,invoice_state:0 +#: selection:product.product,invoice_state:0 +msgid "Paid" +msgstr "ተከፈል" + +#. module: product_margin +#: view:product.product:0 +#: field:product.product,sales_gap:0 +msgid "Sales Gap" +msgstr "የሽያጭ ክፍተት" + +#. module: product_margin +#: help:product.product,sales_gap:0 +msgid "Expected Sale - Turn Over" +msgstr "ሊሸጥ የሚችል እቃ" + +#. module: product_margin +#: field:product.product,sale_expected:0 +msgid "Expected Sale" +msgstr "ሊሸጥ የሚችል እቃ" + +#. module: product_margin +#: view:product.product:0 +msgid "Standard Price" +msgstr "የእቃው መደበኛ ዋጋ" + +#. module: product_margin +#: help:product.product,purchase_num_invoiced:0 +msgid "Sum of Quantity in Supplier Invoices" +msgstr "" + +#. module: product_margin +#: field:product.product,date_to:0 +msgid "Margin Date To" +msgstr "የእቃው መጠን የጨመረበት ቀን" + +#. module: product_margin +#: view:product.product:0 +msgid "Analysis Criteria" +msgstr "የመመዘኛ መስፈርት" + +#. module: product_margin +#: view:product.product:0 +#: field:product.product,total_cost:0 +msgid "Total Cost" +msgstr "አጠቃላይ ዋጋ" + +#. module: product_margin +#: help:product.product,normal_cost:0 +msgid "Sum of Multiplication of Cost price and quantity of Supplier Invoices" +msgstr "" + +#. module: product_margin +#: field:product.product,expected_margin:0 +msgid "Expected Margin" +msgstr "የሚጠበቅ ጭማሪ" + +#. module: product_margin +#: view:product.product:0 +msgid "#Purchased" +msgstr "" + +#. module: product_margin +#: help:product.product,expected_margin_rate:0 +msgid "Expected margin * 100 / Expected Sale" +msgstr "" + +#. module: product_margin +#: help:product.product,sale_avg_price:0 +msgid "Avg. Price in Customer Invoices." +msgstr "የመካከለኛ ዋጋ ለገዢዎች" + +#. module: product_margin +#: help:product.product,purchase_avg_price:0 +msgid "Avg. Price in Supplier Invoices " +msgstr "የመካከለኛ ዋጋ አቅራቢዎች " + +#. module: product_margin +#: field:product.margin,invoice_state:0 +#: field:product.product,invoice_state:0 +msgid "Invoice State" +msgstr "" + +#. module: product_margin +#: help:product.product,purchase_gap:0 +msgid "Normal Cost - Total Cost" +msgstr "" + +#. module: product_margin +#: help:product.product,sale_expected:0 +msgid "" +"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices" +msgstr "" + +#. module: product_margin +#: field:product.product,total_margin:0 +msgid "Total Margin" +msgstr "የሁሉም ዋጋ በአንድ መጠን ሲጨምር" + +#. module: product_margin +#: field:product.product,date_from:0 +msgid "Margin Date From" +msgstr "እቃው ከጨመረበት ቀን ጀምሮ" + +#. module: product_margin +#: help:product.product,turnover:0 +msgid "" +"Sum of Multiplication of Invoice price and quantity of Customer Invoices" +msgstr "" + +#. module: product_margin +#: field:product.product,normal_cost:0 +msgid "Normal Cost" +msgstr "መደበኛ ዋጋ" + +#. module: product_margin +#: view:product.product:0 +msgid "Purchases" +msgstr "ግዢዎች" + +#. module: product_margin +#: field:product.product,purchase_num_invoiced:0 +msgid "# Invoiced in Purchase" +msgstr "" + +#. module: product_margin +#: help:product.product,expected_margin:0 +msgid "Expected Sale - Normal Cost" +msgstr "" + +#. module: product_margin +#: view:product.margin:0 +msgid "Properties categories" +msgstr "በአይነታቸው መከፍፈል" + +#. module: product_margin +#: help:product.product,total_margin_rate:0 +msgid "Total margin * 100 / Turnover" +msgstr "" + +#. module: product_margin +#: view:product.margin:0 +msgid "Open Margins" +msgstr "" + +#. module: product_margin +#: selection:product.margin,invoice_state:0 +#: selection:product.product,invoice_state:0 +msgid "Open and Paid" +msgstr "የተከፈተና የትከፈል" + +#. module: product_margin +#: view:product.product:0 +msgid "Sales" +msgstr "ሽያጭ" + +#. module: product_margin +#: model:ir.model,name:product_margin.model_product_product +msgid "Product" +msgstr "ውጤት" + +#. module: product_margin +#: view:product.margin:0 +msgid "General Information" +msgstr "አጠቃላይ መርጃ" + +#. module: product_margin +#: field:product.product,purchase_gap:0 +msgid "Purchase Gap" +msgstr "የግዢ ክፍተት" + +#. module: product_margin +#: view:product.margin:0 +msgid "Cancel" +msgstr "መሰረዝ" + +#. module: product_margin +#: view:product.product:0 +msgid "Margins" +msgstr "በአንድ መጠን ሲጨምር" + +#. module: product_margin +#: help:product.product,sale_num_invoiced:0 +msgid "Sum of Quantity in Customer Invoices" +msgstr "" + +#. module: product_margin +#: view:product.margin:0 +msgid "or" +msgstr "ወይም" + +#. module: product_margin +#: model:ir.model,name:product_margin.model_product_margin +msgid "Product Margin" +msgstr "የእቃው መጨመር" diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 4ab2c01cc96..159393f02d8 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-17 08:03+0000\n" +"PO-Revision-Date: 2014-03-19 10:41+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" -"X-Generator: Launchpad (build 16963)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -4125,27 +4125,27 @@ msgstr "庫存地點" #: help:stock.location,scrap_location:0 msgid "" "Check this box to allow using this location to put scrapped/damaged goods." -msgstr "" +msgstr "勾選選項以允許此倉位存放報廢/損壞貨物。" #. module: stock #: field:stock.picking,message_follower_ids:0 #: field:stock.picking.in,message_follower_ids:0 #: field:stock.picking.out,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "關注者" #. module: stock #: code:addons/stock/stock.py:2634 #, python-format msgid "Cannot consume a move with negative or zero quantity." -msgstr "" +msgstr "調動數量不能為負值或零。" #. module: stock #: help:stock.config.settings,decimal_precision:0 msgid "" "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, " "whereas a decimal precision of 4 will allow weights like: 0.0231 kg." -msgstr "" +msgstr "例如10進位精準度為2將允許重量如9.99公斤，而10進位精準度為4，將允許重量如0.0231公斤。" #. module: stock #: view:report.stock.move:0 @@ -4188,7 +4188,7 @@ msgstr "" #. module: stock #: view:stock.invoice.onshipping:0 msgid "Create invoice" -msgstr "" +msgstr "開立發票" #. module: stock #: view:stock.picking:0 From 42518c339a8d4f3763e73225a933196c645cea00 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 20 Mar 2014 10:13:49 +0100 Subject: [PATCH 39/50] [FIX] subscription: missing required dependency on `base` bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1 --- addons/subscription/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py index b301525eb42..5f8a1d1338b 100644 --- a/addons/subscription/__openerp__.py +++ b/addons/subscription/__openerp__.py @@ -37,7 +37,7 @@ e.g. To have an invoice generated automatically periodically: above. Specify the interval information and partner to be invoice. """, 'author': 'OpenERP SA', - 'depends': [], + 'depends': ['base'], 'data': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'], 'demo': ['subscription_demo.xml',], 'installable': True, From 287aae3942015b2c0fe816b45201e155502ec221 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 20 Mar 2014 12:07:41 +0100 Subject: [PATCH 40/50] [FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y --- addons/stock/wizard/stock_move_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml index 5dc0d0d824c..f2bc40d9a3f 100644 --- a/addons/stock/wizard/stock_move_view.xml +++ b/addons/stock/wizard/stock_move_view.xml @@ -67,6 +67,7 @@ form form new + {'form_view_ref': False} @@ -124,6 +125,7 @@ form form new + {'form_view_ref': False} From 84eeb798756727994c96da7f4229faaa4359efac Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 20 Mar 2014 16:44:36 +0100 Subject: [PATCH 41/50] [FIX] point_of_sale: add multi-companies rules on pos.config bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p --- addons/point_of_sale/security/point_of_sale_security.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml index 54572ee3eb9..47cdf47fda4 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -19,5 +19,11 @@ [('company_id', '=', user.company_id.id)] + + Point Of Sale Config + + + ['|',('shop_id.company_id','=',False),('shop_id.company_id','child_of',[user.company_id.id])] + From be81326ee3e5ed315ea9af8cda9ce47b60a6c4c0 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 20 Mar 2014 18:48:35 +0100 Subject: [PATCH 42/50] [FIX] survey: report not stored on filesystem bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt --- addons/survey/wizard/survey_send_invitation.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 4913ca09eab..b8f188675cb 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -127,17 +127,10 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we for use in exist_user: new_user.append(use.id) for id in survey_ref.browse(cr, uid, survey_ids): - report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title) - file = open(addons.get_module_resource('survey', 'report') + id.title +".pdf") - file_data = "" - while 1: - line = file.readline() - file_data += line - if not line: - break - file.close() - attachments[id.title +".pdf"] = file_data - os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf") + service = netsvc.LocalService('report.survey.form'); + (result, format) = service.create(cr, uid, [id.id], {}, {}) + + attachments[id.title +".pdf"] = result for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids): if not partner.email: From 9bf6f0310e3eef2bb526ee09e01d1d402649f712 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Thu, 20 Mar 2014 19:02:40 +0100 Subject: [PATCH 43/50] [FIX] Move default value in the _defaults of model and not in default_get. Don't override the location_id if the super get_default don't retrun a value. Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq --- .../stock/wizard/stock_change_product_qty.py | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py index 01ed6f2409a..cf4099ac3ba 100644 --- a/addons/stock/wizard/stock_change_product_qty.py +++ b/addons/stock/wizard/stock_change_product_qty.py @@ -33,6 +33,10 @@ class stock_change_product_qty(osv.osv_memory): 'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"), 'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"), } + _defaults = { + 'new_quantity': 1, + 'product_id': lambda self, cr, uid, ctx: ctx and ctx.get('active_id', False) or False + } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): if context is None: context = {} @@ -54,20 +58,22 @@ class stock_change_product_qty(osv.osv_memory): @param context: A standard dictionary @return: A dictionary which of fields with values. """ - product_id = context and context.get('active_id', False) or False + res = super(stock_change_product_qty, self).default_get(cr, uid, fields, context=context) - if 'new_quantity' in fields: - res.update({'new_quantity': 1}) - if 'product_id' in fields: - res.update({'product_id': product_id}) if 'location_id' in fields: - try: - model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock') - self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context) - except (orm.except_orm, ValueError): - location_id = False - res.update({'location_id': location_id}) + location_id = res.get('location_id', False) + if not location_id: + try: + model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock') + except (orm.except_orm, ValueError): + pass + if location_id: + try: + self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context) + except (orm.except_orm, ValueError): + pass + res['location_id'] = location_id return res def change_product_qty(self, cr, uid, ids, context=None): From 7b0b8a07908e6a259d5c7a451b767a2230711820 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 21 Mar 2014 06:51:15 +0000 Subject: [PATCH 44/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061913-o2fp3m104dzeb2ky bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065115-srp2g1l3twjabmcq --- openerp/addons/base/i18n/fr_CA.po | 206 +++++++++++++++++++++++------- openerp/addons/base/i18n/pt.po | 12 +- 2 files changed, 164 insertions(+), 54 deletions(-) diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po index d8abd9f8ee0..49a5fc8820b 100644 --- a/openerp/addons/base/i18n/fr_CA.po +++ b/openerp/addons/base/i18n/fr_CA.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2013-04-20 19:52+0000\n" -"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) " -"\n" +"PO-Revision-Date: 2014-03-19 20:37+0000\n" +"Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-08 06:16+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -35,7 +34,7 @@ msgstr "" #. module: base #: model:res.country,name:base.sh msgid "Saint Helena" -msgstr "" +msgstr "Sainte Hélène" #. module: base #: view:ir.actions.report.xml:0 @@ -45,7 +44,7 @@ msgstr "" #. module: base #: selection:ir.property,type:0 msgid "DateTime" -msgstr "" +msgstr "Date et heure" #. module: base #: code:addons/fields.py:652 @@ -74,7 +73,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Hungarian / Magyar" -msgstr "" +msgstr "Hongrois / Magyar" #. module: base #: selection:base.language.install,lang:0 @@ -87,6 +86,8 @@ msgid "" "Helps you manage your projects and tasks by tracking them, generating " "plannings, etc..." msgstr "" +"Vous aide à gérer vos projets et tâches, en assurant leur suivi, en générant " +"des planifications, etc." #. module: base #: model:ir.module.module,summary:base.module_point_of_sale @@ -227,7 +228,7 @@ msgstr "" #. module: base #: model:res.country,name:base.sz msgid "Swaziland" -msgstr "" +msgstr "Swaziland" #. module: base #: code:addons/orm.py:4485 @@ -395,7 +396,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_customer_relationship_management msgid "Customer Relationship Management" -msgstr "" +msgstr "Gestion de la relation client (CRM)" #. module: base #: model:ir.module.module,description:base.module_delivery @@ -432,19 +433,19 @@ msgstr "" #. module: base #: field:res.partner,credit_limit:0 msgid "Credit Limit" -msgstr "" +msgstr "Limite de crédit" #. module: base #: model:ir.module.module,shortdesc:base.module_portal_project_long_term msgid "Portal Project Long Term" -msgstr "" +msgstr "Portail des projets à long terme" #. module: base #: field:ir.model.constraint,date_update:0 #: field:ir.model.data,date_update:0 #: field:ir.model.relation,date_update:0 msgid "Update Date" -msgstr "" +msgstr "Mettre à jour la date" #. module: base #: model:ir.module.module,shortdesc:base.module_base_action_rule @@ -455,12 +456,12 @@ msgstr "" #: view:ir.attachment:0 #: field:ir.attachment,create_uid:0 msgid "Owner" -msgstr "" +msgstr "Propriétaire" #. module: base #: view:ir.actions.act_window:0 msgid "Source Object" -msgstr "" +msgstr "Objet source" #. module: base #: model:res.partner.bank.type,format_layout:base.bank_normal @@ -482,7 +483,7 @@ msgstr "" #: field:ir.model.access,group_id:0 #: view:res.groups:0 msgid "Group" -msgstr "" +msgstr "Groupe" #. module: base #: constraint:res.lang:0 @@ -490,6 +491,9 @@ msgid "" "Invalid date/time format directive specified. Please refer to the list of " "allowed directives, displayed when you edit a language." msgstr "" +"Vous avez spécifié une directive de format date/temps non valide. Veuillez " +"vous référer à la liste des directives autorisées, qui s'affiche lorsque " +"vous modifiez une langue." #. module: base #: code:addons/orm.py:4153 @@ -603,6 +607,19 @@ msgid "" "* Use emails to automatically confirm and send acknowledgements for any " "event registration\n" msgstr "" +"\n" +"Gestion et organisation d'événements\n" +"====================================\n" +"\n" +"Le module 'Événement' vous permet d'organiser efficacement des événements et " +"toutes les tâches liées : planification, suivi des inscriptions, des " +"présences, etc.\n" +"\n" +"Fonctionnalités clés\n" +"--------------------\n" +"* Gestion des événements et des inscriptions\n" +"* Utilisation d'e-mails pour automatiquement confirmer et envoyer des " +"accusés de réception pour chaque inscription à un événement\n" #. module: base #: selection:base.language.install,lang:0 @@ -615,11 +632,13 @@ msgid "" "If you check this, then the second time the user prints with same attachment " "name, it returns the previous report." msgstr "" +"Si vous cochez ceci, alors la seconde fois que l'utilisateur imprimera avec " +"le même nom de pièce jointe, cela retournera le rapport stocké" #. module: base #: model:res.country,name:base.ao msgid "Angola" -msgstr "" +msgstr "Angola" #. module: base #: selection:base.language.install,lang:0 @@ -629,7 +648,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice msgid "Invoice on Timesheets" -msgstr "" +msgstr "Facture sur les feuilles de temps" #. module: base #: view:base.module.upgrade:0 @@ -645,12 +664,12 @@ msgstr "" #. module: base #: field:res.country,name:0 msgid "Country Name" -msgstr "" +msgstr "Nom du pays" #. module: base #: model:res.country,name:base.co msgid "Colombia" -msgstr "" +msgstr "Colombie" #. module: base #: model:res.partner.title,name:base.res_partner_title_mister @@ -672,7 +691,7 @@ msgstr "" #. module: base #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "" +msgstr "Achats et ventes" #. module: base #: view:res.partner:0 @@ -758,6 +777,33 @@ msgid "" "module named account_voucher.\n" " " msgstr "" +"\n" +"Comptabilité et gestion financière\n" +"==================================\n" +"\n" +"Le module de comptabilité et de finance couvre :\n" +"------------------------------------------------\n" +" * Comptabilité générale\n" +" * Comptabilité de coût / comptabilité analytique\n" +" * Comptabilité de tiers\n" +" * Gestion des taxes\n" +" * Budgets\n" +" * Factures clients et fournisseurs\n" +" * Relevés bancaires\n" +" * Réconciliations par partenaire\n" +"\n" +"Il créé également un tableau de bord pour les comptables qui inclut :\n" +"---------------------------------------------------------------------\n" +" * Une liste des factures clients à approuver\n" +" * L'analyse de la société\n" +" * Un graphe de la trésorerie\n" +"\n" +"Les processus tels que le maintien de la comptabilité générale se fait par " +"le biais des revues financières définies (les lignes d'écriture à regrouper " +"le sont à travers un journal)\n" +"pour un exercice donné et pour la préparation des reçus il ya un module " +"nommé account_voucher.\n" +" " #. module: base #: view:ir.model:0 @@ -800,7 +846,7 @@ msgstr "" #. module: base #: model:res.country,name:base.jo msgid "Jordan" -msgstr "" +msgstr "Jordanie" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_hr @@ -825,7 +871,7 @@ msgstr "" #. module: base #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Le nom de la société doit être unique !" #. module: base #: model:ir.ui.menu,name:base.menu_base_action_rule_admin @@ -857,6 +903,10 @@ msgid "" "invoice, then `object.invoice_address_id.mobile` is the field which gives " "the correct mobile number" msgstr "" +"Fournit les champs qui seront utilisés pour récupérer le numéro du " +"cellulaire. Exemple: vous sélectionnez une facture, alors, " +"`object.invoice_address_id.mobile` est le champ qui représente le numéro du " +"cellulaire correct." #. module: base #: view:ir.mail_server:0 @@ -877,7 +927,7 @@ msgstr "" #: field:base.language.export,name:0 #: field:ir.attachment,datas_fname:0 msgid "File Name" -msgstr "" +msgstr "Nom du fichier" #. module: base #: model:res.country,name:base.rs @@ -934,6 +984,33 @@ msgid "" "also possible in order to automatically create a meeting when a holiday " "request is accepted by setting up a type of meeting in Leave Type.\n" msgstr "" +"\n" +"Gère les absences et les demandes de congés\n" +"===========================================\n" +"\n" +"Cette application contrôle la programmation des congés de votre société. Il " +"permet aux employés de faire des demandes de congés. Ensuite, les managers " +"peuvent examiner les demandes et les approuver ou les rejeter. De cette " +"façon, vous pouvez contrôler la planification de l'ensemble des congés de " +"votre entreprise ou de votre département.\n" +"\n" +"Vous pouvez configurer plusieurs sortes d'absences (maladie, congés payés, " +"congés sans soldes…) et allouer rapidement ces absences à un employé ou un " +"département en utilisant les demandes de congés. Un employé peut aussi faire " +"une demande de congés pour plus de jours en ajoutant une allocation. Cela va " +"augmenter le total des jours disponibles pour ce type de congés (si la " +"demande est acceptée).\n" +"\n" +"Vous pouvez suivre les absences de différentes façons grâce aux rapports " +"suivants : \n" +"\n" +"* Résumé des absences\n" +"* Absences par département\n" +"* Analyse des absences\n" +"\n" +"Une synchronisation avec les agendas internes (Réunions du module CRM) est " +"aussi possible dans le but de créer automatiquement une réunion quand une " +"demande de congés est accepté en ajoutant une type de réunion Absence.\n" #. module: base #: selection:base.language.install,lang:0 @@ -943,7 +1020,7 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_crm_config_opportunity msgid "Opportunities" -msgstr "" +msgstr "Opportunités" #. module: base #: model:ir.model,name:base.model_base_language_export @@ -953,7 +1030,7 @@ msgstr "" #. module: base #: model:res.country,name:base.pg msgid "Papua New Guinea" -msgstr "" +msgstr "Papouasie-Nouvelle-Guinée" #. module: base #: help:ir.actions.report.xml,report_type:0 @@ -984,7 +1061,7 @@ msgstr "" #. module: base #: model:res.country,name:base.zw msgid "Zimbabwe" -msgstr "" +msgstr "Zimbabwe" #. module: base #: help:ir.model.constraint,type:0 @@ -1000,7 +1077,7 @@ msgstr "" #. module: base #: model:res.country,name:base.es msgid "Spain" -msgstr "" +msgstr "Espagne" #. module: base #: help:ir.actions.act_window,domain:0 @@ -1020,7 +1097,7 @@ msgstr "" #: view:res.partner.bank:0 #: view:res.users:0 msgid "ZIP" -msgstr "" +msgstr "Code postal" #. module: base #: selection:base.language.install,lang:0 @@ -1030,17 +1107,17 @@ msgstr "" #. module: base #: field:res.partner,mobile:0 msgid "Mobile" -msgstr "" +msgstr "Cellulaire" #. module: base #: model:res.country,name:base.om msgid "Oman" -msgstr "" +msgstr "Oman" #. module: base #: model:ir.module.module,shortdesc:base.module_mrp msgid "MRP" -msgstr "" +msgstr "MRP - PBM" #. module: base #: model:ir.module.module,description:base.module_hr_attendance @@ -1078,12 +1155,12 @@ msgstr "" #: model:ir.actions.act_window,name:base.act_menu_create #: view:wizard.ir.model.menu.create:0 msgid "Create Menu" -msgstr "" +msgstr "Créer un menu" #. module: base #: model:res.country,name:base.in msgid "India" -msgstr "" +msgstr "Inde" #. module: base #: model:ir.actions.act_window,name:base.res_request_link-act @@ -1099,7 +1176,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_fleet msgid "Fleet Management" -msgstr "" +msgstr "Gestion de flotte" #. module: base #: help:ir.server.object.lines,value:0 @@ -1159,6 +1236,36 @@ msgid "" "* Planned Revenue by Stage and User (graph)\n" "* Opportunities by Stage (graph)\n" msgstr "" +"\n" +"Le module OpenERP de gestion de la relation client (CRM)\n" +"=============================================\n" +"\n" +"Cette application permet aux utilisateurs de gérer efficacement et " +"intelligemment leurs pistes, opportunités, réunions et appels " +"téléphoniques.\n" +"\n" +"Elle gère les tâches clés comme la communication, l'identification, les " +"assignations, les résolutions et les notifications.\n" +"\n" +"OpenERP assure que toutes les demandes sont suivis par les utilisateurs, les " +"clients et les fournisseurs. Il permet d'envoyer automatiquement des " +"rappels, d'escalader des requêtes, de lancer des actions spécifiques et de " +"nombreuses autres selon les règles de l'entreprise.\n" +"\n" +"Le grand avantage de ce système est que les utilisateurs n'ont rien à faire " +"de spécial. Le module CRM dispose d'une passerelle de courriel permettant de " +"synchroniser les courriels reçus et OpenERP. De cette façon, les " +"utilisateurs peuvent simplement envoyer des courriels au système de suivi " +"des demandes.\n" +"\n" +"OpenERP s'occupera de remercier les utilisateurs de leur message, de diriger " +"cette demande à l'équipe appropriée et de s'assurer que toute les " +"communications futures seront rangées à la bonne place.\n" +"\n" +"\n" +"Le tableau bord de cette application inclus:\n" +"* les revenus prévus par étape de vente et par utilisateur (graphique);\n" +"* les opportunités par étape de vente (graphique).\n" #. module: base #: selection:base.language.export,format:0 @@ -1292,17 +1399,17 @@ msgstr "" #: selection:ir.actions.server,state:0 #: selection:workflow.activity,kind:0 msgid "Dummy" -msgstr "" +msgstr "Factice" #. module: base #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML invalide pour l'architecture de la vue" #. module: base #: model:res.country,name:base.ky msgid "Cayman Islands" -msgstr "" +msgstr "Îles Caïmans" #. module: base #: view:ir.rule:0 @@ -1338,7 +1445,7 @@ msgstr "" #. module: base #: selection:ir.property,type:0 msgid "Char" -msgstr "" +msgstr "Caractère" #. module: base #: field:ir.module.category,visible:0 @@ -1416,6 +1523,9 @@ msgid "" "decimal number [00,53]. All days in a new year preceding the first Monday " "are considered to be in week 0." msgstr "" +"%W - Numéro de semaine dans l'année (lundi est le premier jour de la " +"semaine) en nombre décimal [00,53]. Tous les jours de la nouvelle année " +"précédant le premier lundi sont considérés faisant partie de la semaine 0." #. module: base #: code:addons/base/module/wizard/base_language_install.py:53 @@ -1441,13 +1551,13 @@ msgstr "" #. module: base #: field:ir.actions.act_url,url:0 msgid "Action URL" -msgstr "" +msgstr "URL de l'action" #. module: base #: field:base.module.import,module_name:0 #: field:ir.module.module,shortdesc:0 msgid "Module Name" -msgstr "" +msgstr "Nom du module" #. module: base #: model:res.country,name:base.mh @@ -1474,7 +1584,7 @@ msgstr "" #: view:ir.ui.view:0 #: selection:ir.ui.view,type:0 msgid "Search" -msgstr "" +msgstr "Recherche" #. module: base #: code:addons/osv.py:154 @@ -1502,12 +1612,12 @@ msgstr "" #: code:addons/base/res/res_users.py:131 #, python-format msgid "Operation Canceled" -msgstr "" +msgstr "Opération annulée" #. module: base #: model:ir.module.module,shortdesc:base.module_document msgid "Document Management System" -msgstr "" +msgstr "Système de gestion des documents" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_claim @@ -1550,7 +1660,7 @@ msgstr "" #: model:ir.module.category,name:base.module_category_purchase_management #: model:ir.ui.menu,name:base.menu_purchase_root msgid "Purchases" -msgstr "" +msgstr "Achats" #. module: base #: model:res.country,name:base.md @@ -1575,12 +1685,12 @@ msgstr "" #. module: base #: view:ir.module.module:0 msgid "Features" -msgstr "" +msgstr "Fonctionnalités" #. module: base #: view:ir.attachment:0 msgid "Data" -msgstr "" +msgstr "Données" #. module: base #: model:ir.module.module,description:base.module_portal_claim @@ -1639,7 +1749,7 @@ msgstr "" #: model:ir.module.category,name:base.module_category_social_network #: model:ir.module.module,shortdesc:base.module_mail msgid "Social Network" -msgstr "" +msgstr "Réseau social" #. module: base #: view:res.lang:0 diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index be605ac6363..76afbde170b 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2013-08-14 14:57+0000\n" -"Last-Translator: Ricardo Santa Ana \n" +"PO-Revision-Date: 2014-03-21 00:42+0000\n" +"Last-Translator: JP Calhau \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-08 06:14+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -33,7 +33,7 @@ msgstr "" #. module: base #: view:res.partner.bank:0 msgid "e.g. GEBABEBB" -msgstr "" +msgstr "ex. GEBABEBB" #. module: base #: model:res.country,name:base.sh @@ -5748,7 +5748,7 @@ msgstr "Falta o valor do campo '%s'." #. module: base #: view:ir.rule:0 msgid "Write Access Right" -msgstr "" +msgstr "Permissões de Escrita" #. module: base #: model:ir.actions.act_window,help:base.action_res_groups From 2fa6706037bbf16bd036b2e00830d6c0cd82246d Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 21 Mar 2014 06:51:50 +0000 Subject: [PATCH 45/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4 --- addons/account/i18n/nl.po | 15 ++++---- addons/hr/i18n/am.po | 66 ++++++++++++++++----------------- addons/membership/i18n/zh_CN.po | 2 +- addons/mrp/i18n/ja.po | 29 ++++++++------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 4aa95ed5fc0..932b8201882 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-25 12:37+0000\n" -"Last-Translator: Jan Jurkus (GCE CAD-Service) \n" +"PO-Revision-Date: 2014-03-20 14:36+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-26 07:31+0000\n" -"X-Generator: Launchpad (build 16935)\n" +"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -5062,7 +5062,7 @@ msgstr "Rek. type" #. module: account #: selection:account.journal,type:0 msgid "Bank and Checks" -msgstr "Bank en Cheques" +msgstr "Bank en Giro." #. module: account #: field:account.account.template,note:0 @@ -5515,7 +5515,7 @@ msgstr "MEM" #. module: account #: view:res.partner:0 msgid "Accounting-related settings are managed on" -msgstr "Boekhouding instellingen worden beheert bij" +msgstr "Boekhoudingsinstellingen worden beheerd bij" #. module: account #: field:account.fiscalyear.close,fy2_id:0 @@ -9460,8 +9460,7 @@ msgstr "" " met betrekking tot de dagelijkse bedrijfsvoering.\n" "

\n" " een gemiddeld bedrijf gebruikt een dagboek per " -"betaalmethode(kasboek,\n" -" bankrekeningen, cheques), een inkoopboek, een verkoopboek\n" +"betaalmethode(kas, bank en giro), een inkoopboek, een verkoopboek\n" " en een memoriaal.\n" "

\n" " " diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po index 8d2024b436c..fb93ae7440b 100644 --- a/addons/hr/i18n/am.po +++ b/addons/hr/i18n/am.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-19 08:27+0000\n" +"PO-Revision-Date: 2014-03-20 08:58+0000\n" "Last-Translator: biniyam \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" "X-Generator: Launchpad (build 16967)\n" #. module: hr @@ -63,7 +63,7 @@ msgstr "" #. module: hr #: view:hr.config.settings:0 msgid "Time Tracking" -msgstr "" +msgstr "ግዜመያዣ" #. module: hr #: view:hr.employee:0 @@ -74,17 +74,17 @@ msgstr "በቡድን" #. module: hr #: model:ir.actions.act_window,name:hr.view_department_form_installer msgid "Create Your Departments" -msgstr "" +msgstr "የስራ መደቦችን መፍጠር" #. module: hr #: help:hr.job,no_of_employee:0 msgid "Number of employees currently occupying this job position." -msgstr "" +msgstr "በስራ መደቡ ላይ የታቀፍ የሰራተኞች ብዛት" #. module: hr #: field:hr.config.settings,module_hr_evaluation:0 msgid "Organize employees periodic evaluation" -msgstr "" +msgstr "ሰራተኞች የመመዘኛ ጊዜ" #. module: hr #: view:hr.department:0 @@ -139,12 +139,12 @@ msgstr "ድርጅት" #. module: hr #: field:hr.job,no_of_recruitment:0 msgid "Expected in Recruitment" -msgstr "" +msgstr "በቅጥር ላይ የሚጠበቅ" #. module: hr #: view:hr.employee:0 msgid "Other Information ..." -msgstr "" +msgstr "የተለያዩ መረጃዎች" #. module: hr #: constraint:hr.employee.category:0 @@ -159,23 +159,23 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Birth" -msgstr "" +msgstr "የተወለደበት" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_form #: model:ir.ui.menu,name:hr.menu_view_employee_category_form msgid "Employee Tags" -msgstr "" +msgstr "የሰራተኛው መገለጫ" #. module: hr #: view:hr.job:0 msgid "Launch Recruitement" -msgstr "" +msgstr "የቅጥር ማስታወቅያ ማውጣት" #. module: hr #: model:process.transition,name:hr.process_transition_employeeuser0 msgid "Link a user to an employee" -msgstr "" +msgstr "ተጠቃሚውን ከሰራተኞች ጋር ማገናኘት" #. module: hr #: field:hr.department,parent_id:0 @@ -185,17 +185,17 @@ msgstr "" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config msgid "Leaves" -msgstr "" +msgstr "ፍቃዶች" #. module: hr #: selection:hr.employee,marital:0 msgid "Married" -msgstr "" +msgstr "ያገባ" #. module: hr #: field:hr.job,message_ids:0 msgid "Messages" -msgstr "" +msgstr "መልእክቶች" #. module: hr #: view:hr.config.settings:0 @@ -210,12 +210,12 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Mobile:" -msgstr "" +msgstr "ተንቀሳቃሽ ስልክ" #. module: hr #: view:hr.employee:0 msgid "Position" -msgstr "" +msgstr "የስራ መደብ" #. module: hr #: help:hr.job,message_unread:0 @@ -225,7 +225,7 @@ msgstr "" #. module: hr #: field:hr.employee,color:0 msgid "Color Index" -msgstr "" +msgstr "የከለሮች ድብልቅ" #. module: hr #: model:process.transition,note:hr.process_transition_employeeuser0 @@ -237,27 +237,27 @@ msgstr "" #. module: hr #: field:hr.employee,image_medium:0 msgid "Medium-sized photo" -msgstr "" +msgstr "አነስተኛ መጠን ያለው ፎቶ" #. module: hr #: field:hr.employee,identification_id:0 msgid "Identification No" -msgstr "" +msgstr "የመለያ ቁጥር" #. module: hr #: selection:hr.employee,gender:0 msgid "Female" -msgstr "" +msgstr "ሴት" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config msgid "Attendance" -msgstr "" +msgstr "የሰራተኞች ሰአት መቆጣጠርያ" #. module: hr #: field:hr.employee,work_phone:0 msgid "Work Phone" -msgstr "" +msgstr "የቢሮ ስልክ" #. module: hr #: field:hr.employee.category,child_ids:0 @@ -268,24 +268,24 @@ msgstr "" #: field:hr.job,description:0 #: model:ir.model,name:hr.model_hr_job msgid "Job Description" -msgstr "" +msgstr "የስራው መገለጫ" #. module: hr #: field:hr.employee,work_location:0 msgid "Office Location" -msgstr "" +msgstr "የቢሮው አድራሻ" #. module: hr #: field:hr.job,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "ተከታታይ" #. module: hr #: view:hr.employee:0 #: model:ir.model,name:hr.model_hr_employee #: model:process.node,name:hr.process_node_employee0 msgid "Employee" -msgstr "" +msgstr "ተቀጣሪ" #. module: hr #: model:process.node,note:hr.process_node_employeecontact0 @@ -303,12 +303,12 @@ msgstr "" #. module: hr #: field:hr.employee,birthday:0 msgid "Date of Birth" -msgstr "" +msgstr "የውልድት ቀን" #. module: hr #: help:hr.job,no_of_recruitment:0 msgid "Number of new employees you expect to recruit." -msgstr "" +msgstr "አዲስ ይቀጠራሉ ተብሎ የሚጠበቅ የሰራተኞች ብዛት" #. module: hr #: model:ir.actions.client,name:hr.action_client_hr_menu @@ -332,24 +332,24 @@ msgstr "" #. module: hr #: view:board.board:0 msgid "Human Resources Dashboard" -msgstr "" +msgstr "የሰው ሀይል አስተዳደር የመረጃ ስሊዳ" #. module: hr #: view:hr.employee:0 #: field:hr.employee,job_id:0 #: view:hr.job:0 msgid "Job" -msgstr "" +msgstr "ስራ" #. module: hr #: field:hr.job,no_of_employee:0 msgid "Current Number of Employees" -msgstr "" +msgstr "አሁን ያለው የሰራተኞች ብዛት" #. module: hr #: field:hr.department,member_ids:0 msgid "Members" -msgstr "" +msgstr "አባላቶች" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_configuration diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po index 30a4be5b6a5..0d7a82585d4 100644 --- a/addons/membership/i18n/zh_CN.po +++ b/addons/membership/i18n/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" "X-Generator: Launchpad (build 16967)\n" #. module: membership diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po index 9ac046daeec..defa55fe964 100644 --- a/addons/mrp/i18n/ja.po +++ b/addons/mrp/i18n/ja.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-20 05:56+0000\n" +"PO-Revision-Date: 2014-03-20 16:41+0000\n" "Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" "X-Generator: Launchpad (build 16967)\n" #. module: mrp @@ -86,7 +86,7 @@ msgstr "スクラップ製品" #. module: mrp #: view:mrp.workcenter:0 msgid "Mrp Workcenter" -msgstr "" +msgstr "MRPワークセンター" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_routing_action @@ -190,7 +190,7 @@ msgstr "製品数量" #. module: mrp #: view:mrp.production:0 msgid "Unit of Measure" -msgstr "" +msgstr "単位" #. module: mrp #: model:process.node,note:mrp.process_node_purchaseprocure0 @@ -205,7 +205,7 @@ msgstr "生産計画" #. module: mrp #: field:mrp.config.settings,module_mrp_operations:0 msgid "Allow detailed planning of work order" -msgstr "" +msgstr "作業指示の詳細な計画を許可" #. module: mrp #: code:addons/mrp/mrp.py:633 @@ -298,7 +298,7 @@ msgid "" "When processing a sales order for this product, the delivery order\n" " will contain the raw materials, instead of " "the finished product." -msgstr "この製品の受注を処理した時、配送は完成品ではなく原材料を含みます。" +msgstr "この製品の受注を処理した場合、配送には完成品ではなく原材料が含まれます。" #. module: mrp #: report:mrp.production.order:0 @@ -1355,7 +1355,7 @@ msgstr "集荷リスト" msgid "" "Bill of Materials allow you to define the list of required raw materials to " "make a finished product." -msgstr "" +msgstr "部品表には完成品の製造に必要な原材料のリストを定義することができます。" #. module: mrp #: code:addons/mrp/mrp.py:375 @@ -1873,7 +1873,7 @@ msgstr "データ計算" #: code:addons/mrp/wizard/change_production_qty.py:88 #, python-format msgid "Error!" -msgstr "" +msgstr "エラー！" #. module: mrp #: code:addons/mrp/report/price.py:139 @@ -1917,7 +1917,7 @@ msgstr "製造リードタイム" #: code:addons/mrp/mrp.py:285 #, python-format msgid "Warning" -msgstr "" +msgstr "警告" #. module: mrp #: field:mrp.bom,product_uos_qty:0 @@ -1927,7 +1927,7 @@ msgstr "製品販売単位数量" #. module: mrp #: field:mrp.production,move_prod_id:0 msgid "Product Move" -msgstr "" +msgstr "製品移動" #. module: mrp #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree @@ -2080,8 +2080,9 @@ msgid "" " With this module: A + B + C -> D + E.\n" " This installs the module mrp_byproduct." msgstr "" -"部品表の中に副製品を構成できます。このモジュールを使用しない場合は A + B + C -> D ですが、使用する場合は A + B + C -> D " -"+ E にできます。mrp_byproductモジュールがインストールされます。" +"部品表の中に副製品を構成できます。\n" +"このモジュールを使用しない場合は A + B + C -> D ですが、使用する場合は A + B + C -> D + E にできます。\n" +"mrp_byproductモジュールがインストールされます。" #. module: mrp #: field:procurement.order,bom_id:0 @@ -2312,7 +2313,7 @@ msgid "" "being produced." msgstr "" "副製品がいくつかの製品で使用される場合、それ自身のBOMを作成するためにも有用です。この副製品の製造オーダーを望まない場合、BOMタイプとしてセット/仮想" -"部品を選択します。架空BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷をします。" +"部品を選択します。仮想BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷を行います。" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_mrp_configuration @@ -2330,7 +2331,7 @@ msgstr "" #. module: mrp #: field:mrp.config.settings,group_mrp_properties:0 msgid "Allow several bill of materials per products using properties" -msgstr "" +msgstr "属性を使用して製品ごとにいくつかの部品表を許可" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_property_group_action From 0871d1050344221bfdc9688df4ad1798557409be Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 21 Mar 2014 14:57:05 +0100 Subject: [PATCH 46/50] [FIX] survey: avoid duplicate partners on new users creation bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd --- addons/survey/wizard/survey_send_invitation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index b8f188675cb..177815c24b5 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -136,7 +136,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we if not partner.email: skipped+= 1 continue - user = user_ref.search(cr, uid, [('login', "=", partner.email)]) + user = user_ref.search(cr, uid, [('partner_id', "=", partner.id)]) if user: if user[0] not in new_user: new_user.append(user[0]) @@ -177,6 +177,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we if ans: res_data = {'name': partner.name or _('Unknown'), 'login': partner.email, + 'email': partner.email, + 'partner_id': partner.id, 'password': passwd, 'address_id': partner.id, 'groups_id': [[6, 0, [group_id]]], From 6472e4155a8e49ac80891b54dcb7926880658c32 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 23 Mar 2014 06:44:12 +0000 Subject: [PATCH 47/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0 --- addons/account/i18n/ja.po | 14 ++++++++------ addons/hr/i18n/am.po | 6 +++--- addons/point_of_sale/i18n/ja.po | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 958f54e473c..508ae152702 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-03-08 05:09+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-03-22 05:16+0000\n" +"Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-09 06:02+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-23 06:43+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1565,6 +1565,8 @@ msgid "" "And after getting confirmation from the bank it will be in 'Confirmed' " "status." msgstr "" +"新しい明細書が作成されるとステータスは「ドラフト」になります。\n" +"また、銀行からの確認後は「確認済み」状態になります。" #. module: account #: field:account.invoice.report,state:0 @@ -5007,7 +5009,7 @@ msgstr "番号（移動）" #. module: account #: view:cash.box.out:0 msgid "Describe why you take money from the cash register:" -msgstr "" +msgstr "キャッシュレジスタから現金を取り出した理由を説明して下さい。" #. module: account #: selection:account.invoice,state:0 @@ -5872,7 +5874,7 @@ msgstr "ドラフト返金 " #. module: account #: view:cash.box.in:0 msgid "Fill in this form if you put money in the cash register:" -msgstr "" +msgstr "キャッシュレジスタに現金を入れる場合はこのフォームに記入して下さい。" #. module: account #: view:account.payment.term.line:0 diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po index fb93ae7440b..bcb3bd297fa 100644 --- a/addons/hr/i18n/am.po +++ b/addons/hr/i18n/am.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-20 08:58+0000\n" +"PO-Revision-Date: 2014-03-21 08:07+0000\n" "Last-Translator: biniyam \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n" +"X-Launchpad-Export-Date: 2014-03-22 07:04+0000\n" "X-Generator: Launchpad (build 16967)\n" #. module: hr @@ -290,7 +290,7 @@ msgstr "ተቀጣሪ" #. module: hr #: model:process.node,note:hr.process_node_employeecontact0 msgid "Other information" -msgstr "" +msgstr "ሊሎች መረጃወች" #. module: hr #: help:hr.employee,image_small:0 diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po index 7974d495047..970e1a0d1e4 100644 --- a/addons/point_of_sale/i18n/ja.po +++ b/addons/point_of_sale/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-21 03:40+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-03-22 04:59+0000\n" +"Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-22 07:33+0000\n" -"X-Generator: Launchpad (build 16926)\n" +"X-Launchpad-Export-Date: 2014-03-23 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: point_of_sale #: field:report.transaction.pos,product_nb:0 @@ -143,7 +143,7 @@ msgid "" "You may have to control your cash amount in your cash register, before\n" " being able to start selling through the " "touchscreen interface." -msgstr "" +msgstr "タッチスクリーン・インターフェースを介して販売を開始する前に、キャッシュレジスタ内の現金を管理する必要があります。" #. module: point_of_sale #: report:account.statement:0 @@ -510,7 +510,7 @@ msgstr "" #: selection:pos.session.opening,pos_state:0 #, python-format msgid "In Progress" -msgstr "" +msgstr "進行中" #. module: point_of_sale #: view:pos.session:0 @@ -645,7 +645,7 @@ msgstr "顧客請求書" msgid "" "You can continue sales from the touchscreen interface by clicking on \"Start " "Selling\" or close the cash register session." -msgstr "" +msgstr "「販売開始」をクリックしてタッチスクリーンのインターフェースから販売を続けるか、キャッシュレジスタのセッションを閉じることができます。" #. module: point_of_sale #: report:account.statement:0 @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: view:pos.session.opening:0 msgid "Click to start a session." -msgstr "" +msgstr "クリックしてセッションを開始してください。" #. module: point_of_sale #: view:pos.details:0 @@ -3028,7 +3028,7 @@ msgstr "" #. module: point_of_sale #: help:pos.session,config_id:0 msgid "The physical point of sale you will use." -msgstr "" +msgstr "使用する物理的なPOS" #. module: point_of_sale #: view:pos.order:0 @@ -3960,7 +3960,7 @@ msgstr "" #. module: point_of_sale #: view:pos.session.opening:0 msgid "Click to continue the session." -msgstr "" +msgstr "クリックしてセッションを続けてください。" #. module: point_of_sale #: view:pos.config:0 From 245e83d43b3775a64fd3fa5dc53344751f77aaf6 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Mon, 24 Mar 2014 11:17:31 +0100 Subject: [PATCH 48/50] [FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd --- addons/report_webkit/default_header.html | 1 + addons/report_webkit/webkit_report.py | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/report_webkit/default_header.html b/addons/report_webkit/default_header.html index 0798209a5b7..37fd4135b62 100644 --- a/addons/report_webkit/default_header.html +++ b/addons/report_webkit/default_header.html @@ -1,3 +1,4 @@ + diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 56f361370f2..c6a30f5e579 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -61,6 +61,7 @@ def mako_template(text): tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) + class WebKitParser(report_sxw): """Custom class that use webkit to render HTML reports Code partially taken from report openoffice. Thanks guys :) @@ -122,7 +123,7 @@ class WebKitParser(report_sxw): ), 'w' ) - head_file.write(header) + head_file.write(self._sanitize_html(header)) head_file.close() file_to_del.append(head_file.name) command.extend(['--header-html', head_file.name]) @@ -133,7 +134,7 @@ class WebKitParser(report_sxw): ), 'w' ) - foot_file.write(footer) + foot_file.write(self._sanitize_html(footer)) foot_file.close() file_to_del.append(foot_file.name) command.extend(['--footer-html', foot_file.name]) @@ -154,7 +155,7 @@ class WebKitParser(report_sxw): for html in html_list : html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w') count += 1 - html_file.write(html) + html_file.write(self._sanitize_html(html)) html_file.close() file_to_del.append(html_file.name) command.append(html_file.name) @@ -314,7 +315,6 @@ class WebKitParser(report_sxw): pdf = self.generate_pdf(bin, report_xml, head, foot, htmls) return (pdf, 'pdf') - def create(self, cursor, uid, ids, data, context=None): """We override the create function in order to handle generator Code taken from report openoffice. Thanks guys :) """ @@ -335,11 +335,18 @@ class WebKitParser(report_sxw): report_xml.report_sxw = None else: return super(WebKitParser, self).create(cursor, uid, ids, data, context) - if report_xml.report_type != 'webkit' : + if report_xml.report_type != 'webkit': return super(WebKitParser, self).create(cursor, uid, ids, data, context) result = self.create_source_pdf(cursor, uid, ids, data, report_xml, context) if not result: return (False,False) return result + def _sanitize_html(self, html): + """wkhtmltopdf expects the html page to declare a doctype. + """ + if html and html[:9].upper() != "\n" + html + return html + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 04f632820bdbea4ed64ae2af95d03e66e81780ad Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 24 Mar 2014 11:34:27 +0100 Subject: [PATCH 49/50] [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance) bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i --- addons/sale/wizard/sale_make_invoice.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 47716018caa..4405349b064 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -20,6 +20,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ +from openerp import netsvc class sale_make_invoice(osv.osv_memory): _name = "sale.make.invoice" @@ -46,6 +47,7 @@ class sale_make_invoice(osv.osv_memory): order_obj = self.pool.get('sale.order') mod_obj = self.pool.get('ir.model.data') act_obj = self.pool.get('ir.actions.act_window') + wf_service = netsvc.LocalService("workflow") newinv = [] if context is None: context = {} @@ -55,11 +57,13 @@ class sale_make_invoice(osv.osv_memory): raise osv.except_osv(_('Warning!'), _("You shouldn't manually invoice the following sale order %s") % (sale_order.name)) order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice=data['invoice_date']) - - for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context): + orders = order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context) + for o in orders: for i in o.invoice_ids: newinv.append(i.id) - + # Dummy call to workflow, will not create another invoice but bind the new invoice to the subflow + for id in [o.id for o in orders if o.order_policy == 'manual']: + wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr) result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] From a8d14c47df21ae4259fe13f9d96096561a0bf46b Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 25 Mar 2014 07:21:22 +0000 Subject: [PATCH 50/50] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0 bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d --- addons/web/i18n/ar.po | 18 +++++++++--------- addons/web/i18n/th.po | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po index 42555c05423..b51a0b84783 100644 --- a/addons/web/i18n/ar.po +++ b/addons/web/i18n/ar.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2014-01-07 06:19+0000\n" +"PO-Revision-Date: 2014-03-25 00:31+0000\n" "Last-Translator: Mustafa Rawi \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-22 07:33+0000\n" -"X-Generator: Launchpad (build 16926)\n" +"X-Launchpad-Export-Date: 2014-03-25 07:21+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: web #. openerp-web @@ -896,7 +896,7 @@ msgstr "بحث: " #: code:addons/web/static/src/xml/base.xml:141 #, python-format msgid "Check this box to evaluate OpenERP." -msgstr "حدد هذا الاختيار لتقييم كروز." +msgstr "حدد هذا الاختيار لتقييم OpenERP." #. module: web #. openerp-web @@ -1111,7 +1111,7 @@ msgstr "حذف" #: code:addons/web/static/src/xml/base.xml:425 #, python-format msgid "My OpenERP.com account" -msgstr "حساب كروز" +msgstr "حساب OpenERP" #. module: web #. openerp-web @@ -1488,7 +1488,7 @@ msgstr "إزالة الكل" #: code:addons/web/static/src/js/chrome.js:253 #, python-format msgid "Your OpenERP session expired. Please refresh the current web page." -msgstr "انتهت جلستك في كروز. الرجاء إعادة تحديث الصفحة الحالية." +msgstr "انتهت جلستك في OpenERP. الرجاء إعادة تحديث الصفحة الحالية." #. module: web #. openerp-web @@ -2039,7 +2039,7 @@ msgstr "الافتراضي" #: code:addons/web/static/src/xml/base.xml:468 #, python-format msgid "OpenERP" -msgstr "كروز" +msgstr "OpenERP" #. module: web #. openerp-web @@ -2425,7 +2425,7 @@ msgstr "زر" #: code:addons/web/static/src/xml/base.xml:440 #, python-format msgid "OpenERP is a trademark of the" -msgstr "كروز علامة تجارية ملك" +msgstr "OpenERP علامة تجارية ملك" #. module: web #. openerp-web @@ -2471,7 +2471,7 @@ msgstr "False" #: code:addons/web/static/src/xml/base.xml:426 #, python-format msgid "About OpenERP" -msgstr "حول كروز" +msgstr "حول OpenERP" #. module: web #. openerp-web diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po index cf71700f2b9..c1016cbe39c 100644 --- a/addons/web/i18n/th.po +++ b/addons/web/i18n/th.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2014-03-06 06:57+0000\n" +"PO-Revision-Date: 2014-03-17 10:09+0000\n" "Last-Translator: Sumonchai ( เหลา ) \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: web #. openerp-web @@ -530,7 +530,7 @@ msgstr "เปิดใช้งานโหมดนักพัฒนา" #: code:addons/web/static/src/js/chrome.js:341 #, python-format msgid "Loading (%d)" -msgstr "กำลังโหลด (% d)" +msgstr "กำลังโหลด (%d)" #. module: web #. openerp-web