From 9f0fdbdc528dc6371c29fc03f7dfd8b6115de9be Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 2 Apr 2010 14:19:26 +0530 Subject: [PATCH 1/6] [Fix] trml2pdf: set the Heading tag name bzr revid: sbh@tinyerp.com-20100402084926-vys4yshlxk5yx42z --- bin/report/render/rml2pdf/trml2pdf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 0574f563c90..fa1595e13a4 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -636,9 +636,9 @@ class _rml_flowable(object): styles = reportlab.lib.styles.getSampleStyleSheet() style = styles['Title'] return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'}))) - elif re.match('^h([1-9]+[0-9]*)$', (node.text or '')): + elif re.match('^h([1-9]+[0-9]*)$', (node.tag or '')): styles = reportlab.lib.styles.getSampleStyleSheet() - style = styles['Heading'+str(node.get[1:])] + style = styles['Heading'+str(node.tag[1:])] return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'}))) elif node.tag=='image': if not node.get('file'): From 32d41097f6f7a5b8750f24ceb834653b4877fce1 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 2 Apr 2010 18:19:05 +0530 Subject: [PATCH 2/6] [FIX] Fields.function of type integer with multi attribute behaviour improved bzr revid: jvo@tinyerp.com-20100402124905-oqofyis9c7rr6fng --- bin/osv/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index edf78156dcc..980b3ad67c6 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -699,7 +699,11 @@ class function(_column): if self._type == "integer": for r in res.keys(): # Converting value into string so that it does not affect XML-RPC Limits - res[r] = str(res[r]) + if isinstance(res[r],dict): # To treat integer values with _multi attribute + for record in res[r].keys(): + res[r][record] = str(res[r][record]) + else: + res[r] = str(res[r]) return res get_memory = get From 4f09c9ffa5ef1c45b8480d17fe4af72f74f6edcd Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 2 Apr 2010 14:53:18 +0200 Subject: [PATCH 3/6] bugfix bzr revid: fp@tinyerp.com-20100402125318-nqv5jeytlqf62q1j --- bin/osv/orm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 430745deaa0..92fb7f9400b 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1879,7 +1879,8 @@ class orm(orm_template): def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None): groupby_list = groupby - groupby = groupby[0] + if isinstance(groupby, list): + groupby = groupby[0] context = context or {} self.pool.get('ir.model.access').check(cr, uid, self._name, 'read', context=context) if not fields: From 60c9ef812af254af5fdfcbed62256c26ade2a9c5 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Sun, 4 Apr 2010 04:52:50 +0100 Subject: [PATCH 4/6] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100403035450-1a0crehvyycoac7u bzr revid: codehost@crowberry-20100404035250-4v739eu3p7xs13kr --- addons/account/i18n/cs.po | 2 +- addons/account/i18n/de.po | 4 +-- addons/account/i18n/ru.po | 18 +++++------ addons/base_contact/i18n/ko.po | 32 +++++++++---------- addons/crm/i18n/fi.po | 52 +++++++++++++++---------------- addons/report_purchase/i18n/ko.po | 8 ++--- addons/sale/i18n/bg.po | 2 +- addons/scrum/i18n/ko.po | 38 +++++++++++----------- 8 files changed, 79 insertions(+), 77 deletions(-) diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index cdaf9f2aad9..faff571118c 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-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 67e71fd81a4..deca642f62a 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/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: 2010-04-01 17:22+0000\n" +"PO-Revision-Date: 2010-04-02 07:16+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-04-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index de27f983cc7..abc9d069167 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/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: 2010-03-02 15:44+0000\n" -"Last-Translator: Nikolay Chesnokov \n" +"PO-Revision-Date: 2010-04-03 16:42+0000\n" +"Last-Translator: Alexandr Mitev \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-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -323,7 +323,7 @@ msgstr "Происхождение" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "Имя перемещения" #. module: account #: xsl:account.transfer:0 @@ -355,7 +355,7 @@ msgstr "Налог" #. module: account #: rml:account.general.journal:0 msgid "Debit Trans." -msgstr "" +msgstr "Дебитовая сделка" #. module: account #: field:account.analytic.line,account_id:0 @@ -608,7 +608,7 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "" +msgstr "Контроль проводки" #. module: account #: help:account.model.line,sequence:0 @@ -642,7 +642,7 @@ msgstr "Условия платежа партнера" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "" +msgstr "Согласование проводки по счету" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 @@ -734,7 +734,7 @@ msgstr "Строки финансового документа" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 msgid "Analytic Invoice" -msgstr "" +msgstr "Аналитический счет" #. module: account #: field:account.journal.column,field:0 @@ -981,7 +981,7 @@ msgstr "Проводки по выражениям" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 msgid "analytic Invoice" -msgstr "" +msgstr "aналитический счет" #. module: account #: wizard_field:account.automatic.reconcile,init,period_id:0 diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po index 08a837a039c..c9788ecc136 100644 --- a/addons/base_contact/i18n/ko.po +++ b/addons/base_contact/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:58+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-04 03:13+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 03:59+0000\n" +"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -31,7 +31,7 @@ msgstr "" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !" #. module: base_contact #: field:res.partner.job,function_id:0 @@ -81,12 +81,12 @@ msgstr "" #. module: base_contact #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에서 유효하지 않은 모델 이름" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 msgid "Partner to address" -msgstr "" +msgstr "파트너 주소" #. module: base_contact #: view:res.partner.address:0 @@ -126,7 +126,7 @@ msgstr "연락처와 기능 정의" #. module: base_contact #: field:res.partner.contact,title:0 msgid "Title" -msgstr "타이틀" +msgstr "제목" #. module: base_contact #: view:res.partner.job:0 @@ -189,12 +189,12 @@ msgstr "주업" #. module: base_contact #: view:res.partner:0 msgid "Categories" -msgstr "카테고리" +msgstr "항목" #. module: base_contact #: field:res.partner.contact,function_id:0 msgid "Main Function" -msgstr "" +msgstr "주요 기능" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 @@ -204,7 +204,7 @@ msgstr "파트너와 주소 정의" #. module: base_contact #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "유효하지 않은 아키텍처를 위한 XML 보기!" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 @@ -219,17 +219,17 @@ msgstr "시퀀스" #. module: base_contact #: field:res.partner.job,extension:0 msgid "Extension" -msgstr "익스텐션" +msgstr "확장기능" #. module: base_contact #: field:res.partner.contact,mobile:0 msgid "Mobile" -msgstr "모바일" +msgstr "휴대전화" #. module: base_contact #: help:res.partner.job,extension:0 msgid "Internal/External extension phone number" -msgstr "내부/외부 익스텐션 전화 번호" +msgstr "내부/외부 확장 전화 번호" #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 @@ -239,7 +239,7 @@ msgstr "함께 일하는 사람들" #. module: base_contact #: view:res.partner.contact:0 msgid "Extra Information" -msgstr "기타 정보" +msgstr "추가 정보" #. module: base_contact #: view:res.partner.contact:0 @@ -255,7 +255,7 @@ msgstr "활성" #. module: base_contact #: field:res.partner.job,contact_id:0 msgid "Contact" -msgstr "연락" +msgstr "연락처" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 @@ -270,7 +270,7 @@ msgstr "주 고용자" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_functiontoaddress0 msgid "Function to address" -msgstr "" +msgstr "기능 주소" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po index 0c83df25abc..f8617b8ea6b 100644 --- a/addons/crm/i18n/fi.po +++ b/addons/crm/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-04-01 15:06+0000\n" +"PO-Revision-Date: 2010-04-03 13:35+0000\n" "Last-Translator: smii \n" "Language-Team: Finnish \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-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -2950,12 +2950,12 @@ msgstr "" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund4 msgid "Demand Draft" -msgstr "" +msgstr "Vaatimusluonnos" #. module: crm #: field:crm.case,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: crm #: field:crm.case,log_ids:0 @@ -2966,7 +2966,7 @@ msgstr "Lokihistoriat" #: wizard_field:crm.lead.opportunity_set,opportunity,name:0 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0 msgid "Opportunity Summary" -msgstr "" +msgstr "Mahdollisuuksien yhteenveto" #. module: crm #: view:crm.case:0 @@ -2997,22 +2997,22 @@ msgstr "Viimeisin tapahtuma" #. module: crm #: field:crm.case,duration:0 msgid "Duration" -msgstr "" +msgstr "Kesto" #. module: crm #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage msgid "Cases by section, Category and stage" -msgstr "" +msgstr "Tapahtumat osion, kategorian ja vaiheen mukaan" #. module: crm #: view:crm.job:0 msgid "Candidate Hired" -msgstr "" +msgstr "Ehdokas palkattu" #. module: crm #: field:crm.menu.config_wizard,jobs:0 msgid "Jobs Hiring Process" -msgstr "" +msgstr "Rekrytointiprosessi" #. module: crm #: model:ir.ui.menu,name:crm.next_id_52 @@ -3052,12 +3052,12 @@ msgstr "" #: view:crm.segmentation:0 #: field:crm.segmentation.line,segmentation_id:0 msgid "Segmentation" -msgstr "" +msgstr "Segmentointi" #. module: crm #: view:crm.fundraising:0 msgid "Funds Form" -msgstr "" +msgstr "Varat -lomake" #. module: crm #: view:crm.meeting:0 @@ -3073,12 +3073,12 @@ msgstr "" #. module: crm #: field:crm.case,company_id:0 msgid "Company" -msgstr "" +msgstr "Yritys" #. module: crm #: model:crm.case.stage,name:crm.stage_lead3 msgid "In Process" -msgstr "" +msgstr "Työn alla" #. module: crm #: selection:crm.segmentation,state:0 @@ -3094,18 +3094,18 @@ msgstr "" #: wizard_field:crm.job.reschedule_phone_call,init,note:0 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0 msgid "Goals" -msgstr "" +msgstr "Tavoitteet" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree #: view:report.crm.case.section.categ2:0 msgid "Cases by Section and Type" -msgstr "" +msgstr "Tapahtumat osion ja tyypin mukaan" #. module: crm #: model:ir.ui.menu,name:crm.menu_aftersale msgid "After-Sale Services" -msgstr "" +msgstr "Jälkimyyntipalvelut" #. module: crm #: wizard_button:caldav.crm.export,init,end:0 @@ -3113,12 +3113,12 @@ msgstr "" #: wizard_button:caldav.crm.subscribe,display,end:0 #: view:crm.email.add.cc:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: crm #: wizard_field:caldav.crm.export,init,name:0 msgid "File name" -msgstr "" +msgstr "Tiedostonimi" #. module: crm #: view:crm.lead:0 @@ -3148,7 +3148,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job msgid "All Jobs Requests" -msgstr "" +msgstr "Kaikki työpaikkapyynnöt" #. module: crm #: selection:crm.case,state:0 @@ -3160,7 +3160,7 @@ msgstr "" #: selection:report.crm.case.section.categ2,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Cancelled" -msgstr "" +msgstr "Peruutettu" #. module: crm #: view:crm.job:0 @@ -3177,7 +3177,7 @@ msgstr "" #. module: crm #: view:crm.phonecall:0 msgid "Relevant" -msgstr "" +msgstr "Oleellinen" #. module: crm #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0 @@ -3192,7 +3192,7 @@ msgstr "" #. module: crm #: wizard_view:caldav.crm.import,init:0 msgid "Import ICS" -msgstr "" +msgstr "Tuo ICS-tiedosto" #. module: crm #: view:crm.phonecall:0 @@ -3212,7 +3212,7 @@ msgstr "Kommunikaatio Historia" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ msgid "Cases by Opportunities and Type" -msgstr "" +msgstr "Tapahtumat mahdollisuuden ja tyypin mukaan" #. module: crm #: view:crm.case.rule:0 @@ -3256,7 +3256,7 @@ msgstr "" #. module: crm #: model:crm.case.stage,name:crm.stage_lead1 msgid "New" -msgstr "" +msgstr "Uusi" #. module: crm #: field:crm.case,description:0 @@ -3275,7 +3275,7 @@ msgstr "Sähköposti" #: field:crm.case,canal_id:0 #: field:crm.case.log,canal_id:0 msgid "Channel" -msgstr "" +msgstr "Kanava" #. module: crm #: help:crm.case.rule,act_mail_to_email:0 @@ -3295,7 +3295,7 @@ msgstr "Sähköpostimuistuttajat (sisältää asiasisällön)" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage msgid "Cases by Leads and Stage" -msgstr "" +msgstr "Tapahtumat ohjauksen ja vaiheen mukaan" #. module: crm #: field:crm.meeting,exdate:0 diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po index 980b91c42e4..b5e7f12c500 100644 --- a/addons/report_purchase/i18n/ko.po +++ b/addons/report_purchase/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 12:26+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-04 01:33+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 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: report_purchase @@ -50,7 +50,7 @@ msgstr "상품 별 구매" #. module: report_purchase #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에서 유효하지 않은 모델 이름" #. module: report_purchase #: model:ir.ui.menu,name:report_purchase.next_id_75 diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po index aa551a7ace7..efd28c0d903 100644 --- a/addons/sale/i18n/bg.po +++ b/addons/sale/i18n/bg.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-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po index bf43af36bf3..46f3063bc3d 100644 --- a/addons/scrum/i18n/ko.po +++ b/addons/scrum/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:49+0000\n" -"Last-Translator: ekodaq \n" +"PO-Revision-Date: 2010-04-04 01:39+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 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: scrum @@ -52,7 +52,7 @@ msgstr "백로그로부터 과제 생성" #. module: scrum #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "액션 정의에서 유효하지 않은 모델 이름" #. module: scrum #: model:ir.module.module,shortdesc:scrum.module_meta_information @@ -138,7 +138,7 @@ msgstr "매우 긴급" #. module: scrum #: field:scrum.sprint,retrospective:0 msgid "Sprint Retrospective" -msgstr "" +msgstr "스프린트 회고" #. module: scrum #: field:scrum.sprint,name:0 @@ -299,7 +299,7 @@ msgstr "스크럼 데이터" #: selection:scrum.product.backlog,priority:0 #: selection:scrum.task,priority:0 msgid "Medium" -msgstr "" +msgstr "중간" #. module: scrum #: field:scrum.project,total_hours:0 @@ -342,7 +342,7 @@ msgstr "프로젝트" #. module: scrum #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "유효하지 않은 아키텍처를 위한 XML 보기!" #. module: scrum #: field:scrum.task,history:0 @@ -629,18 +629,18 @@ msgstr "이 프로젝트에 관련된 모든 과제의 계획 시간 합계" #. module: scrum #: field:scrum.project,warn_customer:0 msgid "Warn Partner" -msgstr "" +msgstr "파트너에게 알림" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4 msgid "My Sprints (Product Owner)" -msgstr "" +msgstr "나의 스프린트 (상품 소유자)" #. module: scrum #: field:scrum.task,name:0 msgid "Task summary" -msgstr "" +msgstr "과제 요약" #. module: scrum #: help:scrum.project,category_id:0 @@ -649,6 +649,8 @@ msgid "" "projects. It enables you to connect projects with budgets, planning, cost " "and revenue analysis, timesheets on projects, etc." msgstr "" +"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 " +"수행할 수 있습니다." #. module: scrum #: selection:scrum.product.backlog,state:0 @@ -656,18 +658,18 @@ msgstr "" #: selection:scrum.sprint,state:0 #: selection:scrum.task,state:0 msgid "Done" -msgstr "" +msgstr "완료" #. module: scrum #: wizard_button:scrum.product.backlog.task.create,init,end:0 msgid "Cancel" -msgstr "" +msgstr "취소" #. module: scrum #: selection:scrum.product.backlog,state:0 #: selection:scrum.sprint,state:0 msgid "Open" -msgstr "" +msgstr "열기" #. module: scrum #: view:scrum.product.backlog:0 @@ -676,17 +678,17 @@ msgstr "" #: view:scrum.sprint:0 #: field:scrum.sprint,effective_hours:0 msgid "Effective hours" -msgstr "" +msgstr "효과적인 시간" #. module: scrum #: field:scrum.project,warn_manager:0 msgid "Warn Manager" -msgstr "" +msgstr "매니저에게 알림" #. module: scrum #: selection:scrum.task,state:0 msgid "In Progress" -msgstr "" +msgstr "진행중" #. module: scrum #: field:scrum.sprint,review:0 @@ -697,7 +699,7 @@ msgstr "스프린트 검토" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !" #. module: scrum #: field:scrum.task,remaining_hours:0 @@ -781,7 +783,7 @@ msgstr "오늘 어떤 일을 하셨습니까?" #. module: scrum #: selection:scrum.project,state:0 msgid "Running" -msgstr "" +msgstr "실행 중" #. module: scrum #: field:scrum.product.backlog,progress:0 From 22dae2b3f861f5b3931e0a1d5a1f0125b205ac12 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 4 Apr 2010 20:48:44 +0200 Subject: [PATCH 5/6] merge bzr revid: fp@tinyerp.com-20100404184844-uilt8otxhmd0z1vi --- addons/crm/report/crm_opportunity_report.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py index 5aa2a91e555..2c117d396f2 100644 --- a/addons/crm/report/crm_opportunity_report.py +++ b/addons/crm/report/crm_opportunity_report.py @@ -2,10 +2,9 @@ from osv import fields,osv import tools class crm_opportunity_report(osv.osv): - _name = "crm.opportunity.report" + _name = "crm.opportunity.report" _auto = False - _inherit = "crm.case.report" - + _inherit = "crm.case.report" _columns = { 'probability': fields.float('Avg. Probability', readonly=True), 'amount_revenue': fields.float('Est.Revenue', readonly=True), @@ -35,13 +34,20 @@ class crm_opportunity_report(osv.osv): 0 as avg_answers, 0.0 as perc_done, 0.0 as perc_cancel, - sum(planned_revenue) as amount_revenue, + sum(planned_revenue) as amount_revenue, sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob, avg(probability)::decimal(16,2) as probability, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_opportunity 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,c.categ_id,c.partner_id,company_id + 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, + c.categ_id, + c.partner_id,company_id )""") crm_opportunity_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From cf8f80e6d9782cc55487e29a9c27ef5d2a8792a7 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Mon, 5 Apr 2010 04:53:38 +0100 Subject: [PATCH 6/6] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100405035338-cxxkjo59wa75rg2v --- addons/base_contact/i18n/ko.po | 2 +- addons/crm/i18n/fi.po | 79 ++++++++++++++++--------------- addons/report_purchase/i18n/ko.po | 2 +- addons/scrum/i18n/ko.po | 2 +- 4 files changed, 44 insertions(+), 41 deletions(-) diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po index c9788ecc136..ef55adcec9e 100644 --- a/addons/base_contact/i18n/ko.po +++ b/addons/base_contact/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" +"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po index f8617b8ea6b..c2643ad5e8a 100644 --- a/addons/crm/i18n/fi.po +++ b/addons/crm/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-04-03 13:35+0000\n" +"PO-Revision-Date: 2010-04-04 12:10+0000\n" "Last-Translator: smii \n" "Language-Team: Finnish \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-04 03:52+0000\n" +"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -3315,7 +3315,7 @@ msgstr "" #. module: crm #: model:ir.ui.menu,name:crm.next_id_64 msgid "Reporting" -msgstr "" +msgstr "Raportointi" #. module: crm #: code:addons/crm/crm.py:0 @@ -3336,7 +3336,7 @@ msgstr "" #: selection:report.crm.case.section.stage,state:0 #, python-format msgid "Pending" -msgstr "" +msgstr "Odottaa" #. module: crm #: model:process.transition,name:crm.process_transition_leadopportunity0 @@ -3346,12 +3346,12 @@ msgstr "" #. module: crm #: view:crm.job:0 msgid "Expected Salary" -msgstr "" +msgstr "Oletettu palkka" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_configuration msgid "Configuration" -msgstr "" +msgstr "Asetukset" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail @@ -3361,7 +3361,7 @@ msgstr "" #. module: crm #: constraint:ir.cron:0 msgid "Invalid arguments" -msgstr "" +msgstr "Virheelliset argumentit" #. module: crm #: field:crm.meeting,transparent:0 @@ -3377,43 +3377,43 @@ msgstr "" #: model:crm.case.categ,name:crm.categ_lead7 #: model:crm.case.categ,name:crm.categ_oppor7 msgid "Word of mouth" -msgstr "" +msgstr "Suusanallinen" #. module: crm #: view:crm.lead:0 msgid "Lead Subject" -msgstr "" +msgstr "Ohjausaihe" #. module: crm #: view:crm.lead:0 #: view:crm.phonecall:0 msgid "Convert to Opportunity" -msgstr "" +msgstr "Muunna mahdollisuudeksi" #. module: crm #: model:crm.case.stage,name:crm.stage_phone1 msgid "Planned" -msgstr "" +msgstr "Suunniteltu" #. module: crm #: model:crm.case.category2,name:crm.category_meet3 msgid "Customer Office" -msgstr "" +msgstr "Asiakkaan toimisto" #. module: crm #: view:crm.job:0 msgid "Candidate Email" -msgstr "" +msgstr "Ehdokkaan sähköposti" #. module: crm #: view:crm.opportunity:0 msgid "Sales Stage: " -msgstr "" +msgstr "Myyntien vaihe: " #. module: crm #: view:crm.claim:0 msgid "Type of Action" -msgstr "" +msgstr "Toiminnon tyyppi" #. module: crm #: field:crm.case.rule,act_user_id:0 @@ -3423,7 +3423,7 @@ msgstr "Aseta vastaava" #. module: crm #: view:crm.job:0 msgid "Meeting With Candidates" -msgstr "" +msgstr "Ehdokkaiden tapaaminen" #. module: crm #: help:crm.segmentation,som_interval:0 @@ -3447,7 +3447,7 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "December" -msgstr "" +msgstr "Joulukuu" #. module: crm #: view:report.crm.case.section.categ.categ2:0 @@ -3467,7 +3467,7 @@ msgstr "Lähetä sähköpostia" #. module: crm #: view:crm.fundraising:0 msgid "Funds Tree" -msgstr "" +msgstr "Varojen puu" #. module: crm #: field:crm.case.rule,act_method:0 @@ -3477,24 +3477,24 @@ msgstr "Kutsu objektia" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1 msgid "All Funds" -msgstr "" +msgstr "Kaikki varat" #. module: crm #: field:crm.case.section,calendar:0 #: view:crm.meeting:0 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings msgid "Calendar" -msgstr "" +msgstr "Kalenteri" #. module: crm #: model:crm.case.categ,name:crm.categ_job1 msgid "Salesman" -msgstr "" +msgstr "Myyjä" #. module: crm #: model:crm.case.section,name:crm.section_support_help msgid "HelpDesk" -msgstr "" +msgstr "HelpDesk" #. module: crm #: field:crm.case,ref2:0 @@ -3511,12 +3511,12 @@ msgstr "Ostomyynti" #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set msgid "Schedule Meeting" -msgstr "" +msgstr "Ajoita tapaaminen" #. module: crm #: model:crm.case.categ,name:crm.categ_fund4 msgid "Arts And Culture" -msgstr "" +msgstr "Taide ja Kulttuuri" #. module: crm #: model:crm.case.categ,name:crm.categ_phone2 @@ -3524,7 +3524,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Outbound" -msgstr "" +msgstr "Lähtevä" #. module: crm #: code:addons/crm/crm.py:0 @@ -3535,7 +3535,7 @@ msgstr "Historioi" #. module: crm #: view:crm.meeting:0 msgid "Confirmed" -msgstr "" +msgstr "Vahvistettu" #. module: crm #: selection:crm.segmentation,state:0 @@ -3547,7 +3547,7 @@ msgstr "Ei toiminnassa" #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0 msgid "Success Probability" -msgstr "" +msgstr "Onnistunut mahdollisuus" #. module: crm #: code:addons/crm/crm.py:0 @@ -3585,7 +3585,7 @@ msgstr "Aseta osio" #: selection:crm.case.rule,trg_priority_from:0 #: selection:crm.case.rule,trg_priority_to:0 msgid "Normal" -msgstr "" +msgstr "Normaali" #. module: crm #: code:addons/crm/crm.py:0 @@ -3594,6 +3594,7 @@ msgstr "" #, python-format msgid "You must put a Partner eMail to use this action!" msgstr "" +"Sinun täytyy laittaa kumppanin sähköpostiosoite käyttääksesi tätä toimintoa!" #. module: crm #: wizard_view:crm.job.partner_create,init:0 @@ -3602,7 +3603,7 @@ msgstr "" #: wizard_view:crm.phonecall.opportunity_set,create_partner:0 #: wizard_view:crm.phonecall.partner_create,init:0 msgid "You may have to verify that this partner does not exist already." -msgstr "" +msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa." #. module: crm #: view:crm.job:0 @@ -3622,14 +3623,14 @@ msgstr "" #: field:report.crm.case.section.categ2,user_id:0 #: field:report.crm.case.section.stage,user_id:0 msgid "User" -msgstr "" +msgstr "Käyttäjä" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree #: view:report.crm.case.section.categ.categ2:0 msgid "Cases by Section, Category and Type" -msgstr "" +msgstr "Tapahtumat osion, kategorian ja tyypin mukaan" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3637,12 +3638,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "November" -msgstr "" +msgstr "Marraskuu" #. module: crm #: model:crm.case.category2,name:crm.category_job2 msgid "Licenced" -msgstr "" +msgstr "Lisensöity" #. module: crm #: field:crm.case.section,parent_id:0 @@ -3658,7 +3659,7 @@ msgstr "Yläosio" #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call msgid "Schedule Phone Call" -msgstr "" +msgstr "Ajoita puhelinsoitto" #. module: crm #: code:addons/crm/crm.py:0 @@ -3666,6 +3667,8 @@ msgstr "" msgid "" "Can not send mail with empty body,you should have description in the body" msgstr "" +"Sähköpostia ei voi lähettää tyhjällä viesti -kentällä. Sinulla tulisi olla " +"kuvaus viesti -kentässä" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3673,7 +3676,7 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "January" -msgstr "" +msgstr "Tammikuu" #. module: crm #: model:process.process,name:crm.process_process_contractprocess0 @@ -3693,7 +3696,7 @@ msgstr "Suunniteltu tuotto" #. module: crm #: model:crm.case.categ,name:crm.categ_fund3 msgid "Healthcare" -msgstr "" +msgstr "Terveydenhoito" #. module: crm #: view:crm.case:0 @@ -3717,7 +3720,7 @@ msgstr "Kumppanin Yhteystiedot" #. module: crm #: model:crm.case.category2,name:crm.category_meet1 msgid "Office" -msgstr "" +msgstr "Toimisto" #. module: crm #: model:ir.model,name:crm.model_crm_fundraising @@ -3727,7 +3730,7 @@ msgstr "" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage msgid "Stage of case" -msgstr "" +msgstr "Tapahtuman vaihe" #. module: crm #: view:crm.case:0 diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po index b5e7f12c500..20f71776b41 100644 --- a/addons/report_purchase/i18n/ko.po +++ b/addons/report_purchase/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" +"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: report_purchase diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po index 46f3063bc3d..f4595a6011e 100644 --- a/addons/scrum/i18n/ko.po +++ b/addons/scrum/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" +"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: scrum