diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 1000cef2156..0095cb1505c 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -11,8 +11,8 @@ - - + + diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po index 6de93149132..f8522b20016 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-16 03:54+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..d3f8fd4d5c7 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-16 03:54+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/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index df4a6805afb..17b4bc486bc 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -15,7 +15,7 @@ - + @@ -37,7 +37,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 326da6c8973..c7409006d78 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 c72fd810603..8d315c14a6d 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 21ff93c91ec..b1a7dfcc428 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 Request":1,"search_default_section_id":section_id} + {"search_default_my_hd_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 fc731ae30e7..bea0c3a894c 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 eb8c09008fc..8e34bca3118 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -7,7 +7,8 @@ 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 d93e5f94562..9dad22dba81 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 b350812c0f9..b01beb55342 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 c7fba068c11..ba01ca72be4 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_Current":1,"search_default_section_id":section_id} + {"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index e0e53f4cd8c..92b09919791 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_section_id":section_id} + {"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id} @@ -55,7 +55,7 @@ tree,calendar - {"default_state":'open',"search_default_My Calls":1,"search_default_section_id":section_id} + {"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id} diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 3fefc7ed249..064d3569d03 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -161,7 +161,6 @@ search - - + @@ -190,7 +189,6 @@ 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/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 9be2c7c538e..465fab740a6 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_User":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml index 38068a7b16c..fbc56e6202e 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_User":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 9ce910329bf..58d69699404 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_User":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml index b19115f6739..3ee8498fb3a 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_User":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index a4fc0f0097f..a78d94977f8 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_User":1} + {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1} diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml index a0f03a24210..3cd8b518b5d 100644 --- a/addons/crm/report/crm_report_view.xml +++ b/addons/crm/report/crm_report_view.xml @@ -64,10 +64,12 @@ + domain="[('name','=',time.localtime()[0])]" + name="this_year" /> + domain="[('month','=',time.strftime('%%m'))]" + name="this_month" /> + domain="[]" context="{'group_by':'user_id'}" + name="by_user" /> 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/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 93897246bf7..ac8e321c8c1 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -71,10 +71,14 @@ class crm_send_new_email(osv.osv_memory): attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']]) attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach) + message_id = None + if context.get('mail', 'new') == 'new': case = case_pool.browse(cr, uid, res_id) + message_id = case.history_line[0].message_id else: hist = hist_obj.browse(cr, uid, res_id) + message_id = hist.message_id model = hist.log_id.model_id.model model_pool = self.pool.get(model) case = model_pool.browse(cr, uid, hist.log_id.res_id) @@ -84,7 +88,11 @@ class crm_send_new_email(osv.osv_memory): body = case_pool.format_body(body) email_from = data.get('email_from', False) - case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from) + case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id) + + x_headers = { + 'References':"%s" % (message_id) + } flag = tools.email_send( email_from, @@ -94,6 +102,7 @@ class crm_send_new_email(osv.osv_memory): attach=attach, reply_to=case.section_id.reply_to, openobject_id=str(case.id), + x_headers=x_headers ) if flag: if data['state'] == 'unchanged': @@ -111,7 +120,7 @@ class crm_send_new_email(osv.osv_memory): # raise osv.except_osv(_('Email!'), ("Email Successfully Sent")) # else: # raise osv.except_osv(_('Warning!'), _("Email not sent !")) - + return {} def default_get(self, cr, uid, fields, context=None): diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po index b3dd9d94ad9..210dd59d961 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-16 03:54+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/fetchmail/__init__.py b/addons/fetchmail/__init__.py new file mode 100644 index 00000000000..0f50df83255 --- /dev/null +++ b/addons/fetchmail/__init__.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# mga@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import fetchmail diff --git a/addons/fetchmail/__terp__.py b/addons/fetchmail/__terp__.py new file mode 100644 index 00000000000..fc2b245f11f --- /dev/null +++ b/addons/fetchmail/__terp__.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# mga@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + "name" : "Fetchmail Server", + "version" : "1.0", + "depends" : ["base", "smtpclient"], + "author" : "Tiny", + "description": """Fetchail: + * Fetch email from Pop / IMAP server + * Support SSL + * Integrated with all Modules + * Automatic Email Receive + * Email based Records (Add, Update) + """, + 'author': 'Tiny', + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'update_xml': [ + "fetchmail_view.xml", + "fetchmail_data.xml" + ], + 'demo_xml': [ + + ], + 'installable': True, + 'active': False, +} diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py new file mode 100644 index 00000000000..ae09b4da438 --- /dev/null +++ b/addons/fetchmail/fetchmail.py @@ -0,0 +1,405 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# mga@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import os +import re +import time + +import email +import binascii +import mimetypes + +from imaplib import IMAP4 +from imaplib import IMAP4_SSL + +from email.header import Header +from email.header import decode_header + +import netsvc +from osv import osv +from osv import fields +from tools.translate import _ + +command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE) + +logger = netsvc.Logger() + +def html2plaintext(html, body_id=None, encoding='utf-8'): + ## (c) Fry-IT, www.fry-it.com, 2007 + ## + ## download here: http://www.peterbe.com/plog/html2plaintext + + """ from an HTML text, convert the HTML to plain text. + If @body_id is provided then this is the tag where the + body (not necessarily ) starts. + """ + try: + from BeautifulSoup import BeautifulSoup, SoupStrainer, Comment + except: + return html + + urls = [] + if body_id is not None: + strainer = SoupStrainer(id=body_id) + else: + strainer = SoupStrainer('body') + + soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding) + for link in soup.findAll('a'): + title = link.renderContents() + 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__() + + url_index = [] + i = 0 + for d in urls: + if d['title'] == d['url'] or 'http://'+d['title'] == d['url']: + html = html.replace(d['tag'], d['url']) + else: + i += 1 + html = html.replace(d['tag'], '%s [%s]' % (d['title'], i)) + url_index.append(d['url']) + + html = html.replace('','*').replace('','*') + html = html.replace('','*').replace('','*') + html = html.replace('

