From 3146a71b6b6e5e18980976c6377da2c18dde3345 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 26 Aug 2010 16:16:41 +0530 Subject: [PATCH 1/9] [IMP]: email_template: Improvement in label string and menu name bzr revid: rpa@tinyerp.com-20100826104641-uw4hl7x3dx2nq5qk --- addons/email_template/email_template_account_view.xml | 4 ++-- addons/email_template/email_template_view.xml | 4 ++-- addons/email_template/i18n/en_US.po | 10 ++++++---- .../wizard/email_template_send_wizard_view.xml | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index b64f7ed779a..dbf22b61fad 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -99,7 +99,7 @@ - + @@ -110,7 +110,7 @@ - - - diff --git a/addons/email_template/i18n/en_US.po b/addons/email_template/i18n/en_US.po index 40cccf5a2cc..5c9c7ee55a9 100644 --- a/addons/email_template/i18n/en_US.po +++ b/addons/email_template/i18n/en_US.po @@ -174,8 +174,8 @@ msgstr "Approve Account" #. module: email_template #: model:ir.ui.menu,name:email_template.menu_email_template_all -msgid "E-MAIL Templates" -msgstr "E-MAIL Templates" +msgid "Email Templates" +msgstr "Email Templates" #. module: email_template #: field:email_template.preview,rel_model_ref:0 @@ -767,8 +767,8 @@ msgstr "TLS" #. module: email_template #: view:email_template.send.wizard:0 -msgid "Add here all attachments of the current document you want to include in the e-mail." -msgstr "Add here all attachments of the current document you want to include in the e-mail." +msgid "Add here all attachments of the current document you want to include in the Email." +msgstr "Add here all attachments of the current document you want to include in the Email." #. module: email_template #: model:ir.model,name:email_template.model_email_template_send_wizard @@ -781,6 +781,8 @@ msgstr "This is the wizard for sending mail" #: code:addons/email_template/email_template_mailbox.py:0 #: code:addons/email_template/wizard/email_template_send_wizard.py:0 #: model:ir.ui.menu,name:email_template.menu_email_template +#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools +#: model:ir.ui.menu,name:email_template.menu_email_template_configuration #, python-format msgid "Email Template" msgstr "Email Template" diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml index 80cce83dbfd..a5ad037aee6 100755 --- a/addons/email_template/wizard/email_template_send_wizard_view.xml +++ b/addons/email_template/wizard/email_template_send_wizard_view.xml @@ -33,7 +33,7 @@ - From ac1ee75d323b8498e609fc1e7fff1b3073edd1bf Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 26 Aug 2010 16:25:19 +0530 Subject: [PATCH 2/9] [IMP] project: remove project.message object bzr revid: hmo@tinyerp.com-20100826105519-h5nxx4t84x2ib740 --- addons/project/board_project_view.xml | 9 +-- addons/project/project.py | 26 ------- addons/project/project_demo.xml | 10 +-- addons/project/project_view.xml | 79 +-------------------- addons/project/security/ir.model.access.csv | 3 - 5 files changed, 4 insertions(+), 123 deletions(-) diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 661a67f561d..7e1eb6c7ddf 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -81,14 +81,7 @@ - - Messages - project.message - form - tree,form - - - + board.project.form board.board diff --git a/addons/project/project.py b/addons/project/project.py index ffba90d55c9..0e4066f4710 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -764,32 +764,6 @@ class config_compute_remaining(osv.osv_memory): config_compute_remaining() -class message(osv.osv): - _name = "project.message" - _description = "Message" - - _columns = { - 'subject': fields.char('Subject', size=128, required="True"), - 'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'), - 'date': fields.date('Date', required=1), - 'user_id': fields.many2one('res.users', 'User', required="True"), - 'description': fields.text('Description'), - } - - def _default_project(self, cr, uid, context=None): - if context is None: - context = {} - if 'project_id' in context and context['project_id']: - return int(context['project_id']) - return False - - _defaults = { - 'user_id': lambda self,cr,uid,ctx: uid, - 'date': time.strftime('%Y-%m-%d'), - 'project_id': _default_project - } - -message() class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index a8593bca9b8..269075a9732 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -254,15 +254,7 @@ Latest in house tests - - - - Follow the procedure of Configuration wizard. -- Add all required modules -- Add chat of accounts -- Create Users - Configuration steps - + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index e265eade0c3..5cbaad4024c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -564,82 +564,7 @@ Issues like bugs in a system, client complain, materials breakdown are collected - - - - project.message.form - project.message - form - -
- - - - - - - - - - -
- - - project.message.tree - project.message - tree - - - - - - - - - - - - project.message.search - project.message - search - - - - - - - - - - - - - - - - - - - - - - Project Messages - project.message - form - tree,form - - {"search_default_project_id":project_id, "search_default_user_id":uid} - - An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis. - - - - - - - - - - + + diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 1a1a3f09daa..633d5a7d8cd 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -9,7 +9,6 @@ "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1 -"access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1 "access_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,1,1,1 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1 @@ -19,8 +18,6 @@ "access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0 "access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0 "access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0 -"access_project_message_manager","project.message manager","model_project_message","project.group_project_manager",1,0,0,0 -"access_project_message_system","project.message system","model_project_message","base.group_system",1,0,0,0 "access_project_task_system","project.task system","model_project_task","base.group_system",1,0,0,0 "access_project_project_system","project.project system","model_project_project","base.group_system",1,1,1,1 "access_project_task_work_system","project.task.work system","model_project_task_work","base.group_system",1,0,0,0 From 06c2555b30895e7885e07a0e70471e681541c03a Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 26 Aug 2010 16:39:55 +0530 Subject: [PATCH 3/9] [IMP]: email_template: Improvement in search view, * Removed on_change for email_id field bzr revid: rpa@tinyerp.com-20100826110955-5no3h692h8cyryki --- .../email_template/email_template_account.py | 20 +------------------ .../email_template_account_view.xml | 13 ++++++------ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py index b54d0fac4c5..1a1b6db0c4e 100644 --- a/addons/email_template/email_template_account.py +++ b/addons/email_template/email_template_account.py @@ -189,25 +189,7 @@ class email_template_account(osv.osv): 'Error: You are not allowed to have more than 1 account.', []) ] - - def on_change_emailid(self, cursor, user, ids, name=None, email_id=None, context=None): - """ - Called when the email ID field changes. - - UI enhancement - Writes the same email value to the smtpusername - and incoming username - """ - #TODO: Check and remove the write. Is it needed? - self.write(cursor, user, ids, {'state':'draft'}, context=context) - return { - 'value': { - 'state': 'draft', - 'smtpuname':email_id, - 'isuser':email_id - } - } - + def get_outgoing_server(self, cursor, user, ids, context=None): """ Returns the Out Going Connection (SMTP) object diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index dbf22b61fad..a73fc075c73 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -27,7 +27,7 @@