diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 36b65d20dca..7350596c4e3 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -530,9 +530,8 @@ class account_move_line(osv.osv): date = datetime.now().strftime('%Y-%m-%d') part = self.pool.get('res.partner').browse(cr, uid, partner_id) - if part.property_payment_term and part.property_payment_term.line_ids: - payterm = part.property_payment_term.line_ids[0] - res = self.pool.get('account.payment.term').compute(cr, uid, payterm.id, 100, date) + if part.property_payment_term: + res = self.pool.get('account.payment.term').compute(cr, uid, part.property_payment_term.id, 100, date) if res: val['date_maturity'] = res[0][0] if not account_id: @@ -540,10 +539,10 @@ class account_move_line(osv.osv): id2 = part.property_account_receivable.id if journal: jt = self.pool.get('account.journal').browse(cr, uid, journal).type - if jt=='sale': + if jt == 'sale': val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id2) - elif jt=='purchase': + elif jt == 'purchase': val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id1) if val.get('account_id', False): d = self.onchange_account_id(cr, uid, ids, val['account_id']) diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index c1632caa35b..1ed4700b0e0 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -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) \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 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 93b325d879e..1f1aaf4dbb8 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -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 \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之间" diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index cd1477e79cf..523d77c84e3 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -36,10 +36,12 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), + 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), + 'categ_id': fields.many2one('product.category','Category of Product', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal',readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), @@ -81,46 +83,64 @@ class account_invoice_report(osv.osv): to_char(s.date_invoice, 'MM') as month, to_char(s.date_invoice, 'YYYY-MM-DD') as day, l.product_id as product_id, - sum(l.quantity * u.factor) as product_qty, + sum(case when s.type in ('out_refund','in_invoice') then + l.quantity * u.factor * -1 + else + l.quantity * u.factor + end) as product_qty, s.partner_id as partner_id, s.payment_term as payment_term, s.period_id as period_id, + u.name as uom_name, s.currency_id as currency_id, s.journal_id as journal_id, s.fiscal_position as fiscal_position, s.user_id as user_id, s.company_id as company_id, - sum(l.quantity*l.price_unit) as price_total, - (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average, + sum(case when s.type in ('out_refund','in_invoice') then + l.quantity*l.price_unit * -1 + else + l.quantity*l.price_unit + end) as price_total, + sum(case when s.type in ('out_refund','in_invoice') then + l.quantity*l.price_unit * -1 + else + l.quantity*l.price_unit + end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average, count(*) as nbr, s.type as type, s.state, + pt.categ_id, s.date_due as date_due, s.address_contact_id as address_contact_id, s.address_invoice_id as address_invoice_id, s.account_id as account_id, s.partner_bank as partner_bank, - s.residual as residual, + sum(case when s.type in ('out_refund','in_invoice') then + s.residual * -1 + else + s.residual + end) as residual, case when s.state != 'paid' then null else - extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2) + extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2) end as delay_to_pay - from - account_invoice_line l - left join - account_invoice s on (s.id=l.invoice_id) - left join product_uom u on (u.id=l.uos_id), + from account_invoice_line l + left join account_invoice s on (s.id=l.invoice_id) + left join product_template pt on (pt.id=l.product_id) + left join product_uom u on (u.id=l.uos_id), account_move_line am left join account_invoice i on (i.move_id=am.move_id) - where - am.account_id=i.account_id + where am.account_id=i.account_id group by s.type, s.date_invoice, s.partner_id, l.product_id, + u.name, l.uos_id, s.user_id, s.state, s.residual, + pt.categ_id, s.company_id, s.payment_term, s.period_id, diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 94f181cd587..965d5078ae9 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -16,8 +16,10 @@ - + + + @@ -97,16 +99,17 @@ - + + - + diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po index fdd81c9e070..36f79ba1a7a 100644 --- a/addons/account_analytic_analysis/i18n/pt.po +++ b/addons/account_analytic_analysis/i18n/pt.po @@ -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-11-28 23:14+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-06-01 10:22+0000\n" +"Last-Translator: cmsa \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:11+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -38,12 +38,12 @@ msgstr "Data da última factura" #: help:account.analytic.account,remaining_ca:0 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount." msgstr "" -"Processado usando a formula: Preço máximo da factura - Montante facturado" +"Processado usando a fórmula: Preço Máximo da Factura - Montante Facturado" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Quantity - Hours Tot." -msgstr "Processado usando a formula: Quantidade máxima - Horas totais." +msgstr "Processado usando a fórmula: Quantidade Máxima - Horas Totais." #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all @@ -54,32 +54,32 @@ msgstr "Todas as contas de contabilidade analítica" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open msgid "My Current Accounts" -msgstr "Minhas contas correntes" +msgstr "As minhas contas correntes" #. module: account_analytic_analysis #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "XML inválido para a arquitectura de vista" +msgstr "XML inválido para a arquitectura de vista!" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 msgid "Date of the last invoice created for this analytic account." -msgstr "Data da última factura criada por esta conta analítica." +msgstr "Data da última factura criada para esta conta analítica." #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 msgid "Theorical Revenue" -msgstr "Rendimento teórico" +msgstr "Rendimento Teórico" #. module: account_analytic_analysis #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Nome de modelo invalido na definição da acção" +msgstr "Nome de modelo inválido na definição da acção." #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theorial Revenue - Total Costs" -msgstr "Processado usando a formula: Rendimento teórico - Custo total" +msgstr "Processado usando a fórmula: Rendimento Teórico - Custo Total" #. module: account_analytic_analysis #: constraint:ir.model:0 @@ -113,7 +113,7 @@ msgstr "Conta analíticas correntes" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 msgid "Date of the latest work done on this account." -msgstr "Data do ultimo trabalho feito nesta conta" +msgstr "Data do último trabalho feito nesta conta" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 @@ -121,8 +121,8 @@ msgid "" "If invoice from the costs, this is the date of the latest work or cost that " "have been invoiced." msgstr "" -"Se facturado dos custos, esta é a data do ultimo trabalho ou custo que foi " -"facturado." +"Se facturado sobre os custos, esta é a data do ultimo trabalho ou custo que " +"foi facturado." #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing @@ -137,7 +137,7 @@ msgstr "Data do ultimo custo/trabalho" #. module: account_analytic_analysis #: field:account.analytic.account,total_cost:0 msgid "Total Costs" -msgstr "Custo total" +msgstr "Custos totais" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -145,13 +145,13 @@ msgid "" "Number of hours you spent on the analytic account (from timesheet). It " "computes on all journal of type 'general'." msgstr "" -"Número de horas que você passou no conta analítica (do horário). É " +"Número de horas que você passou no conta analítica (da folha de horas). É " "processado em todo o jornal do tipo 'general'." #. module: account_analytic_analysis #: field:account.analytic.account,remaining_hours:0 msgid "Remaining Hours" -msgstr "Horas restantes" +msgstr "Horas Restantes" #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 @@ -161,8 +161,8 @@ msgid "" "the pricelist." msgstr "" "Baseado nos custos você teve no projecto, o que seria o rendimento se todos " -"estes custos forem facturados a preço normal da venda fornecido pela lista " -"de preço." +"estes custos fossem facturados ao preço normal da venda fornecidos pela " +"tabela de preço." #. module: account_analytic_analysis #: field:account.analytic.account,user_ids:0 @@ -174,24 +174,24 @@ msgstr "Utilizador" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending msgid "My Pending Accounts" -msgstr "Minhas contas pendentes" +msgstr "As minhas contas pendentes" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my msgid "My Uninvoiced Entries" -msgstr "Minhas entradas não facturadas" +msgstr "As minhas entradas não facturadas" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 msgid "Computed using the formula: Invoiced Amount - Total Costs." -msgstr "Processado usando a formula: Montante facturado - Custo total." +msgstr "Processado usando a fórmula: Montante Facturado - Custo Total." #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed msgid "My Accounts" -msgstr "Minhas contas" +msgstr "As minhas contas" #. module: account_analytic_analysis #: model:ir.module.module,description:account_analytic_analysis.module_meta_information @@ -200,6 +200,9 @@ msgid "" "important data for project manager of services companies.\n" "Add menu to show relevant information for each manager." msgstr "" +"Modificar a vista da conta analítica para mostrar\n" +"dados importantes para o gestor de projecto das empresas de serviços.\n" +"Adicione menu para mostrar as informações relevantes para cada gerente." #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_non_invoiced:0 @@ -219,43 +222,43 @@ msgstr "Contas da contabilidade analítica" #. module: account_analytic_analysis #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information msgid "report_account_analytic" -msgstr "" +msgstr "report_account_analytic" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 msgid "Invoiced Amount" -msgstr "Montante facturado" +msgstr "Montante Facturado" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71 msgid "Financial Project Management" -msgstr "Gestão do projecto financeiro" +msgstr "Gestão do Projecto Financeiro" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_invoiced_date:0 msgid "Date of Last Invoiced Cost" -msgstr "Data do ultimo custo de facturado" +msgstr "Data do último custo facturado" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 msgid "Uninvoiced Amount" -msgstr "Montante facturado" +msgstr "Montante Facturado" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending msgid "Pending Analytic Accounts" -msgstr "Contas da contabilidade analítica pendentes" +msgstr "Contabilidade analítica contas pendentes" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 msgid "Invoiced Hours" -msgstr "Horas facturadas" +msgstr "Horas Facturadas" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 msgid "Real Margin" -msgstr "Margem real" +msgstr "Margem Real" #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 @@ -265,12 +268,12 @@ msgstr "Montante da facturação total do cliente para esta conta" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month msgid "Hours summary by month" -msgstr "Sumário de horas por mês" +msgstr "Resumo de horas por mês" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin_rate:0 msgid "Computes using the formula: (Real Margin / Total Costs) * 100." -msgstr "Processado usando a formula: (Margem real / Custos total) * 100." +msgstr "Processado usando a fórmula: (Margem Real / Custos Total) * 100." #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_non_invoiced:0 @@ -279,17 +282,17 @@ msgid "" "invoice based on analytic account." msgstr "" "Número de horas (do diário de tipo 'geral') que pode ser facturado se você " -"factura baseado na conta analítica." +"factura baseado em conta analítica." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Analytic accounts" -msgstr "Conta da Contabilidade analítica" +msgstr "Contas da Contabilidade Analítica" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_ca:0 msgid "Remaining Revenue" -msgstr "Lucro restante" +msgstr "Receita Restante" #. module: account_analytic_analysis #: help:account.analytic.account,ca_to_invoice:0 @@ -297,18 +300,18 @@ msgid "" "If invoice from analytic account, the remaining amount you can invoice to " "the customer based on the total costs." msgstr "" -"Se facturado da conta analítica, a quantidade restante que você pode " +"Se facturado por conta analítica, a quantidade restante que você pode " "facturar ao cliente baseado nos custos totais." #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 msgid "Computed using the formula: Invoiced Amount / Hours Tot." -msgstr "Processado usando a formula: Montante facturado / Horas totais." +msgstr "Processado usando a fórmula: Montante Facturado / Horas Totais." #. module: account_analytic_analysis #: field:account.analytic.account,revenue_per_hour:0 msgid "Revenue per Hours (real)" -msgstr "Lucro por hora (real)" +msgstr "Receitas por hora (real)" #. module: account_analytic_analysis #: field:account_analytic_analysis.summary.month,unit_amount:0 @@ -332,7 +335,7 @@ msgstr "Conta da Contabilidade Analítica" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed msgid "Overpassed Accounts" -msgstr "Contas ultrapassadas" +msgstr "Contas Excedidas" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all @@ -347,4 +350,4 @@ msgid "" "indirect costs, like time spent on timesheets." msgstr "" "Total de custos para esta conta. Inclui custos reais (das facturas) e custos " -"indirectos, como o tempo passado em folha de presença." +"indirectos, como o tempo passado em folha de horas." diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po index bb4edb18b29..f1012dd6ec1 100644 --- a/addons/account_analytic_plans/i18n/id.po +++ b/addons/account_analytic_plans/i18n/id.po @@ -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 diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po index 7b17be3392e..59d93dbf74f 100644 --- a/addons/account_analytic_plans/i18n/pt.po +++ b/addons/account_analytic_plans/i18n/pt.po @@ -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: 2009-11-28 23:17+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-06-01 10:24+0000\n" +"Last-Translator: cmsa \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:11+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -26,8 +26,7 @@ msgstr "Identificação da conta4" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere " -"especial !" +"O nome do objecto deve começar com x_ e não pode conter um carácter especial!" #. module: account_analytic_plans #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po index bf59eb13b73..d3e467bf0b2 100644 --- a/addons/account_anglo_saxon/i18n/id.po +++ b/addons/account_anglo_saxon/i18n/id.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: 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 diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po index 2c3e8b90cca..bbc7bebe665 100644 --- a/addons/account_budget/i18n/id.po +++ b/addons/account_budget/i18n/id.po @@ -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 diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po index 058e3f8f5a2..0d9737bac30 100644 --- a/addons/account_chart/i18n/id.po +++ b/addons/account_chart/i18n/id.po @@ -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 diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po index 79a166f2119..b0641600ce9 100644 --- a/addons/account_date_check/i18n/id.po +++ b/addons/account_date_check/i18n/id.po @@ -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 diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po index 19087830a14..68e3e3be2df 100644 --- a/addons/account_followup/i18n/es.po +++ b/addons/account_followup/i18n/es.po @@ -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 \n" +"PO-Revision-Date: 2010-05-28 19:11+0000\n" +"Last-Translator: Jordi Esteve (www.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 diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po index 11aa146ef83..d7f2d146fcd 100644 --- a/addons/account_followup/i18n/pt.po +++ b/addons/account_followup/i18n/pt.po @@ -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 diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po index cbfbfc454a2..e61eb9a0564 100644 --- a/addons/account_invoice_layout/i18n/pt.po +++ b/addons/account_invoice_layout/i18n/pt.po @@ -7,19 +7,19 @@ 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-28 23:25+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-06-01 09:55+0000\n" +"Last-Translator: cmsa \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:12+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 msgid "Sub Total" -msgstr "Sub Total" +msgstr "Sub-total" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -48,7 +48,7 @@ msgstr "Título" #. module: account_invoice_layout #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message msgid "Invoices with Layout and Message" -msgstr "Facturas com layout e mensagem" +msgstr "Facturas com Layout e Mensagem" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -84,7 +84,7 @@ msgstr "Preço Unitário" #. module: account_invoice_layout #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nome do modelo inválido na definição da acção." #. module: account_invoice_layout #: model:ir.model,name:account_invoice_layout.model_notify_message @@ -119,7 +119,7 @@ msgstr "Referençia do cliente:" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid ")" -msgstr "" +msgstr ")" #. module: account_invoice_layout #: field:account.invoice.line,state:0 @@ -134,7 +134,7 @@ msgstr "Preço" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "/ (" -msgstr "" +msgstr "/(" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -149,7 +149,7 @@ msgstr "Conta de Origem" #. module: account_invoice_layout #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form msgid "Write Messages" -msgstr "" +msgstr "Escrever mensagens" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -189,7 +189,7 @@ msgstr "Quebra de Página" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "Document:" -msgstr "" +msgstr "Documento:" #. module: account_invoice_layout #: wizard_view:wizard.notify_message,init:0 @@ -214,7 +214,7 @@ msgstr "Facturas com disposição" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "Description / Taxes" -msgstr "" +msgstr "Descrição / Impostos" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -224,7 +224,7 @@ msgstr "Montante" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "Description/Taxes" -msgstr "" +msgstr "Descrição/Impostos" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -264,7 +264,7 @@ msgstr "Factura do fornecedor" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "Note :" -msgstr "" +msgstr "Nota:" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -274,12 +274,12 @@ msgstr "Taxa" #. module: account_invoice_layout #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information msgid "account_invoice_layout" -msgstr "" +msgstr "account_invoice_layout" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid "Total (Excl. taxes):" -msgstr "" +msgstr "Total (Antes de Impostos):" #. module: account_invoice_layout #: rml:account.invoice.layout:0 diff --git a/addons/account_reporting/i18n/pt.po b/addons/account_reporting/i18n/pt.po index 03f50826416..9d810d497ad 100644 --- a/addons/account_reporting/i18n/pt.po +++ b/addons/account_reporting/i18n/pt.po @@ -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-11-28 23:58+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-06-01 09:52+0000\n" +"Last-Translator: cmsa \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:16+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting @@ -46,13 +46,13 @@ msgstr "Nota" #. module: account_reporting #: field:account.report.bs,report_type:0 msgid "Report Type" -msgstr "Tipo de relatório" +msgstr "Tipo de Relatório" #. module: account_reporting #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet msgid "Balance Sheet Report" -msgstr "Relatório do balancete" +msgstr "Relatório Balancete" #. module: account_reporting #: constraint:ir.actions.act_window:0 @@ -62,7 +62,7 @@ msgstr "Nome de modelo inválido na definição da acção" #. module: account_reporting #: selection:account.report.bs,font_style:0 msgid "Courier" -msgstr "Correio" +msgstr "Courier" #. module: account_reporting #: selection:account.report.bs,font_style:0 @@ -167,7 +167,7 @@ msgstr "Cores rml" #. module: account_reporting #: model:ir.module.module,shortdesc:account_reporting.module_meta_information msgid "Reporting of Balancesheet for accounting" -msgstr "" +msgstr "Relatório do balancete para a contabilidade." #. module: account_reporting #: field:account.report.bs,code:0 diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po index d8e269a7cb4..532b0ebee6d 100644 --- a/addons/analytic_journal_billing_rate/i18n/id.po +++ b/addons/analytic_journal_billing_rate/i18n/id.po @@ -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 diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po index 7c3ff6f08b5..92ab4f294b9 100644 --- a/addons/base_setup/i18n/id.po +++ b/addons/base_setup/i18n/id.po @@ -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 diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po index 4fb9b3a9d59..d6c15aa6451 100644 --- a/addons/base_vat/i18n/pt.po +++ b/addons/base_vat/i18n/pt.po @@ -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 \n" +"PO-Revision-Date: 2010-05-28 11:26+0000\n" +"Last-Translator: cmsa \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" diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po index d2766a3cc5c..6ceaf2a831a 100644 --- a/addons/board/i18n/pt.po +++ b/addons/board/i18n/pt.po @@ -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 13:29+0000\n" -"Last-Translator: Madalena_prime \n" +"PO-Revision-Date: 2010-06-01 10:02+0000\n" +"Last-Translator: cmsa \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-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board @@ -26,7 +26,7 @@ msgstr "" #. module: board #: model:ir.model,name:board.model_board_board msgid "board.board" -msgstr "" +msgstr "board.board" #. module: board #: field:board.note,user_id:0 @@ -36,7 +36,7 @@ msgstr "Autor" #. module: board #: model:ir.module.module,shortdesc:board.module_meta_information msgid "Dashboard main module" -msgstr "" +msgstr "Módulo Principal do Painel" #. module: board #: view:board.note:0 @@ -52,7 +52,7 @@ msgstr "Largura" #. module: board #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nome de modelo inválido na definição da aclção." #. module: board #: field:board.board.line,name:0 @@ -84,7 +84,7 @@ msgstr "Vista de acções" #. module: board #: model:ir.model,name:board.model_board_note msgid "board.note" -msgstr "" +msgstr "board.note" #. module: board #: field:board.note,date:0 @@ -124,7 +124,7 @@ msgstr "Notas" #. module: board #: model:ir.model,name:board.model_board_note_type msgid "board.note.type" -msgstr "" +msgstr "board.note.type" #. module: board #: view:board.board:0 @@ -136,7 +136,7 @@ msgstr "Painel" #. module: board #: model:ir.module.module,description:board.module_meta_information msgid "Base module for all dashboards." -msgstr "" +msgstr "Módulo base para todos os painéis." #. module: board #: field:board.board.line,position:0 @@ -212,7 +212,7 @@ msgstr "Vista de painel" #. module: board #: model:ir.model,name:board.model_board_board_line msgid "board.board.line" -msgstr "" +msgstr "board.board.line" #. module: board #: field:board.note,name:0 diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po index d0b526f542e..3efa06d3d90 100644 --- a/addons/crm/i18n/es.po +++ b/addons/crm/i18n/es.po @@ -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: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-05-17 23:03+0000\n" -"Last-Translator: Carlos Incaser \n" +"PO-Revision-Date: 2010-05-31 22:24+0000\n" +"Last-Translator: victor tejada yau \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-19 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -951,6 +951,8 @@ msgid "" "Category related to the section.Subdivide the CRM cases independently or " "section-wise." msgstr "" +"Categoria relacionada a la seccion. subdividido independientemente los casos " +"CRM o modo-seccion" #. module: crm #: field:crm.case.rule,act_state:0 @@ -1340,7 +1342,7 @@ msgstr "Calcular la segmentación" #. module: crm #: view:crm.lead:0 msgid "Lead Email" -msgstr "" +msgstr "Dirigir correo electronico" #. module: crm #: model:ir.actions.act_window,name:crm.crm_segmentation-act @@ -1563,6 +1565,8 @@ msgid "" "Helps you to organise the jobs hiring process: evaluation, meetings, email " "integration..." msgstr "" +"Te ayuda a organizar los procesos para emplear trabajos: evaluacion, " +"reunion, integracion de correo electronico" #. module: crm #: view:crm.fundraising:0 @@ -1619,7 +1623,7 @@ msgstr "Convertido" #: view:crm.lead:0 #: view:crm.opportunity:0 msgid "Reply to Last Email" -msgstr "" +msgstr "Responder el ultimo correo electronico" #. module: crm #: view:crm.segmentation:0 @@ -1629,7 +1633,7 @@ msgstr "Descripción de segmentación" #. module: crm #: help:crm.meeting,location:0 msgid "Gives Location of Meeting" -msgstr "" +msgstr "Dando la ubicacion de la reunion" #. module: crm #: view:crm.case:0 @@ -1644,7 +1648,7 @@ msgstr "Historial" #. module: crm #: model:ir.model,name:crm.model_crm_job msgid "Job Cases" -msgstr "" +msgstr "casos de trabajos" #. module: crm #: view:crm.job:0 @@ -1654,7 +1658,7 @@ msgstr "Trabajos - selección de personal" #. module: crm #: field:crm.case.rule,regex_name:0 msgid "Regular Expression on Case Name" -msgstr "" +msgstr "Expresion regular en nombre de caso" #. module: crm #: field:crm.case,state:0 @@ -1719,7 +1723,7 @@ msgstr "¡No se ha encontrado Email en la dirección de su compañía!" #. module: crm #: view:crm.fundraising:0 msgid "Search Funds" -msgstr "" +msgstr "buscar fondos" #. module: crm #: view:crm.claim:0 @@ -1729,7 +1733,7 @@ msgstr "Tipo de reclamación" #. module: crm #: view:crm.case:0 msgid "Helpdesk Support Tree" -msgstr "" +msgstr "Arbol de soporte tecnico" #. module: crm #: view:res.partner.events:0 @@ -1760,12 +1764,14 @@ msgstr "Referencia" #. module: crm #: field:crm.meeting,exrule:0 msgid "Exception Rule" -msgstr "" +msgstr "Exception de regla" #. module: crm #: help:crm.case.rule,act_mail_to_partner:0 msgid "Check this if you want the rule to send an email to the partner." msgstr "" +"Verifica esto si tu quieres enviar la norma en un correo electronico a el " +"socio" #. module: crm #: model:crm.case.category2,name:crm.category_lead2 @@ -1810,7 +1816,7 @@ msgstr "Importe de venta" #: view:crm.lead:0 #: view:crm.opportunity:0 msgid "Add a CC" -msgstr "" +msgstr "Agregar un CC" #. module: crm #: selection:crm.segmentation.line,expr_operator:0 @@ -1838,7 +1844,7 @@ msgstr "Alarma" #. module: crm #: field:crm.case.rule,act_mail_to_watchers:0 msgid "Mail to watchers (CC)" -msgstr "" +msgstr "correo a los observadores (CC)" #. module: crm #: view:crm.fundraising:0 @@ -1903,7 +1909,7 @@ msgstr "" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule msgid "Set RRULE" -msgstr "" +msgstr "Establecer RRULE" #. module: crm #: model:crm.case.stage,name:crm.stage_oppor4 @@ -1981,7 +1987,7 @@ msgstr "" #: code:addons/crm/crm.py:0 #, python-format msgid "Email Fail!" -msgstr "" +msgstr "Correo electronico fallo" #. module: crm #: model:crm.case.categ,name:crm.categ_phone1 diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po index f90c62ca5cc..a751a326814 100644 --- a/addons/crm/i18n/pt.po +++ b/addons/crm/i18n/pt.po @@ -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: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-01-22 23:56+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-06-01 14:21+0000\n" +"Last-Translator: cmsa \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:02+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -34,7 +34,7 @@ msgstr "" #: help:crm.case.rule,act_mail_to_user:0 msgid "" "Check this if you want the rule to send an email to the responsible person." -msgstr "" +msgstr "Marque isto se quer que a regra envie um email ao responsável." #. module: crm #: view:crm.meeting:0 @@ -57,7 +57,7 @@ msgstr "Fechar dica" #: view:crm.opportunity:0 #: view:crm.phonecall:0 msgid " 7 Days " -msgstr "" +msgstr " 7 Dias " #. module: crm #: help:crm.menu.config_wizard,helpdesk:0 @@ -67,7 +67,7 @@ msgstr "Gere um serviço de Helpdesk" #. module: crm #: view:crm.job:0 msgid "Pending Jobs" -msgstr "" +msgstr "Tarefas Pendentes" #. module: crm #: field:crm.case.rule,trg_state_to:0 @@ -82,7 +82,7 @@ msgstr "Custos previstos" #. module: crm #: wizard_field:crm.job.partner_create,init,close:0 msgid "Close job request" -msgstr "" +msgstr "Fechar tarefa requerida" #. module: crm #: field:crm.case.stage,name:0 @@ -191,6 +191,8 @@ msgid "" "Describes the action name.eg:on which object which ation to be taken on " "basis of which condition" msgstr "" +"Descreve o nome da acção . Ou seja, em que Objecto, que acção e em que " +"condições" #. module: crm #: help:crm.case,section_id:0 @@ -238,7 +240,7 @@ msgstr "Salário proposto" #. module: crm #: help:crm.case.section,sequence:0 msgid "Gives the sequence order when displaying a list of case sections." -msgstr "" +msgstr "Devolve a ordem de sequência quando apresenta as secções de opções" #. module: crm #: code:addons/crm/wizard/crm_job_wizard.py:0 @@ -3619,6 +3621,8 @@ msgstr "" msgid "" "Can not send mail with empty body,you should have description in the body" msgstr "" +"Não pode enviar um email sem corpo de texto, deve inserir texto no corpo do " +"email." #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 2c0fa8c8fc6..39806c50803 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -35,7 +35,7 @@ class crm_lead_report(osv.osv): _name = "crm.lead.report" _auto = False _description = "CRM Lead Report" - + def _get_data(self, cr, uid, ids, field_name, arg, context={}): """ @param cr: the current row, from the database cursor, @@ -89,7 +89,10 @@ class crm_lead_report(osv.osv): ('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), + 'email': fields.integer('# of Emails', size=128, readonly=True), + 'expected_closing_days': fields.integer('# of Expected Closing Days', size=128, readonly=True), + 'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), 'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'categ_id': fields.many2one('crm.case.categ', 'Category',\ domain="[('section_id','=',section_id),\ @@ -98,11 +101,10 @@ class crm_lead_report(osv.osv): domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.lead')]", readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), - 'company_id': fields.many2one('res.company', 'Company', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), - ],'Type', help="Type is used to separate Leads and Opportunities"), } def init(self, cr): @@ -132,13 +134,28 @@ class crm_lead_report(osv.osv): 0 as avg_answers, 0.0 as perc_done, 0.0 as perc_cancel, + (select count(id) from mailgate_message where thread_id=c.id) as email, date_trunc('day',c.create_date) as create_date, - avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close + sum(cast(to_char(date_trunc('day',c.date_open) - date_trunc('day',c.date_deadline),'DD') as int)) as expected_closing_days, + avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close, + avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as delay_open from crm_lead c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\ - c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id, c.type - ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD') + group by + to_char(c.create_date, 'YYYY'), + to_char(c.create_date, 'MM'), + c.state, + c.user_id, + c.id, + c.section_id, + c.stage_id, + categ_id, + c.partner_id, + c.company_id, + c.type, + c.create_date, + to_char(c.create_date, 'YYYY-MM-DD') + )""") crm_lead_report() diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index da480d21dc0..770d9292b6f 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -144,7 +144,7 @@ crm.lead.report tree - + @@ -153,7 +153,10 @@ - + + + + @@ -188,8 +191,8 @@ - - Opportunities + + Opportunities Analysis crm.lead.report form {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} @@ -216,7 +219,7 @@ groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_lead" /> - diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index bfdbe912fed..13706c7bb17 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -82,9 +82,9 @@ - | I can check that a lead and a business opportunity is now assigned to this lead. -- - # !python {model: crm.lead, id: crm_lead_newcustomer0}: - # - opportunity_id == False +#- +# !python {model: crm.lead, id: crm_lead_newcustomer0}: +# - opportunity_id == False - | I check that the partner associated to this lead as the same country, phone number @@ -97,10 +97,11 @@ opportunity = obj_opportunity.browse(cr, uid, ids)[0] assert lead.partner_name == opportunity.partner_id.name assert lead.phone == opportunity.phone -- - | - # yaml is also not working smpt server and send new email. - + +#- +# | +# yaml is also not working smpt server and send new email. + - | I configure with smtp server. - | @@ -113,4 +114,4 @@ - | I Reply to last Email to lead with some document attached.and check that communication history generated or not. - + diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po index 90a457d5732..eb95525ad0c 100644 --- a/addons/crm_profiling/i18n/pt.po +++ b/addons/crm_profiling/i18n/pt.po @@ -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 diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po new file mode 100644 index 00000000000..e8766d233f0 --- /dev/null +++ b/addons/hr_evaluation/i18n/id.po @@ -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 , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \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 \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: 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 "" diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po index eda0c0e6363..1f38bf9219a 100644 --- a/addons/hr_holidays/i18n/id.po +++ b/addons/hr_holidays/i18n/id.po @@ -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 \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 diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po index 190156f359b..1ecdb11dd08 100644 --- a/addons/idea/i18n/id.po +++ b/addons/idea/i18n/id.po @@ -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: 2009-11-09 17:47+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-06-01 01:00+0000\n" +"Last-Translator: Pandu Pradana \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:09+0000\n" +"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: idea @@ -27,7 +27,7 @@ msgstr "" #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Very Good" -msgstr "" +msgstr "Sangat Baik" #. module: idea #: view:idea.idea:0 @@ -39,7 +39,7 @@ msgstr "" #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea msgid "My Ideas" -msgstr "" +msgstr "Ide Saya" #. module: idea #: constraint:ir.actions.act_window:0 @@ -51,13 +51,13 @@ msgstr "" #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Not Voted" -msgstr "" +msgstr "Tidak Memberikan Suara" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my msgid "My Open Ideas" -msgstr "" +msgstr "Ide Terbuka Saya" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea @@ -69,18 +69,18 @@ msgstr "" #. module: idea #: field:idea.category,child_ids:0 msgid "Child Categories" -msgstr "" +msgstr "Kategori Anak" #. module: idea #: view:idea.idea:0 msgid "New Idea" -msgstr "" +msgstr "Ide Baru" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_category_tree #: model:ir.ui.menu,name:idea.menu_idea_category_tree msgid "Ideas by Categories" -msgstr "" +msgstr "Ide berdasar Kategori" #. module: idea #: field:idea.vote,score:0 @@ -101,7 +101,7 @@ msgstr "" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_vote_stat msgid "Statistics on Votes" -msgstr "" +msgstr "Statistik pada Voting" #. module: idea #: constraint:ir.model:0 @@ -112,17 +112,17 @@ msgstr "" #. module: idea #: model:ir.model,name:idea.model_idea_category msgid "Category for an idea" -msgstr "" +msgstr "Kategori untuk sebuah ide" #. module: idea #: model:ir.module.module,shortdesc:idea.module_meta_information msgid "Idea Manager" -msgstr "" +msgstr "Manager Ide" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_vote_stat msgid "Vote Statistics" -msgstr "" +msgstr "Statistik Voting" #. module: idea #: selection:idea.idea,state:0 @@ -161,12 +161,12 @@ msgstr "Pelaporan" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat msgid "Idea Votes Statistics" -msgstr "" +msgstr "Statistik Voting Ide" #. module: idea #: model:ir.model,name:idea.model_idea_vote msgid "idea.vote" -msgstr "" +msgstr "ide.voting" #. module: idea #: field:idea.comment,user_id:0 @@ -177,7 +177,7 @@ msgstr "" #. module: idea #: view:idea.idea:0 msgid "Your comment" -msgstr "" +msgstr "Komentar anda" #. module: idea #: model:ir.ui.menu,name:idea.menu_config @@ -193,12 +193,12 @@ msgstr "" #. module: idea #: view:idea.stat:0 msgid "stat" -msgstr "" +msgstr "stat" #. module: idea #: field:idea.idea,my_vote:0 msgid "My Vote" -msgstr "" +msgstr "Voting Saya" #. module: idea #: constraint:ir.ui.view:0 @@ -208,7 +208,7 @@ msgstr "" #. module: idea #: view:idea.vote:0 msgid "Votes" -msgstr "" +msgstr "Memilih" #. module: idea #: model:ir.module.module,description:idea.module_meta_information @@ -230,28 +230,28 @@ msgstr "" #. module: idea #: field:idea.idea,count_votes:0 msgid "Count of votes" -msgstr "" +msgstr "Jumlah voting" #. module: idea #: field:idea.vote.stat,nbr:0 msgid "Number of Votes" -msgstr "" +msgstr "Nomer Voting" #. module: idea #: model:ir.model,name:idea.model_idea_idea msgid "idea.idea" -msgstr "" +msgstr "ide.ide" #. module: idea #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my msgid "My Draft Ideas" -msgstr "" +msgstr "Draf ide saya" #. module: idea #: field:idea.idea,vote_ids:0 msgid "Vote" -msgstr "" +msgstr "Pemilihan" #. module: idea #: selection:idea.idea,my_vote:0 @@ -264,7 +264,7 @@ msgstr "" #: view:idea.idea:0 #: model:ir.ui.menu,name:idea.menu_idea_idea msgid "All Ideas" -msgstr "" +msgstr "Semua Ide" #. module: idea #: view:idea.comment:0 @@ -277,17 +277,17 @@ msgstr "" #. module: idea #: field:idea.idea,count_comments:0 msgid "Count of comments" -msgstr "" +msgstr "Jumlah komentar" #. module: idea #: field:idea.idea,title:0 msgid "Idea Summary" -msgstr "" +msgstr "Ringkasan Ide" #. module: idea #: view:idea.category:0 msgid "Category of ideas" -msgstr "" +msgstr "Kategori berdasarkan ide" #. module: idea #: field:idea.category,summary:0 @@ -299,7 +299,7 @@ msgstr "" #: model:ir.actions.act_window,name:idea.action_idea_idea_open #: model:ir.ui.menu,name:idea.menu_idea_idea_open msgid "Open Ideas" -msgstr "" +msgstr "Ide Terbuka" #. module: idea #: view:idea.idea:0 @@ -317,7 +317,7 @@ msgstr "" #. module: idea #: field:idea.category,parent_id:0 msgid "Parent Categories" -msgstr "" +msgstr "Kategori Induk" #. module: idea #: field:idea.idea,user_id:0 @@ -335,14 +335,14 @@ msgstr "" #: field:idea.vote,idea_id:0 #: field:idea.vote.stat,idea_id:0 msgid "Idea" -msgstr "" +msgstr "Ide" #. module: idea #: selection:idea.idea,my_vote:0 #: selection:idea.vote,score:0 #: selection:idea.vote.stat,score:0 msgid "Very Bad" -msgstr "" +msgstr "Sangat Buruk" #. module: idea #: selection:idea.idea,state:0 @@ -352,7 +352,7 @@ msgstr "" #. module: idea #: model:ir.ui.menu,name:idea.menu_idea_vote msgid "All Votes" -msgstr "" +msgstr "Semua Pemilihan" #. module: idea #: view:idea.idea:0 @@ -367,7 +367,7 @@ msgstr "" #. module: idea #: field:idea.idea,vote_avg:0 msgid "Average Score" -msgstr "" +msgstr "Skor Rata-rata" #. module: idea #: view:idea.idea:0 @@ -377,4 +377,4 @@ msgstr "" #. module: idea #: help:idea.idea,description:0 msgid "Content of the idea" -msgstr "" +msgstr "Isi ide" diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index 5a71051637d..fb4920e9632 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -31,7 +31,7 @@ class one2many_domain(fields.one2many): user=user, context=context) def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None): - if not context: + if context is None: context = {} res = {} msg_obj = obj.pool.get('mailgate.message') @@ -67,7 +67,7 @@ class mailgate_thread(osv.osv): @param details: Details of case history if any @param atach: Attachment sent in email @param context: A standard dictionary for contextual values""" - if not context: + if context is None: context = {} # The mailgate sends the ids of the cases and not the object list if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'): diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py index 2aefd8b3c11..c83787a6ef7 100644 --- a/addons/marketing/__init__.py +++ b/addons/marketing/__init__.py @@ -19,5 +19,7 @@ # ############################################################################## +import marketing_wizard + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index b920ce369fc..7a72f39c6eb 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -1,6 +1,52 @@ - - - \ No newline at end of file + + + + + marketing.installer.view + marketing.installer + form + + + +
+ Marketing Modules Installation +
+ + + Configure Your Marketing System + + + You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications + + + + + + + + + + + + + + Marketing Modules Installation + ir.actions.act_window + marketing.installer + + form + form + new + + + + + 3 + + + + \ No newline at end of file diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py new file mode 100644 index 00000000000..443fb09ed48 --- /dev/null +++ b/addons/marketing/marketing_wizard.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +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: diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py new file mode 100644 index 00000000000..0f354314327 --- /dev/null +++ b/addons/marketing_campaign_mailchimp/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +import marketing_campaign_mailchimp + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py new file mode 100644 index 00000000000..bd614607b97 --- /dev/null +++ b/addons/marketing_campaign_mailchimp/__openerp__.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + + +{ + "name" : "", + "version" : "1.1", + "depends" : ['marketing_campaign'], + "author" : "Tiny", + "category": 'Generic Modules/Marketing', + "description": """ + """, + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'update_xml': [ + 'marketing_campaign_mailchimp_view.xml', + ], + 'demo_xml': [], + 'installable': True, + 'active': False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py new file mode 100644 index 00000000000..a1c3162cee2 --- /dev/null +++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py @@ -0,0 +1,131 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +from osv import fields, osv + +import urllib2 +import simplejson as json + +mailchimp_url = 'http://%s.api.mailchimp.com/1.2' + +class marketing_campaign_mailchimp_account(osv.osv): #{{{ + _name = "marketing.campaign.mailchimp.account" + + _columns = { + 'name': fields.char('Account Name', size=64), + 'username': fields.char('Username', size=64, required=True), + 'password': fields.char('Password', size=64, required=True), + 'apikey': fields.char('API Key', size=128), + 'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'), + ('uk1', 'UK1')], 'Data Center'), + 'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'), + ('cancelled', 'Cancelled')], 'State', readonly=True) + } + + _defaults = { + 'state': lambda *a: 'draft' + } + + def get_response(self, cr, uid, mailchimp_id, method, params={}): + mailchimp_account = self.browse(cr, uid, mailchimp_id) + params['output'] = 'json' + if method == 'login': + params['username'] = mailchimp_account.username + params['password'] = mailchimp_account.password + else : + params['apikey'] = mailchimp_account.apikey + params = '&'.join(map(lambda x : '%s=%s' %(x, params[x]), params)) + url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method + req = urllib2.Request(url, params) + handle = urllib2.urlopen(req) + response = json.loads(handle.read()) + return response + + def button_approve(self, cr, uid, ids, context): + acc_obj = self.browse(cr, uid, ids)[0] + vals = {} + if not acc_obj.apikey: + method = 'login' + else: + method = 'ping' + response = self.get_response(cr, uid, acc_obj.id, method) + if 'error' not in response: + if method == 'login' : + vals['apikey'] = response + vals['state'] = 'approved' + self.write(cr, uid, ids, vals) + else : + raise osv.except_osv('Error!!!', + "Can't approved accoutnt : %s"%response['error']) + return True + + def button_cancel(self, cr, uid, ids, context): + self.write(cr, uid, ids, {'state': 'cancelled'}) + return True + +marketing_campaign_mailchimp_account() #}}} + +#class marketing_campaign_mailchimp_list(osv.osv_memory): #{{{ +# _name = "marketing.campaign.mailchimp.list" +# +# _columns = { +# 'name': fields.char('Name', size=64), +# 'mailchimp_account_id': fields.many2one('marketing.campaign.mailchimp.account', 'Account'), +# 'list_id': fields.char('List Id', size=64,), +# } +# +# _defaults = { +# 'state': lambda *a: 'draft' +# } +# +#marketing_campaign_mailchimp_list() #}}} + +class marketing_campaign_segment(osv.osv): #{{{ + _inherit = "marketing.campaign.segment" + + _columns = { + 'synchro': fields.boolean('Mailchimp Synchro'), + 'mailchimp_account_id': fields.many2one( + 'marketing.campaign.mailchimp.account', 'Account'), + 'mailchimp_list': fields.char('List', size=64), + } + + def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id): + if mailchimp_account_id: + return {'value':{'mailchimp_list':''}} + return {'value':{}} + + def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id, + mailchimp_list): + if mailchimp_account_id and mailchimp_list: + lists = self.pool.get('marketing.campaign.mailchimp.account').get_response(cr, + uid, mailchimp_account_id, 'lists') + list_names = [list['name'] for list in lists] + if mailchimp_list not in list_names: + raise osv.except_osv('Error!!!',"Lists doesn't exists") + else : + return {} + return {'value':{}} +marketing_campaign_segment() #}}} + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml new file mode 100644 index 00000000000..7a84f17311d --- /dev/null +++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml @@ -0,0 +1,86 @@ + + + + + + + + marketing.campaign.segment.form.inherit + marketing.campaign.segment + form + + + + + + + + + + + + + + + + + + + + + marketing.campaign.mailchimp.account.tree + marketing.campaign.mailchimp.account + tree + + + + + + + + + + + + marketing.campaign.mailchimp.account.form + marketing.campaign.mailchimp.account + form + +
+ + + + + + + + + +