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 c52095f7cc1..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-04-10 14:34+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-04-11 04:14+0000\n" +"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -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 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_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po index 6de93149132..0f23f6fa8f1 100644 --- a/addons/account_analytic_plans/i18n/ko.po +++ b/addons/account_analytic_plans/i18n/ko.po @@ -8,13 +8,13 @@ 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-09-08 14:29+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-15 00:46+0000\n" +"Last-Translator: Bundo \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -106,7 +106,7 @@ msgstr "배분 코드" #. module: account_analytic_plans #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에서 유효하지 않은 모델 이름" #. module: account_analytic_plans #: field:account.analytic.plan.line,name:0 @@ -116,7 +116,7 @@ msgstr "플랜 이름" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Printing date" -msgstr "" +msgstr "인쇄 날짜" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -147,7 +147,7 @@ msgstr "분석 저널" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "100.00%" -msgstr "" +msgstr "100.00%" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,ref:0 @@ -157,7 +157,7 @@ msgstr "분석 계정 참조" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Analytic Account :" -msgstr "" +msgstr "분석 계정:" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po index f712ef2ba23..ebf998adadc 100644 --- a/addons/analytic_user_function/i18n/ko.po +++ b/addons/analytic_user_function/i18n/ko.po @@ -8,13 +8,13 @@ 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-09-08 16:01+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-15 01:01+0000\n" +"Last-Translator: Bundo \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n" +"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function @@ -35,7 +35,7 @@ msgstr "상품" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "분석 계정" #. module: analytic_user_function #: view:account.analytic.account:0 @@ -57,7 +57,7 @@ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포 #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information msgid "Analytic User Function" -msgstr "" +msgstr "사용자 함수 분석" #. module: analytic_user_function #: view:analytic_user_funct_grid:0 diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po index bfc391d95ef..81ce4a131d3 100644 --- a/addons/base_contact/i18n/ru.po +++ b/addons/base_contact/i18n/ru.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-16 13:34+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-13 07:22+0000\n" +"Last-Translator: grisha \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:59+0000\n" +"X-Launchpad-Export-Date: 2010-04-14 03:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -266,7 +266,7 @@ msgstr "" #. module: base_contact #: field:res.partner.contact,partner_id:0 msgid "Main Employer" -msgstr "" +msgstr "Основной работодатель" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_functiontoaddress0 @@ -286,7 +286,7 @@ msgstr "Контакт партнера" #. module: base_contact #: model:process.node,name:base_contact.process_node_partners0 msgid "Partners" -msgstr "" +msgstr "Контрагенты" #. module: base_contact #: model:process.node,name:base_contact.process_node_addresses0 diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml index f235c9ae637..d2d78d78b54 100644 --- a/addons/crm/crm_claims_menu.xml +++ b/addons/crm/crm_claims_menu.xml @@ -13,7 +13,7 @@ form tree,calendar,form,graph - {"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1} + {"search_default_section_id":section_id,"search_default_Current":1,"search_default_My Claims":1} diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml index c7409006d78..326da6c8973 100644 --- a/addons/crm/crm_claims_view.xml +++ b/addons/crm/crm_claims_view.xml @@ -245,7 +245,7 @@ search - @@ -263,7 +263,7 @@ - crm.fundraising tree,form,graph - {"search_default_my_funds":1,"search_default_section_id":section_id} + {"search_default_My Funds":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml index 8d315c14a6d..c72fd810603 100644 --- a/addons/crm/crm_fund_view.xml +++ b/addons/crm/crm_fund_view.xml @@ -252,7 +252,7 @@ diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml index b1a7dfcc428..21ff93c91ec 100644 --- a/addons/crm/crm_helpdesk_menu.xml +++ b/addons/crm/crm_helpdesk_menu.xml @@ -11,7 +11,7 @@ crm.helpdesk tree,calendar,form - {"search_default_my_hd_request":1,"search_default_section_id":section_id} + {"search_default_My Request":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml index bea0c3a894c..fc731ae30e7 100644 --- a/addons/crm/crm_helpdesk_view.xml +++ b/addons/crm/crm_helpdesk_view.xml @@ -104,7 +104,7 @@ - + @@ -223,7 +223,7 @@ - diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 8e34bca3118..eb8c09008fc 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -7,8 +7,7 @@ crm.lead tree,form - {"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id} - {"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id} + {"search_default_Current":1,"search_default_My Lead":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 9dad22dba81..d93e5f94562 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -45,8 +45,8 @@ name="convert_opportunity" string="Convert" help="Convert into Opportunity" - icon="gtk-index" - type="object" + icon="gtk-index" + type="object" attrs="{'invisible':[('opportunity_id','!=',False)]}"/> search - crm.meeting calendar,tree,form,gantt - {"search_default_current":1,"search_default_section_id":section_id} + {"search_default_Current":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index b01beb55342..b350812c0f9 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -259,9 +259,9 @@ - + diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml index ba01ca72be4..c7fba068c11 100644 --- a/addons/crm/crm_opportunity_menu.xml +++ b/addons/crm/crm_opportunity_menu.xml @@ -27,7 +27,7 @@ crm.opportunity tree,form,graph - {"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id} + {"search_default_My Oprtnit":1,"search_default_Current":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 92b09919791..e0e53f4cd8c 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -281,7 +281,7 @@ - form tree,calendar - {"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id} + {"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_section_id":section_id} @@ -55,7 +55,7 @@ tree,calendar - {"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id} + {"default_state":'open',"search_default_My Calls":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 064d3569d03..3fefc7ed249 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -161,6 +161,7 @@ search + - + @@ -189,6 +190,7 @@ domain="[('section_id','=',context.get('section_id',False))]" help="My section" /> + \n" +"PO-Revision-Date: 2010-04-14 15:48+0000\n" +"Last-Translator: Olivier Dony (OpenERP) \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-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -1753,7 +1753,7 @@ msgstr "Planifier un appel téléphonique" #. module: crm #: field:crm.case,ref:0 msgid "Reference" -msgstr "" +msgstr "Référence" #. module: crm #: field:crm.meeting,exrule:0 @@ -2408,6 +2408,8 @@ msgstr "Historique" msgid "" "This may help associations in their fund raising process and tracking." msgstr "" +"Ceci peut aider les associations dans leur procédure de collecte de fonds et " +"de suivi." #. module: crm #: view:crm.meeting:0 diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index 8e11ab2c781..95a32c5f7b8 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-12 19:39+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-13 03:34+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,11 +107,13 @@ 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 msgid "Human Resources" -msgstr "" +msgstr "Zasoby ludzkie" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2 @@ -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 @@ -225,7 +237,7 @@ msgstr "" #. module: crm #: view:crm.job:0 msgid "Proposed Salary" -msgstr "" +msgstr "Proponowane wynagrodzenie" #. module: crm #: help:crm.case.section,sequence:0 @@ -238,7 +250,7 @@ msgstr "" #: model:crm.case.categ,name:crm.categ_meet3 #, python-format msgid "Phone Call" -msgstr "" +msgstr "Rozmowa telefoniczna" #. module: crm #: model:ir.model,name:crm.model_report_crm_case_section_stage @@ -268,7 +280,7 @@ msgstr "Specjalne słowa kluczowe do zastosowania w treści" #: view:crm.lead:0 #: view:crm.opportunity:0 msgid "Send New Email" -msgstr "" +msgstr "Wyślij nową wiadomość" #. module: crm #: view:crm.case.history:0 @@ -290,6 +302,7 @@ msgstr "Sekcje" #: help:crm.menu.config_wizard,opportunity:0 msgid "Tracks identified business opportunities for your sales pipeline." msgstr "" +"Ścieżki zidentyfikowanych okazji biznesowych dla twoich kanałów sprzedaży." #. module: crm #: view:crm.meeting:0 @@ -309,12 +322,12 @@ msgstr "" #. module: crm #: model:crm.case.stage,name:crm.stage_job3 msgid "Second Interview" -msgstr "" +msgstr "Druga rozmowa kwalifikacyjna" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe msgid "Subscribe to a Remote calendar" -msgstr "" +msgstr "Zapisz się do zdalnego kalendarza" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ-act @@ -341,12 +354,12 @@ msgstr "Daty" #. module: crm #: view:crm.segmentation:0 msgid "Segmentation Test" -msgstr "" +msgstr "Test Segmentacji" #. module: crm #: model:process.transition,name:crm.process_transition_leadpartner0 msgid "Prospect Partner" -msgstr "" +msgstr "Potencjalny partner" #. module: crm #: view:crm.fundraising:0 @@ -363,7 +376,7 @@ msgstr "" #: selection:crm.lead.opportunity_set,create_partner,action:0 #: selection:crm.phonecall.opportunity_set,create_partner,action:0 msgid "Link to an existing partner" -msgstr "" +msgstr "Połączenie do istniejącego partnera" #. module: crm #: field:crm.case.rule,trg_date_range_type:0 diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po index d20e5a714a1..73b90ba5b58 100644 --- a/addons/crm/i18n/ru.po +++ b/addons/crm/i18n/ru.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: 2009-12-16 08:44+0000\n" -"Last-Translator: Casufi \n" +"PO-Revision-Date: 2010-04-14 03:53+0000\n" +"Last-Translator: grisha \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-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -107,7 +107,7 @@ msgstr "" #. module: crm #: model:ir.ui.menu,name:crm.menu_hr msgid "Human Resources" -msgstr "" +msgstr "Кадры" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2 @@ -129,7 +129,7 @@ msgstr "" #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 msgid "Normal or phone meeting for opportunity" -msgstr "" +msgstr "Обычное или селекторное совещание по поводу" #. module: crm #: model:crm.case.stage,name:crm.stage_claim2 @@ -144,7 +144,7 @@ msgstr "" #: code:addons/crm/wizard/crm_phonecall_wizard.py:0 #, python-format msgid "Warning !" -msgstr "" +msgstr "Внимание!" #. module: crm #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0 @@ -172,7 +172,7 @@ msgstr "" #: wizard_field:crm.job.meeting_set,init,duration:0 #: wizard_field:crm.phonecall.meeting_set,init,duration:0 msgid "Duration (Hours)" -msgstr "" +msgstr "Длительность(в часах)" #. module: crm #: selection:crm.meeting,transparent:0 diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml index 465fab740a6..9be2c7c538e 100644 --- a/addons/crm/report/crm_claim_report_view.xml +++ b/addons/crm/report/crm_claim_report_view.xml @@ -83,7 +83,7 @@ form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1} diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml index fbc56e6202e..38068a7b16c 100644 --- a/addons/crm/report/crm_fundraising_report_view.xml +++ b/addons/crm/report/crm_fundraising_report_view.xml @@ -80,7 +80,7 @@ form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1} diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 58d69699404..9ce910329bf 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -79,7 +79,7 @@ crm.lead.report form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1} diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml index 3ee8498fb3a..b19115f6739 100644 --- a/addons/crm/report/crm_opportunity_report_view.xml +++ b/addons/crm/report/crm_opportunity_report_view.xml @@ -88,7 +88,7 @@ crm.opportunity.report form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1} diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index a78d94977f8..a4fc0f0097f 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -77,7 +77,7 @@ form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1} diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml index 3cd8b518b5d..a0f03a24210 100644 --- a/addons/crm/report/crm_report_view.xml +++ b/addons/crm/report/crm_report_view.xml @@ -64,12 +64,10 @@ + domain="[('name','=',time.localtime()[0])]" /> + domain="[('month','=',time.strftime('%%m'))]" /> + domain="[]" context="{'group_by':'user_id'}" /> crm.case.report form tree,graph - {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1} + {"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1} diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py index 1417aa71ddf..497f1014eb9 100755 --- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py @@ -67,9 +67,9 @@ def html2plaintext(html, body_id=None, encoding='utf-8'): soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding) for link in soup.findAll('a'): - title = link.renderContents() + title = unicode(link) for url in [x[1] for x in link.attrs if x[0]=='href']: - urls.append(dict(url=url, tag=str(link), title=title)) + urls.append(dict(url=url, tag=unicode(link), title=title)) html = unicode(soup) @@ -162,12 +162,9 @@ class email_parser(object): if charset: try: return s.decode(charset) - except UnicodeError: - pass - try: - return s.decode('ascii') - except UnicodeError: - return s + except UnicodeError: + pass + return s.decode('latin1') def _decode_header(self, s): from email.Header import decode_header diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po index b3dd9d94ad9..f20ce697c8b 100644 --- a/addons/crm_profiling/i18n/ko.po +++ b/addons/crm_profiling/i18n/ko.po @@ -8,20 +8,20 @@ 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-09-08 16:32+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-15 00:44+0000\n" +"Last-Translator: Bundo \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n" +"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !" #. module: crm_profiling #: field:crm_profiling.answer,question_id:0 @@ -43,12 +43,12 @@ msgstr "자식 프로파일" #. module: crm_profiling #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information msgid "crm_profiling management" -msgstr "" +msgstr "crm 프로파일링 관리자(_P)" #. module: crm_profiling #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에서 유효하지 않은 모델 이름" #. module: crm_profiling #: field:crm_profiling.answer,name:0 @@ -91,7 +91,7 @@ msgstr "질의서 이용" #. module: crm_profiling #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "유효하지 않은 아키텍처를 위한 XML 보기!" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po index 14d92c430a7..37d8559ee92 100644 --- a/addons/document/i18n/ru.po +++ b/addons/document/i18n/ru.po @@ -7,24 +7,24 @@ 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-02-04 06:28+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-13 05:32+0000\n" +"Last-Translator: grisha \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:15+0000\n" +"X-Launchpad-Export-Date: 2010-04-14 03:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document #: field:document.directory,create_date:0 msgid "Date Created" -msgstr "" +msgstr "Дата создания" #. module: document #: field:document.directory,ressource_id:0 msgid "Resource ID" -msgstr "" +msgstr "ID объекта" #. module: document #: field:document.directory.content,include_name:0 @@ -47,7 +47,7 @@ msgstr "" #. module: document #: constraint:document.directory:0 msgid "Error! You can not create recursive Directories." -msgstr "" +msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории." #. module: document #: model:ir.ui.menu,name:document.menu_document_configuration @@ -57,7 +57,7 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "Preview" -msgstr "" +msgstr "Предпросмотр" #. module: document #: field:ir.attachment,store_method:0 @@ -72,7 +72,7 @@ msgstr "" #. module: document #: field:ir.attachment,file_size:0 msgid "File Size" -msgstr "" +msgstr "Размер файла" #. module: document #: help:document.directory.content,include_name:0 diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po index fede2d3c76e..e05c410e032 100644 --- a/addons/hr/i18n/ko.po +++ b/addons/hr/i18n/ko.po @@ -8,13 +8,13 @@ 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-09-08 13:55+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-15 00:59+0000\n" +"Last-Translator: Bundo \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -58,7 +58,7 @@ msgstr "페어런트" #. module: hr #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에 잘못된 모델 이름이 있습니다." #. module: hr #: view:hr.department:0 diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po index 880cdcb9dce..2b1083ae695 100644 --- a/addons/hr/i18n/ru.po +++ b/addons/hr/i18n/ru.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-10 14:44+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2010-04-13 07:40+0000\n" +"Last-Translator: grisha \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:12+0000\n" +"X-Launchpad-Export-Date: 2010-04-14 03:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -36,7 +36,7 @@ msgstr "Ошибка! Невозможно создать рекурсивные #. module: hr #: field:hr.employee,sinid:0 msgid "SIN No" -msgstr "" +msgstr "Карта социальной защиты(ИНН)" #. module: hr #: model:ir.module.module,shortdesc:hr.module_meta_information @@ -57,7 +57,7 @@ msgstr "" #. module: hr #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия" #. module: hr #: view:hr.department:0 @@ -67,7 +67,7 @@ msgstr "Отдел" #. module: hr #: model:process.transition,name:hr.process_transition_contactofemployee0 msgid "Contact of employee" -msgstr "" +msgstr "Контакты сотрудника" #. module: hr #: field:hr.employee,work_email:0 @@ -93,7 +93,7 @@ msgstr "Пятница" #. module: hr #: field:hr.department,parent_id:0 msgid "Parent Department" -msgstr "" +msgstr "Вышестоящее подразделение" #. module: hr #: view:hr.department:0 @@ -110,7 +110,7 @@ msgstr "Работа с" #. module: hr #: model:ir.actions.act_window,name:hr.action2 msgid "Employee Hierarchy" -msgstr "" +msgstr "Структура подчинения (сотрудников)" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_configuration @@ -141,7 +141,7 @@ msgstr "Структура сотрудников" #. module: hr #: view:hr.employee:0 msgid "Social IDs" -msgstr "" +msgstr "Страховое удостоверение" #. module: hr #: field:hr.employee,work_phone:0 @@ -189,12 +189,12 @@ msgstr "Участники" #. module: hr #: field:hr.employee,ssnid:0 msgid "SSN No" -msgstr "" +msgstr "Карта социальной защиты (ИНН)" #. module: hr #: model:process.transition,note:hr.process_transition_contactofemployee0 msgid "Fill up contact information" -msgstr "" +msgstr "Заполните контактную информацию" #. module: hr #: constraint:ir.ui.view:0 @@ -222,7 +222,7 @@ msgstr "Отделы" #. module: hr #: model:process.node,name:hr.process_node_employeecontact0 msgid "Employee Contact" -msgstr "" +msgstr "Контакты сотрудника" #. module: hr #: selection:hr.employee,marital:0 @@ -242,7 +242,7 @@ msgstr "Мужской" #. module: hr #: model:process.transition,note:hr.process_transition_employeeuser0 msgid "Create openerp user" -msgstr "" +msgstr "Создать пользователя OpenERP" #. module: hr #: view:hr.employee.category:0 @@ -305,7 +305,7 @@ msgstr "День недели" #. module: hr #: field:hr.employee,birthday:0 msgid "Birthday" -msgstr "" +msgstr "Дата рождения" #. module: hr #: field:hr.employee,active:0 @@ -325,7 +325,7 @@ msgstr "" #. module: hr #: model:process.node,note:hr.process_node_openerpuser0 msgid "Create OpenERP User" -msgstr "" +msgstr "Создать пользователя OpenERP" #. module: hr #: model:process.node,note:hr.process_node_employee0 @@ -361,7 +361,7 @@ msgstr "" #. module: hr #: field:hr.employee,address_id:0 msgid "Working Address" -msgstr "" +msgstr "Рабочий адрес" #. module: hr #: field:hr.employee,marital:0 @@ -416,7 +416,7 @@ msgstr "Категории сотрудников" #. module: hr #: field:hr.employee,address_home_id:0 msgid "Home Address" -msgstr "" +msgstr "Домашний адрес" #. module: hr #: view:hr.department:0 @@ -458,7 +458,7 @@ msgstr "Название отдела" #. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" -msgstr "" +msgstr "Подчиненные подразделения" #. module: hr #: view:hr.employee:0 @@ -468,7 +468,7 @@ msgstr "" #. module: hr #: model:process.node,note:hr.process_node_employeecontact0 msgid "Fill up employee's contact information" -msgstr "" +msgstr "Заполните контактную информацию о сотруднике" #. module: hr #: field:hr.department,manager_id:0 @@ -480,7 +480,7 @@ msgstr "Менеджер" #: model:ir.actions.act_window,name:hr.open_view_employee_list_my #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my msgid "All Employees" -msgstr "" +msgstr "Все сотрудники" #. module: hr #: selection:hr.timesheet,dayofweek:0 diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index fcd4f9d4bf1..8af9a48b50c 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -311,9 +311,9 @@ - + - + @@ -329,7 +329,7 @@ form tree,form [('is_evaluation' ,'=', True)] - {"search_default_todo":1,"search_default_my":1} + {"search_default_To Do":1,"search_default_My":1} diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 855f40633d0..7b18fa14996 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -148,7 +148,7 @@ Expenses hr.expense.expense form - {"search_default_my_expns":1} + {"search_default_My Expns":1} diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 2f9a0afb29c..7a3c9b25d18 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -56,8 +56,7 @@ - @@ -71,7 +70,7 @@ - + @@ -90,7 +89,7 @@ hr.expense.report form tree,graph - {"search_default_expenses":1,"search_default_by_user":1} + {"search_default_Expenses":1,"search_default_User":1} diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index bbf32cf0501..88011aa817c 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -9,7 +9,7 @@ hr.applicant tree,form,graph - {"search_default_current":1,"search_default_my_recrui":1} + {"search_default_Current":1,"search_default_My Recrui":1} diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index c31b58f74be..96f8718bf9a 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -202,7 +202,7 @@ - @@ -224,7 +224,7 @@ - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 286499e0ae8..2b8c451949c 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -39,6 +39,7 @@ search + + - + @@ -76,10 +78,9 @@ string="Excellent" domain="[('priority','=','1')]"/> - - - + + @@ -100,7 +101,7 @@ hr.recruitment.report form tree,graph - {"search_default_user_id":1,"search_default_by_user":1} + {"search_default_User":1} 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 @@