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

[MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

Browse Source 
bzr revid: sbh@tinyerp.com-20100531063004-1y8ll7ekbxich9l0
This commit is contained in:
sbh (Open ERP)
2010-05-31 12:00:04 +05:30
parent 518f48a83f dc5a427e35
commit 75e3e79392
39 changed files with 935 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/pl.po
+27 -26
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-06 09:55+0000\n"
"PO-Revision-Date: 2010-05-30 15:07+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-07 04:03+0000\n"
"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -117,7 +117,7 @@ msgstr "Nadrzędne"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr ""
msgstr "Dokument dziennika"
#. module: account
#: field:account.invoice,residual:0
@@ -136,7 +136,7 @@ msgstr ""
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
#: model:ir.ui.menu,name:account.menu_unreconcile_select
msgid "Unreconcile entries"
msgstr ""
msgstr "Skasuj uzgodnienie"
#. module: account
#: constraint:account.period:0
@@ -156,7 +156,7 @@ msgstr "Zapisy"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Debit Centralisation"
msgstr ""
msgstr "Centralizacja Winien"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -647,7 +647,7 @@ msgstr "Warunki płatności dla partnera"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
msgstr ""
msgstr "Uzgodnienie zapisów"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
@@ -867,7 +867,7 @@ msgstr "Konta analityczne"
#: model:ir.actions.wizard,name:account.wizard_print_journal
#: model:ir.ui.menu,name:account.menu_print_journal
msgid "Print Journal"
msgstr "Drukuj dziennik"
msgstr "Drukuj zapisy dzienników"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -1339,7 +1339,7 @@ msgstr "Zamknij rok podatkowy"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
msgstr ""
msgstr "Centralizacja przeciwnej strony"
#. module: account
#: view:wizard.company.setup:0
@@ -1546,7 +1546,7 @@ msgstr "Dodatnie"
#: model:ir.actions.wizard,name:account.wizard_general_journal
#: model:ir.ui.menu,name:account.menu_general_journal
msgid "Print General Journal"
msgstr ""
msgstr "Drukuj stany dzienników"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1786,7 +1786,7 @@ msgstr "Uzgodnienie zapisów z faktur i płatności"
#: model:ir.actions.wizard,name:account.wizard_central_journal
#: model:ir.ui.menu,name:account.menu_central_journal
msgid "Print Central Journal"
msgstr ""
msgstr "Drukuj konta dzienników"
#. module: account
#: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1877,7 +1877,7 @@ msgstr "Data początkowa"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
msgstr ""
msgstr "x Dziennik korekt wydatków"
#. module: account
#: field:account.analytic.journal,type:0
@@ -2010,7 +2010,7 @@ msgstr " Data początkowa"
#. module: account
#: wizard_view:account.analytic.account.journal.report,init:0
msgid "Analytic Journal Report"
msgstr ""
msgstr "Raport dzenników analitycznych"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2119,7 +2119,7 @@ msgstr "dni"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
msgstr "Poprzednio"
msgstr "Przeszłość"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@@ -2168,7 +2168,8 @@ msgid "Analytic Entry"
msgstr "Zapis analityczny"
#. module: account
#: view:res.company:0 field:res.company,overdue_msg:0
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr "Komunikat przeterminowanych płatności"
@@ -2846,7 +2847,7 @@ msgstr "Widok dziennika"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
msgstr ""
msgstr "Centralizacja Ma"
#. module: account
#: rml:account.overdue:0
@@ -2886,7 +2887,7 @@ msgstr "Nowa Faktura Klienta"
#: wizard_button:account.move.line.reconcile,addendum,reconcile:0
#: wizard_button:account.move.line.reconcile,init_full,reconcile:0
msgid "Reconcile"
msgstr "Uzgodnij"
msgstr "Uzgodnienie"
#. module: account
#: rml:account.overdue:0
@@ -3004,7 +3005,7 @@ msgstr "Uzgodnienie"
#. module: account
#: field:account.move.line,centralisation:0
msgid "Centralisation"
msgstr ""
msgstr "Centralizacja"
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -3235,7 +3236,7 @@ msgstr "Uwagi"
msgid ""
"The account moves of the invoice have been reconciled with account moves of "
"the payment(s)."
msgstr "Zapisy konta dla faktury zostały uzgodnione ze zapisami płatności."
msgstr "Zapisy konta dla faktury zostały uzgodnione z zapisami płatności."
#. module: account
#: rml:account.invoice:0
@@ -3308,7 +3309,7 @@ msgstr "Uzgodnij zapisy"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
msgid "(Invoice should be unreconciled if you want to open it)"
msgstr ""
msgstr "(Faktura musi mieć skasowane uzgodnienia, jeśli chcesz ją otworzyć)"
#. module: account
#: view:account.invoice:0
@@ -3536,7 +3537,7 @@ msgstr "Zapłać i uzgodnij"
#: rml:account.central.journal:0
#: model:ir.actions.report.xml,name:account.account_central_journal
msgid "Central Journal"
msgstr "Dziennik główny"
msgstr "Konta dziennika"
#. module: account
#: rml:account.third_party_ledger:0
@@ -3922,7 +3923,7 @@ msgstr "Wprowadź ręcznie zestawienie"
#: model:ir.actions.act_window,name:account.action_account_journal_form
#: model:ir.ui.menu,name:account.menu_action_account_journal_form
msgid "Financial Journals"
msgstr "Dzienniki finansowe"
msgstr "Dzienniki księgowe"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -5504,7 +5505,7 @@ msgstr "Zapis na koncie"
#: rml:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
msgstr ""
msgstr "Stany dzienników"
#. module: account
#: field:account.account,balance:0
@@ -5653,7 +5654,7 @@ msgstr "Do"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
msgid "Entries of Open Analytic Journals"
msgstr ""
msgstr "Zapisy otwartych dzienników analitycznych"
#. module: account
#: view:account.invoice.tax:0
@@ -5686,7 +5687,7 @@ msgstr "Rok podatkowy do zamknięcia"
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
#: wizard_field:account.automatic.reconcile,init,date1:0
msgid "Start of period"
msgstr "Pociątek okresu"
msgstr "Początek okresu"
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
@@ -5875,7 +5876,7 @@ msgstr "Rok podatkowy"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Future"
msgstr "Przyszłe"
msgstr "Przyszłość"
#. module: account
#: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5909,7 +5910,7 @@ msgstr "Zapis"
#: model:process.transition,note:account.process_transition_reconcilepaid0
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
msgid "Paid invoice when reconciled."
msgstr ""
msgstr "Faktura zapłacona przy uzgadnianiu"
#. module: account
#: field:account.tax,python_compute_inv:0
addons/account/i18n/zh_CN.po
+18 -14
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-06 05:39+0000\n"
"PO-Revision-Date: 2010-05-29 11:45+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-07 04:03+0000\n"
"X-Launchpad-Export-Date: 2010-05-30 03:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -72,7 +72,7 @@ msgstr "选择消息"
msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr "该科目将用于统计当前产品分类的入库金额"
msgstr "这科目将用于当前产品分类的销售收入科目"
#. module: account
#: help:account.invoice,period_id:0
@@ -222,7 +222,7 @@ msgstr "账龄试算平衡表"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurrent Entries"
msgstr "定期分录"
msgstr "周期性凭证"
#. module: account
#: field:account.analytic.line,amount:0
@@ -875,7 +875,7 @@ msgstr "必须的"
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
msgstr "费用科目"
msgstr "采购科目"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -1575,7 +1575,7 @@ msgstr "科目编码"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
msgstr "留空为使用费用科目"
msgstr "留空为使用采购科目"
#. module: account
#: wizard_field:account.automatic.reconcile,init,account_ids:0
@@ -2138,7 +2138,8 @@ msgid "Analytic Entry"
msgstr "辅助核算凭证"
#. module: account
#: view:res.company:0 field:res.company,overdue_msg:0
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr "逾期付款信息"
@@ -3848,7 +3849,7 @@ msgstr "这会计期间可以重叠"
msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr "这科目将替换当前产品的默认出仓"
msgstr "这科目将用于当前产品分类的采购科目"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -4171,7 +4172,7 @@ msgid ""
"Allows you to change the sign of the balance amount displayed in the "
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr "允许你修改报表显示的余额的符号,所以你能够看见正数的数字替代费用科目的负数"
msgstr "允许你修改报表显示的余额的符号,所以你能够看见正数的数字替代科目的负数"
#. module: account
#: help:account.config.wizard,code:0
@@ -5365,7 +5366,7 @@ msgstr "计算"
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
msgstr "选择产品的收入和费用科目"
msgstr "选择产品的收入和采购科目"
#. module: account
#: field:account.tax,type_tax_use:0
@@ -5625,7 +5626,7 @@ msgstr "说明"
msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr "这科目将替换当前产品的默认进仓"
msgstr "这科目将用于当前产品的默认销售收入科目"
#. module: account
#: field:account.tax,child_ids:0
@@ -5657,7 +5658,7 @@ msgstr "科目设置"
msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr "这科目将替换当前业务伙伴的默认支付科目"
msgstr "这科目将用于当前业务伙伴的默认应付科目"
#. module: account
#: field:account.tax.code,code:0
@@ -5829,7 +5830,7 @@ msgstr "科目一览"
msgid ""
"This account will be used to value outgoing stock for the current product "
"category"
msgstr "这科目将替换当前产品分类的默认出仓"
msgstr "这科目将用于当前产品分类的采购科目"
#. module: account
#: help:account.tax,base_sign:0
@@ -5851,7 +5852,7 @@ msgstr "银行详情"
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
msgstr "产品费用科目模板"
msgstr "产品采购科目模板"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -5950,6 +5951,9 @@ msgstr "计算日期"
#~ msgid "For Value percent enter % ratio between 0-1."
#~ msgstr "值是一个百分比在0-1之间"
#~ msgid "account.config.wizard"
#~ msgstr "科目.设置.向导"
#~ msgid "For Tax Type percent enter % ratio between 0-1."
#~ msgstr "税类型是百分比在0-1之间"
addons/account_analytic_plans/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_anglo_saxon/i18n/id.po
+1 -1
View File
@@ -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: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
addons/account_budget/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
addons/account_chart/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
addons/account_date_check/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
addons/account_followup/i18n/es.po
+5 -4
View File
@@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-30 18:05+0000\n"
"Last-Translator: Hesed Franquet <Unknown>\n"
"PO-Revision-Date: 2010-05-28 19:11+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@@ -255,7 +256,7 @@ msgstr ""
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,summary,end:0
msgid "Ok"
msgstr "Ok"
msgstr "Aceptar"
#. module: account_followup
#: field:account_followup.followup,name:0
addons/account_followup/i18n/pt.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/analytic_journal_billing_rate/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
addons/base_setup/i18n/id.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
addons/base_vat/i18n/pt.po
+7 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:10+0000\n"
"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
"PO-Revision-Date: 2010-05-28 11:26+0000\n"
"Last-Translator: cmsa <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
@@ -21,6 +21,8 @@ msgstr ""
msgid ""
"Enable the VAT Number for the partner. Check the validity of that VAT Number."
msgstr ""
"Active o NIF (Número de Identificação Fiscal) para o parceiro verificando a "
"sua validade"
#. module: base_vat
#: constraint:ir.ui.view:0
@@ -30,9 +32,9 @@ msgstr "XML inválido para a arquitectura de vista"
#. module: base_vat
#: field:res.partner,vat_subjected:0
msgid "VAT Legal Statement"
msgstr ""
msgstr "Declaração Legal do IVA"
#. module: base_vat
#: model:ir.module.module,shortdesc:base_vat.module_meta_information
msgid "VAT"
msgstr ""
msgstr "IVA"
addons/crm_profiling/i18n/pt.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
addons/hr_evaluation/i18n/id.po
+278
View File
@@ -0,0 +1,278 @@
# Indonesian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 12:18+0000\n"
"PO-Revision-Date: 2010-05-28 10:50+0000\n"
"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,info:0
msgid "Information"
msgstr "Informasi"
#. module: hr_evaluation
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Schedule next evaluation"
msgstr "Jadwal evaluasi berikutnya"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_bad:0
msgid "Bad Points"
msgstr ""
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
msgid "My Next Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,value_ids:0
msgid "Values"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_good:0
msgid "Good Points"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,state:0
msgid "State"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,score:0
#: field:hr_evaluation.quote,score:0
#: field:hr_evaluation.type,score:0
#: field:hr_evaluation.type.value,score:0
msgid "Score"
msgstr "Skor"
#. module: hr_evaluation
#: selection:hr_evaluation.evaluation,state:0
msgid "Draft"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Informal Data"
msgstr ""
#. module: hr_evaluation
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Nama model tidak sah di definsi aksi"
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,employee_id:0
msgid "Employee"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_improve:0
msgid "To Improve"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,evaluation_id:0
msgid "Evaluation"
msgstr "Evaluasi"
#. module: hr_evaluation
#: field:hr_evaluation.type.value,type_id:0
msgid "Evaluation Type"
msgstr "Tipe Evaluasi"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Status"
msgstr "Status"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Apply to categories"
msgstr ""
#. module: hr_evaluation
#: model:ir.module.module,description:hr_evaluation.module_meta_information
msgid "Ability to create employees evaluation."
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,name:0
msgid "Quote"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,category_ids:0
msgid "Appliable Role"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,user_id:0
msgid "Evaluation User"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Choices Results"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,date:0
msgid "Date"
msgstr "Tanggal"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
msgid "Evaluations"
msgstr "Evaluasi"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
msgid "Configuration"
msgstr "Konfigurasi"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
msgid "Next Evaluations"
msgstr "Evaluasi Berikutnya"
#. module: hr_evaluation
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
msgid "Evaluation Criterions"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
msgid "My Preceeding Evaluations"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
msgid "HR Responsible"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,value_id:0
#: field:hr_evaluation.type.value,name:0
msgid "Value"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,name:0
msgid "Summary"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,active:0
msgid "Active"
msgstr "Aktif"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Notes"
msgstr "Catatan"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
msgid "Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
msgid "Employee Evaluation Type"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Quotations"
msgstr ""
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
msgid "Next Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,type_id:0
msgid "Type"
msgstr "Jenis"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,name:0
msgid "Evaluation Criterion"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
msgid "My Next Evaluations"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.quote:0
msgid "Evalution Quote"
msgstr ""
#. module: hr_evaluation
#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
msgid "Human Resources Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,quote_ids:0
msgid "Quotes"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: selection:hr_evaluation.evaluation,state:0
msgid "Done"
msgstr "Selesai"
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
msgid "Employee Evaluation Quote"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_employee:0
msgid "Employee Response"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
msgid "Evaluation Type Value"
msgstr ""
addons/hr_evaluation/report/hr_evaluation_report_view.xml
+6 -6
View File
@@ -6,7 +6,7 @@
<field name="model">hr.evaluation.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluations Statistics">
<tree string="Evaluations Analysis">
<field name="create_date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="deadline" invisible="1"/>
@@ -27,7 +27,7 @@
<field name="model">hr.evaluation.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Evaluations" type="bar">
<graph string="Evaluations Analysis" type="bar">
<field name="employee_id"/>
<field name="nbr" operator="+"/>
<field name="state" group="True"/>
@@ -40,12 +40,12 @@
<field name="model">hr.evaluation.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Evaluations">
<search string="Evaluations Analysis">
<group>
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string="365 Days"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string="30 Days"
name="month"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in last 30 days"/>
@@ -99,7 +99,7 @@
</record>
<record id="action_evaluation_report_all" model="ir.actions.act_window">
<field name="name">Evaluations</field>
<field name="name">Evaluations Analysis</field>
<field name="res_model">hr.evaluation.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
addons/hr_expense/report/hr_expense_report_view.xml
+41 -49
View File
@@ -6,7 +6,7 @@
<field name="model">hr.expense.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Expenses Statistics">
<tree string="Expenses Analysis">
<field name="date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="user_id" invisible="1"/>
@@ -36,7 +36,7 @@
<field name="model">hr.expense.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Expenses Statistics" type="bar">
<graph string="Expenses Analysis" type="bar">
<field name="user_id"/>
<field name="state" group="True"/>
<field name="nbr" operator="+"/>
@@ -49,42 +49,42 @@
<field name="model">hr.expense.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Expenses">
<search string="Expenses Analysis">
<group>
<filter icon="terp-hr" string="Last 365 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 year"/>
<filter icon="terp-hr" string="This Month"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last month"/>
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 year"/>
<filter icon="gtk-media-rewind" string=" 30 Days "
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last month"/>
<filter icon="gtk-media-rewind"
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 days"/>
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 days"/>
<separator orientation="vertical"/>
<filter string="Draft"
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft Expenses"/>
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft Expenses"/>
<filter string="Waiting"
icon="terp-hr"
domain="[('state', '=' ,'confirm')]"
help = "Confirm Expenses"/>
icon="terp-hr"
domain="[('state', '=' ,'confirm')]"
help = "Confirm Expenses"/>
<filter string="Accepted"
icon="terp-hr"
domain="[('state','=','accepted')]"
help = "Accepted Expenses"/>
icon="terp-hr"
domain="[('state','=','accepted')]"
help = "Accepted Expenses"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="Expenses Non Assigned User"
help="Expenses Non Assigned User"
domain="[('user_id','=',False)]"/>
</field>
<field name="product_id"/>
<field name="employee_id" widget="selection"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="My Expenses"
help="My Expenses"
domain="[('user_id','=',uid)]"/>
</field>
</group>
<newline/>
<group expand="1" string="Group By...">
@@ -106,37 +106,29 @@
</group>
<newline/>
<group expand="0" string="Extended filters..." groups="base.group_extended">
<filter string="Invoiced"
icon="terp-hr"
domain="[('state','=','invoiced')]"
help = "Invoiced Expenses"/>
<filter string="Reimbursed"
icon="terp-hr"
domain="[('state','=','paid')]"
help = "Reimbursed Expenses"/>
<filter string="Cancelled"
icon="terp-hr"
domain="[('state','=','cancelled')]"
help = "Cancelled Expenses"/>
<separator orientation="vertical"/>
<field name="state"/>
<separator orientation="vertical"/>
<field name="date_confirm"/>
<separator orientation="vertical"/>
<field name="journal_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<field name="department_id" widget="selection"/>
<field name="journal_id" widget="selection"/>
<field name="currency_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<field name="date_confirm"/>
<separator orientation="vertical"/>
<field name="date_valid"/>
<separator orientation="vertical"/>
<field name="currency_id" widget="selection"/>
</group>
</search>
</field>
</record>
<record id="action_hr_expense_report_all" model="ir.actions.act_window">
<field name="name">Expenses</field>
<field name="name">Expenses Analysis</field>
<field name="res_model">hr.expense.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
addons/hr_holidays/i18n/id.po
+67 -66
View File
@@ -7,29 +7,29 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 13:50+0000\n"
"Last-Translator: <>\n"
"PO-Revision-Date: 2010-05-28 11:15+0000\n"
"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
msgid "New Holidays Request"
msgstr ""
msgstr "Permintaan Hari Libur Baru"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
msgid "All Holidays Requests"
msgstr ""
msgstr "Semua Permintaan Hari Libur"
#. module: hr_holidays
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nama model tidak sah di definsi aksi"
#. module: hr_holidays
#: field:hr.holidays.per.user,remaining_leaves:0
@@ -44,12 +44,12 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Blue"
msgstr ""
msgstr "Biru Cerah"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Brown"
msgstr ""
msgstr "Coklat"
#. module: hr_holidays
#: xsl:holidays.summary:0
@@ -66,7 +66,7 @@ msgstr ""
#: view:hr.holidays.per.user:0
#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
msgid "Employee Holidays"
msgstr ""
msgstr "Hari Libur Karyawan"
#. module: hr_holidays
#: view:hr.holidays:0
@@ -79,7 +79,7 @@ msgstr ""
#: model:ir.model,name:hr_holidays.model_hr_holidays
#: model:process.node,name:hr_holidays.process_node_holidays0
msgid "Holidays"
msgstr ""
msgstr "Hari Libur"
#. module: hr_holidays
#: xsl:holidays.summary:0
@@ -94,7 +94,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Green"
msgstr ""
msgstr "Hijau Cerah"
#. module: hr_holidays
#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
@@ -111,51 +111,51 @@ msgstr ""
#. module: hr_holidays
#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
msgid "Refused Request"
msgstr ""
msgstr "Permintaan yang Ditolak"
#. module: hr_holidays
#: model:process.node,name:hr_holidays.process_node_approved0
msgid "Approved"
msgstr ""
msgstr "Disetujui"
#. module: hr_holidays
#: selection:hr.holidays.summary.employee,init,holiday_type:0
msgid "Both"
msgstr ""
msgstr "Keduanya"
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Refuse"
msgstr ""
msgstr "Tolak"
#. module: hr_holidays
#: wizard_button:hr.holidays.summary,notify,end:0
#: wizard_button:hr.holidays.summary.employee,notify,end:0
msgid "Ok"
msgstr ""
msgstr "Setuju"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
msgid "My Holidays Requests"
msgstr ""
msgstr "Permintaan Hari Libur Saya"
#. module: hr_holidays
#: field:hr.holidays,notes:0
#: field:hr.holidays.per.user,notes:0
msgid "Notes"
msgstr ""
msgstr "Catatan"
#. module: hr_holidays
#: field:hr.holidays,holiday_status:0
#: field:hr.holidays.log,holiday_status:0
#: field:hr.holidays.per.user,holiday_status:0
msgid "Holiday's Status"
msgstr ""
msgstr "Status Hari Libur"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
msgid "Request is refused."
msgstr ""
msgstr "Permintaan Ditolak."
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
@@ -180,12 +180,12 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Holiday status"
msgstr ""
msgstr "Status Hari Libur"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_status
msgid "Holidays Status"
msgstr ""
msgstr "Status Hari Libur"
#. module: hr_holidays
#: field:hr.holidays,date_to:0
@@ -195,7 +195,7 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays.per.user:0
msgid "Holidays Allowed"
msgstr ""
msgstr "Hari Libur Diizinkan"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_legaldeclaration0
@@ -210,7 +210,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
msgid "Holidays Per User"
msgstr ""
msgstr "Hari Libur Per Pengguna"
#. module: hr_holidays
#: view:hr.holidays.status:0
@@ -221,19 +221,19 @@ msgstr ""
#: selection:hr.holidays.summary,init,holiday_type:0
#: selection:hr.holidays.summary.employee,init,holiday_type:0
msgid "Confirmed"
msgstr ""
msgstr "Dikonfirmasi"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary,init,date_from:0
#: wizard_field:hr.holidays.summary.employee,init,date_from:0
msgid "From"
msgstr ""
msgstr "Dari"
#. module: hr_holidays
#: view:hr.holidays:0
#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
msgid "Confirm"
msgstr ""
msgstr "Konfirmasi"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
@@ -256,7 +256,7 @@ msgstr ""
#: field:hr.holidays.log,employee_id:0
#: field:hr.holidays.per.user,employee_id:0
msgid "Employee"
msgstr ""
msgstr "Karyawan"
#. module: hr_holidays
#: selection:hr.holidays,state:0
@@ -266,7 +266,7 @@ msgstr ""
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
msgid "Employee get holidays"
msgstr ""
msgstr "Karyawan mendapatkan hari libur"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
@@ -281,36 +281,36 @@ msgstr ""
#. module: hr_holidays
#: field:hr.holidays.log,nb_holidays:0
msgid "Number of Holidays Requested"
msgstr ""
msgstr "Jumlah Permintaan Hari Libur"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
msgid "My Holiday Requests"
msgstr ""
msgstr "Permintaan Hari Libur Saya"
#. module: hr_holidays
#: view:hr.holidays:0
#: view:hr.holidays.per.user:0
msgid "Number of Days"
msgstr ""
msgstr "Jumlah Hari"
#. module: hr_holidays
#: field:hr.holidays.status,name:0
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
msgid "Holiday Status"
msgstr ""
msgstr "Status Hari Libur"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,init:0
#: wizard_view:hr.holidays.summary.employee,init:0
msgid "Report Options"
msgstr ""
msgstr "Pilihan Laporan"
#. module: hr_holidays
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_approved0
@@ -335,7 +335,7 @@ msgstr ""
#. module: hr_holidays
#: wizard_field:hr.holidays.summary.employee,init,emp:0
msgid "Employee(s)"
msgstr ""
msgstr "Karyawan"
#. module: hr_holidays
#: field:hr.holidays,number_of_days:0
@@ -347,7 +347,7 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
msgid "Holidays Per Employee"
msgstr ""
msgstr "Hari Libur Per Karyawan"
#. module: hr_holidays
#: field:hr.holidays.status,limit:0
@@ -367,7 +367,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_log
msgid "hr.holidays.log"
msgstr ""
msgstr "hr.holidays.log"
#. module: hr_holidays
#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -377,7 +377,7 @@ msgstr ""
#. module: hr_holidays
#: model:process.node,name:hr_holidays.process_node_calendar0
msgid "Calendar"
msgstr ""
msgstr "Kalender"
#. module: hr_holidays
#: field:hr.holidays,date_from:0
@@ -425,12 +425,12 @@ msgstr ""
#: wizard_view:hr.holidays.summary,notify:0
#: wizard_view:hr.holidays.summary.employee,notify:0
msgid "Notification"
msgstr ""
msgstr "Pemberitahuan"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
msgid "Employee fills in a request for holidays"
msgstr ""
msgstr "Karyawan mengisi di dalam sebuah permintaan untuk hari libur"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -451,7 +451,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Black"
msgstr ""
msgstr "Hitam"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
@@ -476,7 +476,7 @@ msgstr ""
#. module: hr_holidays
#: field:hr.holidays,state:0
msgid "Status"
msgstr ""
msgstr "Status"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
@@ -486,12 +486,12 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
msgid "My Holidays Request"
msgstr ""
msgstr "Permintaan Hari Libur Saya"
#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color of the status"
msgstr ""
msgstr "Warna dari status"
#. module: hr_holidays
#: selection:hr.holidays.summary,init,holiday_type:0
@@ -506,7 +506,7 @@ msgstr ""
#. module: hr_holidays
#: xsl:holidays.summary:0
msgid "holidays."
msgstr ""
msgstr "hari libur."
#. module: hr_holidays
#: selection:hr.holidays,state:0
@@ -516,22 +516,22 @@ msgstr ""
#. module: hr_holidays
#: field:hr.holidays.per.user,user_id:0
msgid "User"
msgstr ""
msgstr "Pengguna"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
msgid "Document for employee"
msgstr ""
msgstr "Dokumen untuk karyawan"
#. module: hr_holidays
#: field:hr.holidays.log,date:0
msgid "Date"
msgstr ""
msgstr "Tanggal"
#. module: hr_holidays
#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
msgid "Reufse"
msgstr ""
msgstr "Tolak"
#. module: hr_holidays
#: field:hr.holidays.status,section_id:0
@@ -547,7 +547,7 @@ msgstr ""
#: field:hr.holidays.per.user,active:0
#: field:hr.holidays.status,active:0
msgid "Active"
msgstr ""
msgstr "Aktif"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
@@ -557,12 +557,12 @@ msgstr ""
#. module: hr_holidays
#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
msgid "Approved Request"
msgstr ""
msgstr "Permintaan yang Disetujui"
#. module: hr_holidays
#: model:process.node,name:hr_holidays.process_node_holidaysrequest0
msgid "Holidays Request"
msgstr ""
msgstr "Permintaan Hari Libur"
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
@@ -572,12 +572,12 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
msgid "General"
msgstr ""
msgstr "Umum"
#. module: hr_holidays
#: view:hr.holidays.per.user:0
msgid "General Information"
msgstr ""
msgstr "Informasi Umum"
#. module: hr_holidays
#: view:hr.holidays:0
@@ -585,7 +585,7 @@ msgstr ""
#: wizard_button:hr.holidays.summary,init,end:0
#: wizard_button:hr.holidays.summary.employee,init,end:0
msgid "Cancel"
msgstr ""
msgstr "Batal"
#. module: hr_holidays
#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
@@ -601,25 +601,26 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
msgid "My Holidays Request Refused"
msgstr ""
msgstr "Permintaan Hari Libur Saya Ditolak"
#. module: hr_holidays
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
#. module: hr_holidays
#: wizard_button:hr.holidays.summary,init,checkdept:0
#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
msgid "Print"
msgstr ""
msgstr "Cetak"
#. module: hr_holidays
#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
msgid "Print Summary of Holidays"
msgstr ""
msgstr "Cetak Rangkuman dari Hari Libur"
#. module: hr_holidays
#: wizard_field:hr.holidays.summary,init,depts:0
@@ -635,12 +636,12 @@ msgstr ""
#: selection:hr.holidays,state:0
#: model:process.node,name:hr_holidays.process_node_refused0
msgid "Refused"
msgstr ""
msgstr "Ditolak"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
msgid "Request is approved."
msgstr ""
msgstr "Permintaan Disetujui."
#. module: hr_holidays
#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
@@ -651,7 +652,7 @@ msgstr ""
#: wizard_field:hr.holidays.summary,init,holiday_type:0
#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
msgid "Select Holiday Type"
msgstr ""
msgstr "Pilih Jenis Hari Libur"
#. module: hr_holidays
#: field:hr.holidays,case_id:0
@@ -661,7 +662,7 @@ msgstr ""
#. module: hr_holidays
#: field:hr.holidays,holiday_user_id:0
msgid "Holiday per user"
msgstr ""
msgstr "Hari libur per pengguna"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_holidays0
@@ -681,7 +682,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Red"
msgstr ""
msgstr "Merah"
#. module: hr_holidays
#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
@@ -691,7 +692,7 @@ msgstr ""
#. module: hr_holidays
#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
msgid "Holidays Process"
msgstr ""
msgstr "Proses Hari Libur"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,notify:0
@@ -711,7 +712,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Yellow"
msgstr ""
msgstr "Kuning Cerah"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
addons/hr_recruitment/report/hr_recruitment_report.py
+2 -6
View File
@@ -35,7 +35,7 @@ class hr_recruitment_report(osv.osv):
_description = "Recruitments Statistics"
_auto = False
_rec_name = 'date'
def _get_data(self, cr, uid, ids, field_name, arg, context={}):
""" @param cr: the current row, from the database cursor,
@@ -73,9 +73,7 @@ class hr_recruitment_report(osv.osv):
return res
_columns = {
'name': fields.char('Year', size=64, required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -88,8 +86,7 @@ class hr_recruitment_report(osv.osv):
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -99,7 +96,6 @@ class hr_recruitment_report(osv.osv):
'date_closed': fields.date('Closed', readonly=True),
'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
addons/hr_recruitment/report/hr_recruitment_report_view.xml
+30 -47
View File
@@ -6,7 +6,7 @@
<field name="model">hr.recruitment.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Recruitments Statistics">
<tree string="Recruitment Analysis">
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="job_id" invisible="1"/>
@@ -33,7 +33,7 @@
<field name="model">hr.recruitment.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Recruitments Statistics" type="bar">
<graph string="Recruitment Analysis" type="bar">
<field name="job_id"/>
<field name="nbr" operator="+"/>
</graph>
@@ -45,66 +45,56 @@
<field name="model">hr.recruitment.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Recruitments">
<search string="Recruitment Analysis">
<group>
<filter icon="terp-hr" string="This Year"
<filter icon="gtk-media-rewind" string="365 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this year"/>
<filter icon="terp-hr" string="This Month"
help="Recruitment performed in last 356 days"/>
<filter icon="gtk-media-rewind" string="30 Days"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this month"/>
help="Recruitment performed in this month"/>
<filter icon="gtk-media-rewind"
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Tasks during last 7 days"/>
help="Recruitment during last 7 days"/>
<separator orientation="vertical"/>
<filter string="Draft"
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft tasks"/>
help = "Draft recruitment"/>
<filter string="Current"
icon="terp-hr"
domain="[('state', '=' ,'open')]"
help = "In progress tasks"/>
help = "In progress recruitment"/>
<filter string="Pending"
icon="terp-hr"
domain="[('state','=','pending')]"
help = "Pending tasks"/>
help = "Pending recruitment"/>
<separator orientation="vertical"/>
<field name="department_id" widget="selection">
<filter icon="terp-hr"
string="My Recruitments "
help="My Department Recruitments"
domain="[('user_id','=',uid)]"/>
<filter icon="terp-hr"
string="Recruitments non assigned to departments"
help="Recruitments non assigned to departments"
domain="[('user_id','=',False)]"/>
<field name="partner_id"/>
<field name="department_id" widget="selection"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="My Recruitment"
help="My Recruitment"
domain="[('user_id','=',uid)]"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="Recruitments non assigned"
help="Recruitments non assigned"
domain="[('user_id','=',False)]"/>
</field>
</group>
<newline/>
<newline/>
<group expand="1" string="Group By ...">
<filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
<filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
<separator orientation="vertical"/>
<filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
<filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
<filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
@@ -112,37 +102,30 @@
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<filter icon="terp-hr"
string="Hired"
name="done"
domain="[('state','=','done')]"/>
<field name="state"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<field name="priority"/>
<field name="stage_id" widget="selection"/>
<field name="job_id" widget="selection"/>
<newline/>
<filter icon="terp-hr"
string="Refused"
domain="[('state','=','cancel')]"/>
<field name="type_id" widget="selection"/>
<newline/>
<field name="priority"/>
<separator orientation="vertical"/>
<field name="date_closed"/>
<separator orientation="vertical"/>
<field name="type_id" widget="selection"/>
<field name="partner_id"/>
<field name="partner_address_id"/>
</group>
<field name="job_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
</field>
</record>
<record id="action_hr_recruitment_report_all" model="ir.actions.act_window">
<field name="name">Recruitments</field>
<field name="name">Recruitment Analysis</field>
<field name="res_model">hr.recruitment.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
addons/marketing/__init__.py
+2
View File
@@ -19,5 +19,7 @@
#
##############################################################################
import marketing_wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing/__openerp__.py
-1
View File
@@ -29,7 +29,6 @@
"description": "Menu for Marketing",
'website': 'http://www.openerp.com',
'init_xml': [],
'demo_xml':[],
'update_xml': ['marketing_view.xml'],
'demo_xml': [],
'installable': True,
addons/marketing/marketing_view.xml
+49 -3
View File
@@ -1,6 +1,52 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
</data>
</openerp>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
<record id="view_marketing_installer" model="ir.ui.view">
<field name="name">marketing.installer.view</field>
<field name="model">marketing.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Marketing Modules Installation</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Marketing System</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications</attribute>
</xpath>
<group colspan="8">
<group colspan="2" col="2">
<separator string="Marketing Mdules" colspan="4" />
<field name="marketing_campaign" />
<field name="crm_profiling" />
</group>
</group>
</data>
</field>
</record>
<record id="action_marketing_installer" model="ir.actions.act_window">
<field name="name">Marketing Modules Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">marketing.installer</field>
<field name="view_id" ref="view_marketing_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="marketing_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_marketing_installer"/>
<field name="sequence">3</field>
</record>
</data>
</openerp>
addons/marketing/marketing_wizard.py
+38
View File
@@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
class marketing_installer(osv.osv_memory):
_name = 'marketing.installer'
_inherit = 'res.config.installer'
_columns = {
# Generic modules
'marketing_campaign':fields.boolean('Marketing Campaign',
help="Helps you to manage your marketing campaigns step by step."),
'crm_profiling':fields.boolean('Crm Profile',
help="Helps you to perform segmentation within partners.")
}
marketing_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing_campaign/__openerp__.py
+3 -1
View File
@@ -23,7 +23,8 @@
{
"name" : "",
"version" : "1.1",
"depends" : ["crm",
"depends" : ["marketing",
"crm",
"document",
"poweremail" # need to get this module form the branch
# lp:poweremail
@@ -39,6 +40,7 @@
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
'report/campaign_analysis_view.xml',
'marketing_campaign_demo.xml'
],
'demo_xml': [
'marketing_campaign_demo.xml',
addons/marketing_campaign/marketing_campaign_view.xml
+6 -5
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/>
<!--
======================
Marketing Campaign
@@ -168,8 +168,9 @@
</record>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="10" />
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
<!--
======================
Marketing Segments
@@ -262,7 +263,7 @@
<field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_create_date': 1}</field>
</record>
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="20" />
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
<!--
======================
@@ -437,7 +438,7 @@
<field name="context">{'group_by': [], 'search_default_todo': 1}</field>
</record>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
</data>
</openerp>
addons/marketing_campaign/report/campaign_analysis_view.xml
+4 -3
View File
@@ -61,15 +61,16 @@
</record>
<record id="action_campaign_analysis_all" model="ir.actions.act_window">
<field name="name">Marketing Report</field>
<field name="name">Campaigns</field>
<field name="res_model">campaign.analysis</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
<field name="search_view_id" ref="view_campaign_analysis_search"/>
</record>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing" sequence="40"/>
<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
</data>
</openerp>
addons/membership/i18n/zh_CN.po
+5 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 08:31+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"PO-Revision-Date: 2010-05-30 06:24+0000\n"
"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
@@ -96,7 +96,7 @@ msgstr "错误!你不能创建递归的账户"
#. module: membership
#: constraint:account.invoice:0
msgid "Error: BVR reference is required."
msgstr ""
msgstr "错误：需要BVR参照"
#. module: membership
#: field:product.product,membership_date_from:0
@@ -294,7 +294,7 @@ msgstr "准会员"
#. module: membership
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "错误：无效的Bvr号（错误的检验和）"
#. module: membership
#: field:res.partner,membership_cancel:0
addons/olap_crm/i18n/id.po
+31
View File
@@ -0,0 +1,31 @@
# Indonesian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-05-28 10:44+0000\n"
"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_crm
#: model:ir.module.module,description:olap_crm.module_meta_information
msgid ""
"\n"
" Sale module will load the data in olap tables\n"
" "
msgstr ""
#. module: olap_crm
#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
msgid "olap_crm"
msgstr "olap_crm"
addons/olap_extract/i18n/id.po
+56
View File
@@ -0,0 +1,56 @@
# Indonesian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-05-28 10:43+0000\n"
"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_extract
#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
msgid "olap_extract"
msgstr "olap_extract"
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,ok:0
msgid "OK"
msgstr "Setuju"
#. module: olap_extract
#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
msgid "Olap Extract"
msgstr ""
#. module: olap_extract
#: model:ir.module.module,description:olap_extract.module_meta_information
msgid ""
"\n"
" Extracts the schema structure.\n"
" "
msgstr ""
#. module: olap_extract
#: wizard_field:olap.extract.schema,init,module_name:0
msgid "Module Name"
msgstr "Nama Modul"
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,end:0
msgid "Cancel"
msgstr "Batal"
#. module: olap_extract
#: wizard_view:olap.extract.schema,init:0
msgid "New Module Name"
msgstr "Nama Modul Baru"
addons/point_of_sale/i18n/ru.po
+5 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:56+0000\n"
"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
"PO-Revision-Date: 2010-05-30 08:32+0000\n"
"Last-Translator: g0nz1k12 <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
@@ -142,7 +142,7 @@ msgstr ""
#. module: point_of_sale
#: rml:pos.receipt:0
msgid "Tel : + 32 (0) 2 231 04 35"
msgstr ""
msgstr "Тел : + 32 (0) 2 231 04 35"
#. module: point_of_sale
#: field:pos.order.line,name:0
@@ -268,7 +268,7 @@ msgstr "Скидка"
#: rml:pos.invoice:0
#: rml:pos.receipt:0
msgid "Fax :"
msgstr ""
msgstr "Факс :"
#. module: point_of_sale
#: wizard_view:pos.scan_product,init:0
addons/procurement/__openerp__.py
+1 -1
View File
@@ -44,7 +44,7 @@
'process/procurement_process.xml',
"company_view.xml",
],
'demo_xml': ['stock_orderpoint.xml'],
# 'demo_xml': ['stock_orderpoint.xml'],
'installable': True,
'active': False,
'certificate': '',
addons/project_planning/project_planning_view.xml
-4
View File
@@ -112,11 +112,7 @@
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<<<<<<< TREE
<button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
=======
<button name="%(project.action_project_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
>>>>>>> MERGE-SOURCE
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
addons/stock/stock.py
+5 -3
View File
@@ -1821,21 +1821,23 @@ class stock_move(osv.osv):
if (move.location_id.usage=='internal' and move.location_dest_id.usage=='customer') or \
(move.location_id.usage=='internal' and move.location_dest_id.usage=='internal'\
and move.location_id.company_id.id!=move.location_dest_id.company_id.id):
sale.append(self.create_account_move(cr,uid,move,account_variation ,acc_dest,amount,context))
sale.append(self.create_account_move(cr,uid,move,acc_dest ,account_variation ,amount,context))
if (move.location_id.usage =='supplier' and move.location_dest_id.usage=='internal') or\
(move.location_id.usage=='internal' and move.location_dest_id.usage=='internal'\
and move.location_id.company_id.id!=move.location_dest_id.company_id.id):
purchase.append(self.create_account_move(cr,uid,move,acc_src ,account_variation,amount,context))
purchase.append(self.create_account_move(cr,uid,move,account_variation, acc_src ,amount,context))
lines.append(purchase and purchase[0] )
lines.append( sale and sale[0])
move_obj.create(cr, uid, {
'name': move.name,
'journal_id': journal_id,
'type':'cont_voucher',
'line_id':(purchase and purchase[0]) or( sale and sale[0]),
'line_id': len(lines)==2 and lines[0] +lines[1] or lines,
'ref': move.picking_id and move.picking_id.name,
})
tracking_lot = False
addons/stock_location/__init__.py
+1
View File
@@ -20,5 +20,6 @@
##############################################################################
import stock
import mrp_pull
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/stock_location/__openerp__.py
+2 -2
View File
@@ -37,9 +37,9 @@ This module may be useful for different purposes:
* Manage products to be rent.
""",
'author': 'Tiny',
'depends': ['stock'],
'depends': ['procurement','stock'],
'init_xml': [],
'update_xml': ['stock_view.xml', 'security/ir.model.access.csv'],
'update_xml': ['stock_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
'demo_xml': [],
'installable': True,
'test':[
addons/stock_location/mrp_pull.py
Executable
+131
View File
@@ -0,0 +1,131 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields,osv
import tools
import ir
import pooler
import netsvc
from mx import DateTime
import time
from tools.translate import _
class procurement_order(osv.osv):
_inherit = 'procurement.order'
def check_buy(self, cr, uid, ids, context=None):
for procurement in self.browse(cr, uid, ids):
for line in procurement.product_id.flow_pull_ids:
print line.location_src_id.name, line.location_id.name, line.type_proc
if line.location_id==procurement.location_id:
return line.type_proc=='buy'
return super(procurement_order, self).check_buy(cr, uid, ids)
def check_produce(self, cr, uid, ids, context=None):
for procurement in self.browse(cr, uid, ids):
for line in procurement.product_id.flow_pull_ids:
if line.location_id==procurement.location_id:
return line.type_proc=='produce'
return super(procurement_order, self).check_produce(cr, uid, ids)
def check_move(self, cr, uid, ids, context=None):
for procurement in self.browse(cr, uid, ids):
for line in procurement.product_id.flow_pull_ids:
if line.location_id==procurement.location_id:
if not line.location_src_id:
self.write(cr, uid, procurement.id, {'message': _('No source location defined to generate the picking !')})
return (line.type_proc=='move') and (line.location_src_id)
return False
def action_move_create(self, cr, uid, ids,context=None):
proc_obj = self.pool.get('procurement.order')
move_obj = self.pool.get('stock.move')
location_obj = self.pool.get('stock.location')
wf_service = netsvc.LocalService("workflow")
for proc in proc_obj.browse(cr, uid, ids, context=context):
line = None
for line in proc.product_id.flow_pull_ids:
if line.location_id==proc.location_id:
break
assert line, 'Line can not be False if we are on this state of the workflow'
origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
picking_id = self.pool.get('stock.picking').create(cr, uid, {
'origin': origin,
'company_id': line.company_id and line.company_id.id or False,
'type': line.picking_type,
'move_type': 'one',
'address_id': line.partner_address_id.id,
'note': line.name, # TODO: note on procurement ?
'invoice_state': 'none',
})
move_id = self.pool.get('stock.move').create(cr, uid, {
'name': line.name,
'picking_id': picking_id,
'company_id': line.company_id and line.company_id.id or False,
'product_id': proc.product_id.id,
'date_planned': proc.date_planned,
'product_qty': proc.product_qty,
'product_uom': proc.product_uom.id,
'product_uos_qty': (proc.product_uos and proc.product_uos_qty)\
or proc.product_qty,
'product_uos': (proc.product_uos and proc.product_uos.id)\
or proc.product_uom.id,
'address_id': line.partner_address_id.id,
'location_id': line.location_src_id.id,
'location_dest_id': line.location_id.id,
'move_dest_id': proc.move_id and proc.move_id.id or False, # to verif, about history ?
'tracking_id': False,
'cancel_cascade': line.cancel_cascade,
'state': 'confirmed',
'note': line.name, # TODO: same as above
})
if proc.move_id and proc.move_id.state in ('confirmed'):
self.pool.get('stock.move').write(cr,uid, [proc.move_id.id], {
'state':'waiting'
}, context=context)
proc_id = self.pool.get('procurement.order').create(cr, uid, {
'name': line.name,
'origin': origin,
'company_id': line.company_id and line.company_id.id or False,
'date_planned': proc.date_planned,
'product_id': proc.product_id.id,
'product_qty': proc.product_qty,
'product_uom': proc.product_uom.id,
'product_uos_qty': (proc.product_uos and proc.product_uos_qty)\
or proc.product_qty,
'product_uos': (proc.product_uos and proc.product_uos.id)\
or proc.product_uom.id,
'location_id': line.location_src_id.id,
'procure_method': line.procure_method,
'move_id': move_id,
})
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
if proc.move_id:
self.pool.get('stock.move').write(cr, uid, [proc.move_id.id],
{'location_id':proc.location_id.id})
self.write(cr, uid, [proc.id], {'state':'running','message':_('Moved from other location')})
return False
procurement_order()
addons/stock_location/mrp_pull_workflow.xml
Executable
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Production -->
<record id="act_move" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">move</field>
<field name="kind">function</field>
<field name="action">action_move_create()</field>
</record>
<record id="trans_confirm_mto_buy01" model="workflow.transition">
<field name="act_from" ref="procurement.act_confirm_mto"/>
<field name="act_to" ref="act_move"/>
<field name="condition">check_move()</field>
</record>
<record id="trans_confirm_mto_buy02" model="workflow.transition">
<field name="act_from" ref="act_move"/>
<field name="act_to" ref="procurement.act_make_done"/>
</record>
</data>
</openerp>
addons/stock_location/stock.py
+39 -1
View File
@@ -28,6 +28,7 @@ class stock_location_path(osv.osv):
_name = "stock.location.path"
_columns = {
'name': fields.char('Operation', size=64),
'company_id': fields.many2one('res.company', 'Company'),
'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1),
'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1),
'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1),
@@ -48,16 +49,53 @@ class stock_location_path(osv.osv):
}
stock_location_path()
class product_pulled_flow(osv.osv):
_name = 'product.pulled.flow'
_description = "Pulled Flows."
_columns = {
'name': fields.char('Name', size=64, required=True, help="This field will fill the packing Origin and the name of its moves"),
'cancel_cascade': fields.boolean('Cancel Cascade', help="Allow you to cancel moves related to the product pull flow"),
'location_id': fields.many2one('stock.location','Location', required=True, help="Is the destination location that needs supplying"),
'location_src_id': fields.many2one('stock.location','Location Source', help="Location used by Destination Location to supply"),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
'product_id':fields.many2one('product.product','Product'),
}
_defaults = {
'cancel_cascade': lambda *arg: False,
'procure_method': lambda *args: 'make_to_stock',
'type_proc': lambda *args: 'move',
'picking_type':lambda *args:'out',
}
product_pulled_flow()
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
'flow_pull_ids': fields.one2many('product.pulled.flow', 'product_id', 'Pulled Flows'),
'path_ids': fields.one2many('stock.location.path', 'product_id',
'Location Paths',
'Pushed Flow',
help="These rules set the right path of the product in the "\
"whole location tree.")
}
product_product()
class stock_move(osv.osv):
_inherit = 'stock.move'
_columns = {
'cancel_cascade': fields.boolean('Cancel Cascade', help='If checked, when this move is cancelled, cancel the linked move too')
}
def action_cancel(self,cr,uid,ids,context={ }):
for m in self.browse(cr, uid, ids, context=context):
if m.cancel_cascade and m.move_dest_id:
self.action_cancel(cr, uid, [m.move_dest_id.id], context=context)
res = super(stock_move,self).action_cancel(cr,uid,ids,context)
return res
stock_move()
class stock_location(osv.osv):
_inherit = 'stock.location'
def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
addons/stock_location/stock_view.xml
+44 -15
View File
@@ -8,7 +8,6 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Location Paths">
<field name="product_id"/>
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="name"/>
@@ -24,7 +23,7 @@
<form string="Location Paths">
<field name="name"/>
<newline/>
<field name="product_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<field name="location_from_id"/>
<field name="location_dest_id"/>
@@ -40,19 +39,49 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<page string="Procurement &amp; Locations">
<field name="path_ids" editable="bottom" colspan="4" nolabel="1" groups="base.group_extended">
<tree string="Location Paths" editable="bottom">
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="auto"/>
<field name="delay"/>
<field name="name"/>
</tree>
</field>
</page>
<notebook position="inside">
<page string="Logistic Flow">
<field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
<tree string="Pulled flows">
<field name="location_id"/>
<field name="type_proc"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="name"/>
</tree>
<form string="Pulled Paths">
<separator string="Conditions" colspan="4"/>
<field name="name" colspan="4"/>
<field name="location_id"/>
<separator string="Action Type" colspan="4"/>
<field name="type_proc"/>
<separator string="Parameters" colspan="4"/>
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
<field name="location_src_id"/>
<field name="picking_type"/>
<field name="partner_address_id"/>
<field name="procure_method"/>
<field name="cancel_cascade"/>
</group>
</form>
</field>
<field name="path_ids" editable="bottom" colspan="4" nolabel="1">
<field name="name"/>
<tree string="Pushed flows" editable="bottom">
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="auto"/>
<field name="delay"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</page>
</notebook>
</field>
</record>
</data>
</data>
</openerp>