From a92bacb55c0735e788458a1e52108750437c9416 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 29 Jan 2013 11:07:56 +0100 Subject: [PATCH] [IMP] alias: make chatter and aliases feature more user friendly and visible to the users. Delete res_config for display option: create leads/issue from incoming emails bzr revid: chm@openerp.com-20130129100756-40z640jwo18z9qcj --- addons/crm/crm_salesteams.xml | 11 +++-- addons/crm/crm_view.xml | 11 +++-- addons/crm/res_config.py | 3 -- addons/crm/res_config_view.xml | 13 ----- addons/crm_claim/__init__.py | 1 - addons/crm_claim/__openerp__.py | 1 - addons/crm_claim/res_config.py | 32 ------------- addons/crm_claim/res_config_view.xml | 23 --------- addons/hr/hr_view.xml | 3 +- addons/hr_recruitment/hr_recruitment_view.xml | 10 ++-- addons/mail/mail_group_view.xml | 47 +++++++++---------- addons/mail/static/src/css/mail_group.css | 6 ++- addons/project/project_view.xml | 19 +++++--- 13 files changed, 60 insertions(+), 120 deletions(-) delete mode 100644 addons/crm_claim/res_config.py delete mode 100644 addons/crm_claim/res_config_view.xml diff --git a/addons/crm/crm_salesteams.xml b/addons/crm/crm_salesteams.xml index 5bed5606b72..e796ac789d0 100644 --- a/addons/crm/crm_salesteams.xml +++ b/addons/crm/crm_salesteams.xml @@ -71,6 +71,7 @@ + @@ -110,10 +111,12 @@ -
- - - + +
+ + + + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 23d71ef51d4..06a6e87ecc6 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -83,6 +83,12 @@ + + + diff --git a/addons/crm_claim/__init__.py b/addons/crm_claim/__init__.py index 2012c227adf..7395ea83fe5 100644 --- a/addons/crm_claim/__init__.py +++ b/addons/crm_claim/__init__.py @@ -21,7 +21,6 @@ import crm_claim import report -import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py index 78dfba2ed53..61257265f1b 100644 --- a/addons/crm_claim/__openerp__.py +++ b/addons/crm_claim/__openerp__.py @@ -41,7 +41,6 @@ automatically new claims based on incoming emails. 'crm_claim_menu.xml', 'security/ir.model.access.csv', 'report/crm_claim_report_view.xml', - 'res_config_view.xml', 'crm_claim_data.xml', ], 'demo': ['crm_claim_demo.xml'], diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py deleted file mode 100644 index aa0cb7ffa20..00000000000 --- a/addons/crm_claim/res_config.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Business Applications -# Copyright (C) 2004-2012 OpenERP S.A. (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import fields, osv - -class crm_claim_settings(osv.osv_memory): - _name = 'sale.config.settings' - _inherit = ['sale.config.settings', 'fetchmail.config.settings'] - - _columns = { - 'fetchmail_claim': fields.boolean("Create claims from incoming mails", - fetchmail_model='crm.claim', fetchmail_name='Incoming Claims', - help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""), - } diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml deleted file mode 100644 index 79474f1fb00..00000000000 --- a/addons/crm_claim/res_config_view.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - crm_claim settings - sale.config.settings - - - -
-
- -
-
- - - - - diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index dc65fa80e8b..8ef3c85ec77 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -336,7 +336,8 @@ - + +
- + + + diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index fba192b18bc..95af1df5967 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -69,39 +69,38 @@
- +

+
- -
-
+
- - - - - - - -
- This group is visible by everyone, - including your customers if you installed - the portal module. -
-
- Only the invited followers can read the - discussions on this group. -
- + + + + + + +
+ This group is visible by everyone, + including your customers if you installed + the portal module. +
+
+ Only the invited followers can read the + discussions on this group. +
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css index c1cefee9070..4f2b8a16dd0 100644 --- a/addons/mail/static/src/css/mail_group.css +++ b/addons/mail/static/src/css/mail_group.css @@ -14,6 +14,10 @@ padding: 0px 18px; } +.openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_avatar { + padding-top: 3px; +} + /* Resize footer width */ .openerp .oe_form div.oe_mail_group_footer { max-width: 80%; @@ -21,7 +25,7 @@ /* Resize group description */ .openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea { - height: 40px; + height: 60px; } /* ------------------------------ */ diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8059cb0b78a..dd54f41bb2d 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -105,6 +105,12 @@ + + + @@ -135,13 +141,6 @@ - -
- -
- @@ -273,6 +272,12 @@
+ +
+ + + +