diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 889f5b746b8..21e7c708e8f 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.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-04-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 197a6988060..f06d1d557c4 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/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: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-08 18:04+0000\n" -"Last-Translator: Hilario J. Montoliu (hjmf) \n" +"PO-Revision-Date: 2010-04-11 21:46+0000\n" +"Last-Translator: Juan Eduardo Riva \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-03-30 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -4531,7 +4531,7 @@ msgstr "¿Está seguro que desea abrir esta factura?" #. module: account #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other msgid "Partner Other Ledger" -msgstr "" +msgstr "Asociar Otro Libro Mayor" #. module: account #: view:res.partner:0 diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index b6de147aaae..a172b900b51 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-02-20 16:07+0000\n" +"PO-Revision-Date: 2010-04-11 12:31+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-03-30 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -187,7 +187,7 @@ msgstr "Plan kont" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select msgid "Move line select" -msgstr "" +msgstr "Wybór pozycji zapisów" #. module: account #: rml:account.journal.period.print:0 @@ -217,7 +217,7 @@ msgstr "Oblicz kod (jeśli typ = kod)" #: view:account.move:0 #: view:account.move.line:0 msgid "Account Entry Line" -msgstr "Pozycja zapisu na koncie" +msgstr "Pozycje zapisów" #. module: account #: wizard_view:account.aged.trial.balance,init:0 @@ -533,7 +533,7 @@ msgstr "Uzgodnij zapłacone" #. module: account #: wizard_field:account.chart,init,target_move:0 msgid "Target Moves" -msgstr "" +msgstr "Zapisy docelowe" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -776,7 +776,7 @@ msgstr "Płatność częściowa" #. module: account #: wizard_view:account_use_models,create:0 msgid "Move Lines Created." -msgstr "Utworzono pozycje zmian." +msgstr "Utworzono pozycje zapisów." #. module: account #: field:account.fiscalyear,state:0 @@ -823,7 +823,7 @@ msgstr "(Pozostaw puste dla wszystkich otwartych lat podatkowych)" #. module: account #: field:account.invoice,move_lines:0 msgid "Move Lines" -msgstr "Pozycje zmian" +msgstr "Pozycje zapisów" #. module: account #: model:ir.model,name:account.model_account_config_wizard @@ -1562,7 +1562,7 @@ msgstr "Szablony planu kont" #. module: account #: field:account.invoice,move_id:0 msgid "Invoice Movement" -msgstr "" +msgstr "Zapisy faktury" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart @@ -1808,7 +1808,7 @@ msgstr "Procentowo" #. module: account #: model:ir.ui.menu,name:account.menu_finance_charts msgid "Charts" -msgstr "Wykresy" +msgstr "Plany kont" #. module: account #: selection:account.analytic.journal,type:0 @@ -2051,9 +2051,9 @@ msgid "" "'draft' state and instead goes directly to the 'posted state' without any " "manual validation." msgstr "" -"Zaznacz to pole, jeśli nie chcesz aby nowe zmiany stanu konta przechodziły " -"przez stan 'projekt' i zamiast tego od razu wchodziły w stan 'zaksięgowane' " -"bez żadnego ręcznego zatwierdzania." +"Zaznacz to pole, jeśli nie chcesz aby nowe zapisy konta przechodziły przez " +"stan 'projekt' i zamiast tego od razu wchodziły w stan 'zaksięgowane' bez " +"żadnego ręcznego zatwierdzania." #. module: account #: field:account.bank.statement.line,partner_id:0 @@ -2114,7 +2114,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line #: model:ir.ui.menu,name:account.menu_validate_account_moves msgid "Validate Account Moves" -msgstr "Zatwierdź zmiany konta" +msgstr "Zatwierdź zapisy konta" #. module: account #: selection:account.subscription,period_type:0 @@ -2415,7 +2415,7 @@ msgstr "Konto podatkowe" #. module: account #: field:account.analytic.line,move_id:0 msgid "Move Line" -msgstr "Przesuń pozycję" +msgstr "Pozycja zapisu" #. module: account #: field:account.bank.accounts.wizard,acc_no:0 @@ -2868,7 +2868,7 @@ msgstr "ID partnera" #: wizard_view:account.invoice.pay,addendum:0 #: wizard_view:account.move.line.reconcile,addendum:0 msgid "Write-Off Move" -msgstr "Zmiana odpisu" +msgstr "Zapis odpisu" #. module: account #: view:account.move.line:0 @@ -3072,7 +3072,7 @@ msgstr "Dokument" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "Zmiana tej pozycji zapisu" +msgstr "Zapis dla tej pozycji." #. module: account #: field:account.invoice.line,uos_id:0 @@ -3240,8 +3240,7 @@ msgstr "Uwagi" msgid "" "The account moves of the invoice have been reconciled with account moves of " "the payment(s)." -msgstr "" -"Zmiany konta dla faktury zostały uzgodnione ze zmianami konta płatności." +msgstr "Zapisy konta dla faktury zostały uzgodnione ze zapisami płatności." #. module: account #: rml:account.invoice:0 @@ -3357,7 +3356,7 @@ msgstr "Nie drukowane na fakturze" #. module: account #: field:account.move.line,move_id:0 msgid "Move" -msgstr "Zmiana stanu" +msgstr "Zapis" #. module: account #: field:account.fiscal.position.tax,tax_src_id:0 @@ -4080,7 +4079,7 @@ msgstr "Kody podrzędne" #. module: account #: field:account.invoice,move_name:0 msgid "Account Move" -msgstr "Zmiana stanu konta" +msgstr "Zapis konta" #. module: account #: view:account.bank.statement:0 @@ -4650,7 +4649,7 @@ msgstr "Wyciąg" #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move #: model:ir.ui.menu,name:account.menu_encode_entries_by_move msgid "Entries Encoding by Move" -msgstr "Wprowadzanie zapisów przez zmianę stanu" +msgstr "Zapisy" #. module: account #: wizard_view:account.analytic.account.chart,init:0 @@ -5042,7 +5041,7 @@ msgstr "Opis podatku" #. module: account #: help:account.invoice,move_id:0 msgid "Link to the automatically generated account moves." -msgstr "Łącznik do automatycznie wygenerowanych zmian stanu konta." +msgstr "Łącznik do automatycznie wygenerowanych zapisów konta." #. module: account #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0 @@ -5111,7 +5110,7 @@ msgstr "Konto dochodu w szablonie produktu" #: help:account.account,currency_id:0 #: help:account.account.template,currency_id:0 msgid "Force all moves for this account to have this secondary currency." -msgstr "Wymuś, aby wszystkie zmiany tego konta miały tę dodatkową walutę." +msgstr "Wymuś, aby wszystkie zapisy tego konta miały tę dodatkową walutę." #. module: account #: wizard_button:populate_statement_from_inv,go,end:0 @@ -5605,7 +5604,7 @@ msgstr "Zamknięte" #. module: account #: field:account.bank.statement.line,move_ids:0 msgid "Moves" -msgstr "Zmiany stanu" +msgstr "Zapisy" #. module: account #: selection:account.invoice,state:0 diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po index f40bcc9fadc..8e21ed1b5b3 100644 --- a/addons/account_analytic_analysis/i18n/zh_CN.po +++ b/addons/account_analytic_analysis/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-03-19 10:22+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2010-04-10 04:39+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-03-30 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-04-11 04:14+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -52,12 +52,12 @@ msgstr "所有辅助核算项目" #: 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 "我当前的项目" +msgstr "我的当前科目" #. module: account_analytic_analysis #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "无效XML视图结构!" +msgstr "描述视图结构的XML文件无效" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 @@ -72,12 +72,12 @@ msgstr "理论收入" #. module: account_analytic_analysis #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "在这动作定义中有无效的模块名" +msgstr "在动作定义中输入的对象名称错误" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theorial Revenue - Total Costs" -msgstr "计算公式为:收入 - 总成本" +msgstr "计算公式：理论收入 - 总费用" #. module: account_analytic_analysis #: constraint:ir.model:0 @@ -89,7 +89,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new msgid "New Analytic Account" -msgstr "新的辅助核算项目" +msgstr "新的分析科目" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 @@ -105,7 +105,7 @@ msgstr "实际利润(%)" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open msgid "Current Analytic Accounts" -msgstr "当前辅助核算项目" +msgstr "当前分析科目" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po index 3d23107d0a8..e7291033c21 100644 --- a/addons/account_analytic_plans/i18n/es.po +++ b/addons/account_analytic_plans/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: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-24 07:14+0000\n" -"Last-Translator: Paco Molinero \n" +"PO-Revision-Date: 2010-04-11 21:48+0000\n" +"Last-Translator: Juan Eduardo Riva \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-03-30 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -303,7 +303,7 @@ msgstr "Líneas de plan analítico" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Crossovered Analytic -" -msgstr "" +msgstr "Analítico Entrecruzado -" #. module: account_analytic_plans #: field:account.analytic.plan.instance,plan_id:0 diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po index b460151e6d5..ce8514c3b82 100644 --- a/addons/account_tax_include/i18n/de.po +++ b/addons/account_tax_include/i18n/de.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-17 09:23+0000\n" -"Last-Translator: Ferdinand-chricar \n" +"PO-Revision-Date: 2010-04-09 13:20+0000\n" +"Last-Translator: Ferdinand @ ChriCar \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-03-30 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-04-10 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_tax_include @@ -49,4 +49,4 @@ msgstr "Berechnungsgrundlage (inkl. Steuer)" #. module: account_tax_include #: field:account.invoice.line,price_subtotal_incl:0 msgid "Subtotal" -msgstr "Zwischenbetrag" +msgstr "Zwischensumme" diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po index d501f883291..3dbe761e96b 100644 --- a/addons/base_module_quality/i18n/it.po +++ b/addons/base_module_quality/i18n/it.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:43+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-09 18:42+0000\n" +"Last-Translator: Frankenstein \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n" +"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality #: field:module.quality.check,final_score:0 msgid "Final Score (%)" -msgstr "" +msgstr "Punteggio Finale (%)" #. module: base_module_quality #: constraint:ir.model:0 @@ -71,6 +71,8 @@ msgid "" "Some tests are more critical than others, so they have a bigger weight in " "the computation of final rating" msgstr "" +"Alcuni test sono più cruciali di altri, quindi avranno un peso maggiore nel " +"calcolo del punteggio finale" #. module: base_module_quality #: view:module.quality.check:0 diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po index 421b6550250..20f97693f3f 100644 --- a/addons/base_setup/i18n/fa.po +++ b/addons/base_setup/i18n/fa.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-04-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-04-10 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py old mode 100755 new mode 100644 diff --git a/addons/crm/crm_claims_data.xml b/addons/crm/crm_claims_data.xml old mode 100755 new mode 100644 diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm/crm_claims_demo.xml old mode 100755 new mode 100644 diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml old mode 100755 new mode 100644 diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml old mode 100755 new mode 100644 diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml old mode 100755 new mode 100644 diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index 8e11ab2c781..ab7cfd04213 100644 --- a/addons/crm/i18n/pl.po +++ b/addons/crm/i18n/pl.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: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-01-27 18:25+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n" +"PO-Revision-Date: 2010-04-11 11:53+0000\n" +"Last-Translator: drygal \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-03-30 03:58+0000\n" +"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm #: field:crm.email.add.cc,name:0 msgid "Send to" -msgstr "" +msgstr "Wyślij do" #. module: crm #: help:crm.meeting,exdate:0 @@ -27,12 +27,16 @@ msgid "" "This property defines the list of date/time exceptions for " "arecurring calendar component." msgstr "" +"Ta cecha definiuje listę wyjątków daty/czasu dla powtarzanych elementów " +"kalendarza." #. module: crm #: 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 "" +"Zaznacz to jeżeli chcesz aby przez regułę został wysłany email do " +"odpowiedzialnej osoby." #. module: crm #: view:crm.meeting:0 @@ -47,7 +51,7 @@ msgstr "" #. module: crm #: wizard_field:crm.lead.partner_create,init,close:0 msgid "Close Lead" -msgstr "" +msgstr "Zamknij ślad" #. module: crm #: view:crm.job:0 @@ -55,7 +59,7 @@ msgstr "" #: view:crm.opportunity:0 #: view:crm.phonecall:0 msgid " 7 Days " -msgstr "" +msgstr " 7 Dni " #. module: crm #: help:crm.menu.config_wizard,helpdesk:0 @@ -65,7 +69,7 @@ msgstr "" #. module: crm #: view:crm.job:0 msgid "Pending Jobs" -msgstr "" +msgstr "Zadania Oczekujące" #. module: crm #: field:crm.case.rule,trg_state_to:0 @@ -80,7 +84,7 @@ msgstr "Planowane koszty" #. module: crm #: wizard_field:crm.job.partner_create,init,close:0 msgid "Close job request" -msgstr "" +msgstr "Żądanie zakończenia zadania." #. module: crm #: field:crm.case.stage,name:0 @@ -103,6 +107,8 @@ msgid "" "The partner category that will be added to partners that match the " "segmentation criterions after computation." msgstr "" +"Kategoria partnera, która zostanie dodana do partnerów spełniających " +"kryteria segmentacji po obliczeniach." #. module: crm #: model:ir.ui.menu,name:crm.menu_hr @@ -120,11 +126,13 @@ msgid "" "Manages the supplier and customers claims, including your corrective or " "preventive actions." msgstr "" +"Zarządza skargami dostawców i klientów, wliczając twoje działania naprawcze " +"i prewencyjne." #. module: crm #: view:crm.fundraising:0 msgid "Amount" -msgstr "" +msgstr "Ilość" #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 @@ -150,29 +158,29 @@ msgstr "Ostrzeżenie !" #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0 #, python-format msgid "Please specify user's email address !" -msgstr "" +msgstr "Proszę podać adres email użytkownika!" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 msgid "Campaign" -msgstr "" +msgstr "Kampania" #. module: crm #: view:crm.opportunity:0 msgid "Search Opportunities" -msgstr "" +msgstr "Szukaj w Okazjach" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree #: view:report.crm.case.section.stage:0 msgid "Cases by Section and Stage" -msgstr "" +msgstr "Przypadki w Sekcjach i Etapach" #. module: crm #: wizard_field:crm.job.meeting_set,init,duration:0 #: wizard_field:crm.phonecall.meeting_set,init,duration:0 msgid "Duration (Hours)" -msgstr "" +msgstr "Długość trwania (godziny)" #. module: crm #: selection:crm.meeting,transparent:0 @@ -185,6 +193,8 @@ msgid "" "Describes the action name.eg:on which object which ation to be taken on " "basis of which condition" msgstr "" +"Opisuje nazwę działania, np. na których obiektach jakie będzie działanie na " +"podstawie jakich warunków." #. module: crm #: help:crm.case,section_id:0 @@ -192,6 +202,8 @@ msgid "" "Section to which Case belongs to. Define Responsible user and Email account " "for mail gateway." msgstr "" +"Sekcja do której należy Przypadek. Zdefiniuj odpowiedzialnego użytkownika " +"oraz konto Email dla bramy pocztowej." #. module: crm #: view:crm.case:0 diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py index 2768e333a2a..1417aa71ddf 100755 --- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py @@ -71,7 +71,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'): for url in [x[1] for x in link.attrs if x[0]=='href']: urls.append(dict(url=url, tag=str(link), title=title)) - html = soup.__str__() + html = unicode(soup) url_index = [] i = 0 diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 590c1a9ad83..7f16f55dce8 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -315,36 +315,9 @@ class hr_evaluation_interview(osv.osv): context = {} record = self.browse(cr, uid, ids, context) record = record and record[0] - datas = {} - page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1} - report = {} - if record: - datas['ids'] = [record.survey_id.id] - response_id = record.response.id - if response_id: - context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0}) - datas['form'] = page_setting - datas['model'] = 'survey.print.answer' - report = { - 'type': 'ir.actions.report.xml', - 'report_name': 'survey.browse.response', - 'datas': datas, - 'nodestroy': True, - 'context' : context - } - else: - datas['form'] = page_setting - datas['model'] = 'survey.print' - report = { - 'type': 'ir.actions.report.xml', - 'report_name': 'survey.form', - 'datas': datas, - 'nodestroy':True, - 'context' : context - } - return report - - + context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,}) + value = self.pool.get("survey").action_print_survey(cr, uid, ids, context) + return value hr_evaluation_interview() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1 diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 255eb8c4523..696e3aa1fc2 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -311,9 +311,10 @@ - + + - + @@ -329,7 +330,7 @@ form tree,form [('is_evaluation' ,'=', True)] - {"search_default_to_wait":1, "search_default_my_user":1} + {"search_default_todo":1,"search_default_my":1} diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po index 64d318c5163..449bd7e727d 100644 --- a/addons/hr_expense/i18n/de.po +++ b/addons/hr_expense/i18n/de.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-22 19:07+0000\n" +"PO-Revision-Date: 2010-04-09 12:59+0000\n" "Last-Translator: Ferdinand @ ChriCar \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-03-30 04:10+0000\n" +"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense @@ -508,7 +508,7 @@ msgstr "Der Vorgesetzte akzeptiert die Ausgabenliste" #. module: hr_expense #: field:hr.expense.line,sequence:0 msgid "Sequence" -msgstr "Sequenzer" +msgstr "Sequenz" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_confirmexpense0 @@ -524,7 +524,7 @@ msgstr "Spesenerfassung" #. module: hr_expense #: field:hr.expense.line,total_amount:0 msgid "Total" -msgstr "Betrag gesammt" +msgstr "Betrag gesamt" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_reinvoicing0 diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index fca0455e18a..8cb7dd0924b 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -163,36 +163,12 @@ class hr_applicant(osv.osv): """ if not context: context = {} - datas = {} + record = self.browse(cr, uid, ids, context) record = record and record[0] - page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1} - report = {} - if record: - datas['ids'] = [record.survey.id] - response_id = record.response - if response_id: - context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0,}) - datas['form'] = page_setting - datas['model'] = 'survey.print.answer' - report = { - 'type': 'ir.actions.report.xml', - 'report_name': 'survey.browse.response', - 'datas': datas, - 'nodestroy': True, - 'context' : context - } - else: - datas['form'] = page_setting - datas['model'] = 'survey.print' - report = { - 'type': 'ir.actions.report.xml', - 'report_name': 'survey.form', - 'datas': datas, - 'nodestroy':True, - 'context' : context - } - return report + context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0,}) + value = self.pool.get("survey").action_print_survey(cr, uid, ids, context) + return value hr_applicant() @@ -203,4 +179,4 @@ class hr_job(osv.osv): 'survey_id': fields.many2one('survey', 'Survey'), } -hr_job() \ No newline at end of file +hr_job() diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index b2d5a405ee8..e11815a7234 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -6466,9 +6466,20 @@ 44 - Services intra-communautaires + Services intra-communautaires et ABC + + 44a + Services intra-communautaires + + + + 44b + ABC intra-communautaires + + + 45 Operations avec TVA due par le cocontractant @@ -7053,14 +7064,25 @@ - TVA 0% Intracommunautaire (Services et ABC) + TVA 0% Services Intracommunautaires V-INTRA-S 0 percent - + sale + + + TVA 0% ABC Intracommunautaire + V-INTRA-ABC 0 + + percent + + + sale + + diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py index 049a625830b..118e0ee3d26 100644 --- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py @@ -37,6 +37,18 @@ class vat_listing_clients(osv.osv_memory): 'amount': fields.float('Amount'), 'turnover': fields.float('Turnover'), } + def name_get(self, cr, uid, ids, context={}): + if not len(ids): + return [] + return [(r['id'], r['name'] + ' - ' + r['vat']) \ + for r in self.read(cr, uid, ids, ['name', 'vat'], + context, load='_classic_write')] + + def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): + client = self.search(cr, uid, [('vat', '=', name)]+args, limit=limit, context=context) + if not client: + client = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context) + return self.name_get(cr, uid, client, context=context) vat_listing_clients() @@ -225,4 +237,4 @@ class partner_vat_list(osv.osv_memory): partner_vat_list() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py index a82175a59ee..be261bd1366 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py @@ -56,7 +56,9 @@ class l10n_be_vat_declaration(osv.osv_memory): user_cmpny = obj_company.name vat_no=obj_company.partner_id.vat if not vat_no: - raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) +# raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) + osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!')) + tax_code_ids = obj_tax_code.search(cr, uid, [], context=context) ctx = context.copy() @@ -65,7 +67,7 @@ class l10n_be_vat_declaration(osv.osv_memory): tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx) address = post_code = city = country_code = '' - city, post_code, address, country_code = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address) + city, post_code, address, country_code =self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address) year_id = obj_fyear.find(cr, uid) @@ -77,7 +79,7 @@ class l10n_be_vat_declaration(osv.osv_memory): data_of_file='\n' data_of_file +='\n\t\n\t\t'+str(vat_no)+'\n\t\t'+str(obj_company.name)+'\n\t\t
'+address+'
' data_of_file +='\n\t\t'+post_code+'\n\t\t'+city+'\n\t\t'+country_code+'\n\t\t'+send_ref+'\n\t' - data_of_file +='\n\t\n\t\t1\n\t\t'+str(vat_no[2:])+'\n\t\t\n\t\t\t' + data_of_file +='\n\t\n\t\t1\n\t\t'+((vat_no and str(vat_no[2:])) or '')+'\n\t\t\n\t\t\t' starting_month = account_period.date_start[5:7] ending_month = account_period.date_stop[5:7] @@ -89,7 +91,7 @@ class l10n_be_vat_declaration(osv.osv_memory): else: data_of_file += ''+starting_month+'\n\t\t\t' data_of_file += '' + str(account_period.date_stop[:4]) + '\n\t\t\n\t\t' - data_of_file += '\n\t\t'+ (data['form']['client_nihil'] and 'YES' or 'NO') +'' + data_of_file += '\n\t\t'+ (data['client_nihil'] and 'YES' or 'NO') +'' data_of_file +='\n\t\t\n\t\t\t' for item in tax_info: diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index d7869a7c197..bb74665480d 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -20,6 +20,7 @@ ############################################################################## import time import base64 +from tools.translate import _ from osv import osv, fields @@ -34,14 +35,18 @@ class partner_vat_intra(osv.osv_memory): return obj_country.search(cursor, user, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])]) _columns = { - 'trimester': fields.selection( [('1','Jan/Feb/Mar'), - ('2','Apr/May/Jun'), - ('3','Jul/Aug/Sep'), - ('4','Oct/Nov/Dec')], - 'Trimester Number', required=True, help="It will be the first digit of period"), + 'period_code': fields.char('Period Code',size = 6,required = True, help = '''This is where you have to set the period code for the intracom declaration using the format: ppyyyy + PP can stand for a month: from '01' to '12'. + PP can stand for a trimester: '31','32','33','34' + The first figure means that it is a trimester, + The second figure identify the trimester. + PP can stand for a complete fiscal year: '00'. + YYYY stands for the year (4 positions). + ''' + ), + 'period_ids': fields.many2many('account.period', 'account_period_rel', 'acc_id', 'period_id', 'Period (s)', help = 'Select here the period(s) you want to include in your intracom declaration'), 'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"), 'mand_id' : fields.char('MandataireId', size=14, required=True, help="This identifies the representative of the sending company. This is a string of 14 characters"), - 'fyear': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True), 'msg': fields.text('File created', size=64, readonly=True), 'file_save' : fields.binary('Save File', readonly=True), 'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'), @@ -60,19 +65,16 @@ class partner_vat_intra(osv.osv_memory): data_cmpny = obj_user.browse(cursor, user, user).company_id data = self.read(cursor, user, ids)[0] - data_fiscal = obj_fyear.browse(cursor, user, data['fyear'], context=context) - company_vat = data_cmpny.partner_id.vat if not company_vat: raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) seq_controlref = obj_sequence.get(cursor, user, 'controlref') seq_declarantnum = obj_sequence.get(cursor, user, 'declarantnum') - cref = company_vat + seq_controlref - dnum = cref + seq_declarantnum - if len(data_fiscal.date_start.split('-')[0]) < 4: - raise osv.except_osv(_('Data Insufficient'),_('Trimester year should be length of 4 digits!')) - period_trimester = data['trimester'] + data_fiscal.date_start.split('-')[0] + cref = company_vat[2:] + seq_controlref[-4:] + dnum = cref + seq_declarantnum[-5:] + if len(data['form']['period_code']) != 6: + raise wizard.except_wizard(_('Wrong Period Code'), _('The period code you entered is not valid.')) street = zip_city = country = '' addr = obj_partner.address_get(cursor, user, [data_cmpny.partner_id.id], ['invoice']) @@ -92,15 +94,11 @@ class partner_vat_intra(osv.osv_memory): sender_date = time.strftime('%Y-%m-%d') data_file = '\n\n\t\t\t'+str(data_cmpny.name)+'\n\t\t\t'+ str(street) +'\n\t\t\t'+ str(zip_city) +'' data_file +='\n\t\t\t' + str(country) +'\n\t\t\n\t' - - data_comp ='\n\t\t\n\t\t\t'+str(company_vat)+'\n\t\t\t'+str(data_cmpny.name)+'\n\t\t\t'+ str(street) +'\n\t\t\t'+ str(zip_city) +'\n\t\t\t'+ str(country) +'\n\t\t' - data_period = '\n\t\t'+ str(period_trimester) +'' #trimester - + data_comp ='\n\t\t\n\t\t\t'+str(company_vat[2:])+'\n\t\t\t'+str(data_cmpny.name)+'\n\t\t\t'+ str(street) +'\n\t\t\t'+ str(zip_city) +'\n\t\t\t'+ str(country) +'\n\t\t' + data_period = '\n\t\t'+ data['period_code'] +'' #trimester error_message = [] seq = 0 amount_sum = 0 @@ -110,85 +108,23 @@ class partner_vat_intra(osv.osv_memory): nb_period = len(data_fiscal.period_ids) fiscal_periods = data_fiscal.period_ids - - if data['trimester'] == '1': - if nb_period == 12: - start_date = fiscal_periods[0].date_start - end_date = fiscal_periods[2].date_stop - elif nb_period == 4: - start_date = fiscal_periods[0].date_start - end_date = fiscal_periods[0].date_stop - elif data['trimester'] == '2': - if nb_period == 12: - start_date = fiscal_periods[3].date_start - end_date = fiscal_periods[5].date_stop - elif nb_period == 4: - start_date = fiscal_periods[1].date_start - end_date = fiscal_periods[1].date_stop - elif data['trimester'] == '3': - if nb_period == 12: - start_date = fiscal_periods[6].date_start - end_date = fiscal_periods[8].date_stop - elif nb_period == 4: - start_date = fiscal_periods[2].date_start - end_date = fiscal_periods[2].date_stop - elif data['trimester'] == '4': - if nb_period == 12: - start_date = fiscal_periods[9].date_start - end_date = fiscal_periods[11].date_stop - elif nb_period == 4: - start_date = fiscal_periods[3].date_start - end_date = fiscal_periods[3].date_stop - - period = "to_date('" + str(start_date) + "','yyyy-mm-dd') and to_date('" + str(end_date) +"','yyyy-mm-dd')" - record = {} - - for p_id in p_id_list: - list_partner = [] - partner = obj_partner.browse(cursor, user, p_id, context=context) - go_ahead = False - country_code = '' - for ads in partner.address: - if ads.type == 'default' and (ads.country_id and ads.country_id.id in data['country_ids']): - go_ahead = True - country_code = ads.country_id.code - break - if not go_ahead: - continue - - cursor.execute('select sum(debit)-sum(credit) as amount from account_move_line l left join account_account a on (l.account_id=a.id) where a.type in ('"'receivable'"') and l.partner_id=%%s and l.date between %s' % (period,), (p_id,)) - res = cursor.dictfetchall() - list_partner.append(res[0]['amount']) - list_partner.append('T') #partner.ref ...should be check - list_partner.append(partner.vat) - list_partner.append(country_code) - #...deprecated... -# addr = pool.get('res.partner').address_get(cr, uid, [partner.id], ['invoice']) -# if addr.get('invoice',False): -# ads = pool.get('res.partner.address').browse(cr,uid,[addr['invoice']])[0] -# -# if ads.country_id: -# code_country = ads.country_id.code -# list_partner.append(code_country) -# else: -# error_message.append('Data Insufficient! : '+ 'The Partner "'+partner.name + '"'' has no country associated with its Invoice address!') -# if len(list_partner)<4: -# list_partner.append('') -# error_message.append('Data Insufficient! : '+ 'The Partner "'+partner.name + '"'' has no Invoice address!') -# list_partner.append(code_country or 'not avail') - record[p_id] = list_partner - - if len(error_message): - data['msg'] = 'Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message) - return data['msg'] + list_partner = [] data_clientinfo = '' + cr.execute('''SELECT l.partner_id AS partner_id, p.vat AS vat, t.code AS intra_code, SUM(l.tax_amount) AS amount + FROM account_move_line l + LEFT JOIN account_tax_code t ON (l.tax_code_id = t.id) + LEFT JOIN res_partner p ON (l.partner_id = p.id) + WHERE t.code IN ('44a','44b','88') + AND l.period_id IN %s + GROUP BY l.partner_id, p.vat, t.code''', (tuple(data['form']['period_ids'][0][2]), )) + for row in cr.dictfetchall(): - for r in record: seq += 1 - amt = record[r][0] or 0 + amt = row['amount'] or 0 amt = int(amt * 100) amount_sum += amt - data_clientinfo +='\n\t\t\n\t\t\t\n\t\t\t\t'+record[r][2] +'\n\t\t\t\t'+record[r][3] +'\n\t\t\t\n\t\t\t'+str(amt) +'\n\t\t\t'+str(period_trimester) +'\n\t\t\t'+str(record[r][1]) +'\n\t\t' + intra_code = row['intra_code'] == '88' and 'L' or (row['intra_code'] == '44b' and 'T' or (row['intra_code'] == '44a' and 'S' or '')) + data_clientinfo +='\n\t\t\n\t\t\t\n\t\t\t\t'+row['vat'][2:] +'\n\t\t\t\t'+row['vat'][:2] +'\n\t\t\t\n\t\t\t'+str(amt) +'\n\t\t\t'+str(intra_code) +'\n\t\t' amount_sum = int(amount_sum) data_decl = '\n\t' data_file += str(data_decl) + str(data_comp) + str(data_period) + str(data_clientinfo) + '\n\t\n' @@ -199,4 +135,4 @@ class partner_vat_intra(osv.osv_memory): partner_vat_intra() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml index 8e5025c058e..f67123aed0c 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml @@ -18,12 +18,11 @@