','*').replace('

','*') + html = html.replace('

','**').replace('

','**') + html = html.replace('

','**').replace('

','**') + html = html.replace('','/').replace('','/') + + # the only line breaks we respect is those of ending tags and + # breaks + + html = html.replace('\n',' ') + html = html.replace('
', '\n') + html = html.replace('', '\n') + html = html.replace('

', '\n\n') + html = re.sub('', '\n', html) + html = html.replace(' ' * 2, ' ') + + # for all other tags we failed to clean up, just remove then and + # complain about them on the stderr + def desperate_fixer(g): + #print >>sys.stderr, "failed to clean up %s" % str(g.group()) + return ' ' + + html = re.sub('<.*?>', desperate_fixer, html) + + # lstrip all lines + html = '\n'.join([x.lstrip() for x in html.splitlines()]) + + for i, url in enumerate(url_index): + if i == 0: + html += '\n\n' + html += '[%s] %s\n' % (i+1, url) + return html + +class mail_server(osv.osv): + + _name = 'email.server' + _description = "POP/IMAP Server" + + _columns = { + 'name':fields.char('Name', size=256, required=True, readonly=False), + 'active':fields.boolean('Active', required=False), + 'state':fields.selection([ + ('draft','Not Confirme'), + ('wating','Waiting for Verification'), + ('done','Confirmed'), + ],'State', select=True, readonly=True), + 'server' : fields.char('SMTP Server', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'port' : fields.integer('SMTP Port', required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'type':fields.selection([ + ('pop','POP Server'), + ('imap','IMAP Server'), + ],'State', select=True, readonly=True), + 'is_ssl':fields.boolean('SSL ?', required=False), + 'date': fields.date('Date'), + 'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'note': fields.text('Description'), + 'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"), + 'object_id': fields.many2one('ir.model',"Model", required=True), + 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly',False)]}, help="Priority between 0 to 10, select define the order of Processing"), + } + _defaults = { + 'type': lambda *a: "imap", + 'state': lambda *a: "draft", + 'active': lambda *a: True, + 'priority': lambda *a: 5, + 'date': lambda *a: time.strftime('%Y-%m-%d'), + } + + def check_duplicate(self, cr, uid, ids): + vals = self.read(cr, uid, ids, ['user', 'password'])[0] + cr.execute("select count(id) from email_server where user='%s' and password='%s'" % (vals['user'], vals['password'])) + res = cr.fetchone() + if res: + if res[0] > 1: + return False + return True + + _constraints = [ + (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']) + ] + + def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False): + port = 0 + if server_type == 'pop': + port = ssl and 995 or 110 + elif server_type == 'imap': + port = ssl and 993 or 143 + + return {'value':{'port':port}} + + def _process_email(self, cr, uid, server, message, context={}): + history_pool = self.pool.get('mail.server.history') + msg_txt = email.message_from_string(message) + message_id = msg_txt.get('Message-ID', False) + + msg = {} + if not message_id: + return False + + fields = msg_txt.keys() + + msg['id'] = message_id + msg['message-id'] = message_id + + if 'Subject' in fields: + msg['subject'] = msg_txt.get('Subject') + + if 'Content-Type' in fields: + msg['content-type'] = msg_txt.get('Content-Type') + + if 'From' in fields: + msg['from'] = msg_txt.get('From') + + if 'Delivered-To' in fields: + msg['to'] = msg_txt.get('Delivered-To') + + if 'Cc' in fields: + msg['cc'] = msg_txt.get('Cc') + + if 'Reply-To' in fields: + msg['reply'] = msg_txt.get('Reply-To') + + if 'Date' in fields: + msg['date'] = msg_txt.get('Date') + + if 'Content-Transfer-Encoding' in fields: + msg['encoding'] = msg_txt.get('Content-Transfer-Encoding') + + if 'References' in fields: + msg['references'] = msg_txt.get('References') + + if 'X-openerp-caseid' in fields: + msg['caseid'] = msg_txt.get('X-openerp-caseid') + + if 'X-Priority' in fields: + msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0] + + if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', None): + msg['body'] = msg_txt.get_payload(decode=True) + + attachents = {} + if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', None): + body = "" + counter = 1 + for part in msg_txt.walk(): + if part.get_content_maintype() == 'multipart': + continue + + if part.get_content_maintype()=='text': + content = part.get_payload(decode=True) + if part.get_content_subtype() == 'html': + body = html2plaintext(content) + elif part.get_content_subtype() == 'plain': + body = content + + filename = part.get_filename() + if filename : + attachents[filename] = part.get_payload(decode=True) + + elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text': + filename = part.get_filename(); + if filename : + attachents[filename] = part.get_payload(decode=True) + else: + body += part.get_payload(decode=True) + + msg['body'] = body + msg['attachments'] = attachents + + if msg.get('references', False): + id = False + ref = msg.get('references').split('\r\n') + if ref: + hids = history_pool.search(cr, uid, [('name','=',ref[0])]) + if hids: + id = hids[0] + history = history_pool.browse(cr, uid, id) + model_pool = self.pool.get(server.object_id.model) + context.update({ + 'message_id':ref[0] + }) + model_pool.message_update(cr, uid, [history.res_id], msg, context=context) + res_id = id + else: + model_pool = self.pool.get(server.object_id.model) + res_id = model_pool.message_new(cr, uid, msg, context) + + for attactment in attachents or []: + data_attach = { + 'name': attactment, + 'datas':binascii.b2a_base64(str(attachents.get(attactment))), + 'datas_fname': attactment, + 'description': 'Mail attachment', + 'res_model': server.object_id.model, + 'res_id': res_id, + } + self.pool.get('ir.attachment').create(cr, uid, data_attach) + + if server.action_id: + action_pool = self.pool.get('ir.actions.server') + action_pool.run(cr, uid, [server.action_id.id], {'active_id':res_id, 'active_ids':[res_id]}) + + res = { + 'name': message_id, + 'res_id': res_id, + 'server_id': server.id, + 'note': msg.get('body', msg.get('from')), + 'ref_id':msg.get('references', msg.get('id')), + 'type':server.type + } + his_id = history_pool.create(cr, uid, res) + + return res_id + + def _fetch_mails(self, cr, uid, ids=False, context={}): + if not ids: + ids = self.search(cr, uid, []) + return self.fetch_mail(cr, uid, ids, context) + + def fetch_mail(self, cr, uid, ids, context={}): + fp = os.popen('ping www.google.com -c 1 -w 5',"r") + if not fp.read(): + logger.notifyChannel('imap', netsvc.LOG_WARNING, 'No address associated with hostname !') + + for server in self.browse(cr, uid, ids, context): + logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) + + try: + if server.type == 'imap': + imap_server = None + if server.is_ssl: + imap_server = IMAP4_SSL(server.server, int(server.port)) + else: + imap_server = IMAP4(server.server, int(server.port)) + + imap_server.login(server.user, server.password) + imap_server.select() + result, data = imap_server.search(None, '(UNSEEN)') + count = 0 + for num in data[0].split(): + result, data = imap_server.fetch(num, '(RFC822)') + self._process_email(cr, uid, server, data[0][1], context) + imap_server.store(num, '+FLAGS', '\\Seen') + count += 1 + logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (count, server.name)) + + imap_server.close() + imap_server.logout() + except Exception, e: + logger.notifyChannel('IMAP', netsvc.LOG_WARNING, '%s' % (e)) + + return True + +mail_server() + +class mail_server_history(osv.osv): + + _name = "mail.server.history" + _description = "Mail Server History" + + _columns = { + 'name': fields.char('Message Id', size=256, readonly=True, help="Message Id in Email Server.", select=True), + 'ref_id': fields.char('Referance Id', size=256, readonly=True, help="Message Id in Email Server.", select=True), + 'res_id': fields.integer("Resource ID", readonly=True, select=True), + 'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True), + 'model_id':fields.related('server_id', 'object_id', type='many2one', relation='ir.model', string='Model', readonly=True, select=True), + 'note': fields.text('Notes', readonly=True), + 'create_date': fields.datetime('Created Date', readonly=True), + 'type':fields.selection([ + ('pop','POP Server'), + ('imap','IMAP Server'), + ],'State', select=True, readonly=True), + } + _order = 'id desc' + +mail_server_history() + +class fetchmail_tool(osv.osv): + """ + OpenERP Model : fetchmail_tool + """ + + _name = 'email.server.tools' + _description = "Email Tools" + _auto = False + + def to_email(self, text): + _email = re.compile(r'.*<.*@.*\..*>', re.UNICODE) + def record(path): + eml = path.group() + index = eml.index('<') + eml = eml[index:-1].replace('<','').replace('>','') + return eml + + bits = _email.sub(record, text) + return bits + + def get_partner(self, cr, uid, from_email, context=None): + """ + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks + @param from_email: email address based on that function will search for the correct + """ + + res = { + 'partner_address_id': False, + 'partner_id': False + } + from_email = self.to_email(from_email) + address_ids = self.pool.get('res.partner.address').search(cr, uid, [('email', '=', from_email)]) + if address_ids: + address = self.pool.get('res.partner.address').browse(cr, uid, address_ids[0]) + res['partner_address_id'] = address_ids[0] + res['partner_id'] = address.partner_id.id + + return res + +fetchmail_tool() diff --git a/addons/mail_gateway/mail_gateway_data.xml b/addons/fetchmail/fetchmail_data.xml similarity index 77% rename from addons/mail_gateway/mail_gateway_data.xml rename to addons/fetchmail/fetchmail_data.xml index e13a7a845a5..ef40a76489f 100644 --- a/addons/mail_gateway/mail_gateway_data.xml +++ b/addons/fetchmail/fetchmail_data.xml @@ -1,13 +1,13 @@ - + - Check Email (Fetchmail) + Fetchmail Service 5 minutes -1 - + diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml new file mode 100644 index 00000000000..80d0b60a74f --- /dev/null +++ b/addons/fetchmail/fetchmail_view.xml @@ -0,0 +1,177 @@ + + + + + + email.server.tree + email.server + tree + + + + + + + + + + + + + email.server.form + email.server + form + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +