From c55858dd6b54bc5e101b0bb4232aaa40144f36cc Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 4 Jul 2012 20:19:17 +0200 Subject: [PATCH] [IMP] split depedencies between portal_crm and the new glue module portal_hr_employees this new glue module depending on hr and portal_crm is now responsible for inserting the employees list in the portal_crm contact page bzr revid: abo@openerp.com-20120704181917-1o1ofcm66cek1dm3 --- addons/portal_claim/__openerp__.py | 6 +- addons/portal_crm/__init__.py | 1 - addons/portal_crm/__openerp__.py | 10 ++-- addons/portal_crm/hr_employee_view.xml | 19 ------- .../portal_crm/static/src/css/portal_crm.css | 16 ------ addons/portal_crm/wizard/contact.py | 8 +-- addons/portal_crm/wizard/contact_view.xml | 28 +--------- addons/portal_hr_employees/__init__.py | 22 ++++++++ addons/portal_hr_employees/__openerp__.py | 47 ++++++++++++++++ .../hr_employee.py | 18 +++++- .../portal_hr_employees/hr_employee_view.xml | 56 +++++++++++++++++++ .../security/ir.model.access.csv | 0 .../security/portal_crm_security.xml | 0 .../static/src/css/portal_hr_employees.css | 11 ++++ addons/portal_hr_recruitment/__openerp__.py | 5 +- 15 files changed, 164 insertions(+), 83 deletions(-) delete mode 100644 addons/portal_crm/hr_employee_view.xml create mode 100644 addons/portal_hr_employees/__init__.py create mode 100644 addons/portal_hr_employees/__openerp__.py rename addons/{portal_crm => portal_hr_employees}/hr_employee.py (69%) create mode 100644 addons/portal_hr_employees/hr_employee_view.xml rename addons/{portal_crm => portal_hr_employees}/security/ir.model.access.csv (100%) rename addons/{portal_crm => portal_hr_employees}/security/portal_crm_security.xml (100%) create mode 100644 addons/portal_hr_employees/static/src/css/portal_hr_employees.css diff --git a/addons/portal_claim/__openerp__.py b/addons/portal_claim/__openerp__.py index 9fba57ba9ac..197227cc45f 100644 --- a/addons/portal_claim/__openerp__.py +++ b/addons/portal_claim/__openerp__.py @@ -26,15 +26,15 @@ 'category': 'Tools', 'complexity': "easy", 'description': """ -This module adds claim menu and features to your portal if claim and portal are +This module adds claim menu and features to your portal if claim and portal are installed. """, 'author': 'OpenERP SA', 'depends': ['crm_claim','portal'], 'data': [ - 'security/portal_security.xml', 'portal_claim_view.xml', - "security/ir.model.access.csv", + 'security/ir.model.access.csv', + 'security/portal_security.xml', ], 'installable': True, 'auto_install':True, diff --git a/addons/portal_crm/__init__.py b/addons/portal_crm/__init__.py index 4ea069fcbd8..6b791be9f25 100644 --- a/addons/portal_crm/__init__.py +++ b/addons/portal_crm/__init__.py @@ -20,4 +20,3 @@ ############################################################################## import wizard -import hr_employee \ No newline at end of file diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py index 3f4a24adfed..4fe023ccb48 100644 --- a/addons/portal_crm/__openerp__.py +++ b/addons/portal_crm/__openerp__.py @@ -26,18 +26,16 @@ 'category': 'Tools', 'complexity': "easy", 'description': """ -This module adds crm menu and features (contact form) to your portal if crm and -portal are installed. +This module adds a contact page (with a contact form creating a lead when +submitted) to your portal if crm and portal are installed. """, 'author': 'OpenERP SA', 'depends': ['crm','portal'], 'data': [ - 'hr_employee_view.xml', - 'security/ir.model.access.csv', 'wizard/contact_view.xml', ], - 'installable': True, - 'auto_install':True, + 'installable': True +, 'auto_install':True, 'category':'Hidden', 'css': [ 'static/src/css/portal_crm.css', diff --git a/addons/portal_crm/hr_employee_view.xml b/addons/portal_crm/hr_employee_view.xml deleted file mode 100644 index 0bfb86284fc..00000000000 --- a/addons/portal_crm/hr_employee_view.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - res.portal.employee.form - hr.employee - form - - - - - - - - - - - diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css index 5f2e8723ff4..0589eb92e71 100644 --- a/addons/portal_crm/static/src/css/portal_crm.css +++ b/addons/portal_crm/static/src/css/portal_crm.css @@ -1,7 +1,3 @@ -/* - * General layout - */ - /* Root container */ .openerp .oe_portal_crm_contact { width: 800px; @@ -44,15 +40,3 @@ .openerp .oe_portal_crm_contact .oe_portal_crm_office ul:last-child li:last-child { margin-bottom: 0; } - -/* Employees list section */ -.openerp .oe_portal_crm_contact .oe_portal_crm_team { - padding: 8px 0 0 0; -} -.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details { - width: 170px; -} -.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image { - width: 65px; - height: 65px; -} diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py index 53920cd4d7e..15923a6bb4f 100644 --- a/addons/portal_crm/wizard/contact.py +++ b/addons/portal_crm/wizard/contact.py @@ -7,20 +7,14 @@ class crm_contact_us(osv.TransientModel): _inherit = 'crm.lead' _columns = { 'company_ids' : fields.many2many('res.company', string='Companies', readonly=True), - 'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True), } - def _get_employee(self, cr, uid, context=None): - """ Employees flagged as 'private' won't appear on the contact page """ - r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context) - return r - + """ Little trick to display companies in our wizard view """ def _get_companies(self, cr, uid, context=None): r = self.pool.get('res.company').search(cr, uid, [], context=context) return r _defaults = { - 'employee_ids' : _get_employee, 'company_ids' : _get_companies } diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml index 7ebd4e749b9..922ec231496 100644 --- a/addons/portal_crm/wizard/contact_view.xml +++ b/addons/portal_crm/wizard/contact_view.xml @@ -54,9 +54,6 @@ -
  • - -
    • @@ -68,30 +65,7 @@
    -

    Meet the team

    - - - - - -
    -
    - -
    -
    -

    ()

    -
      -
      • -
    • Tel:
      • -
    • Mobile:
      • -
      • -
    -
    -
    -     -     -     -     +
    diff --git a/addons/portal_hr_employees/__init__.py b/addons/portal_hr_employees/__init__.py new file mode 100644 index 00000000000..f0abe52049a --- /dev/null +++ b/addons/portal_hr_employees/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +import hr_employee diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py new file mode 100644 index 00000000000..7a6687faa64 --- /dev/null +++ b/addons/portal_hr_employees/__openerp__.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + + +{ + 'name': 'Portal HR employees', + 'version': '0.1', + 'category': 'Tools', + 'complexity': "easy", + 'description': """ +This module adds a list of employees to your portal's contact page if hr and +portal_crm (which creates the contact page) are installed. + """, + 'author': 'OpenERP SA', + 'depends': ['hr','portal_crm'], + 'data': [ + 'hr_employee_view.xml', + 'security/portal_crm_security.xml', + 'security/ir.model.access.csv', + ], + 'installable': True, + 'auto_install':True, + 'category':'Hidden', + 'css': [ + 'static/src/css/portal_hr_employees.css', + ], + +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal_crm/hr_employee.py b/addons/portal_hr_employees/hr_employee.py similarity index 69% rename from addons/portal_crm/hr_employee.py rename to addons/portal_hr_employees/hr_employee.py index b4db10deb6c..d14b2400889 100644 --- a/addons/portal_crm/hr_employee.py +++ b/addons/portal_hr_employees/hr_employee.py @@ -21,10 +21,26 @@ from osv import osv, fields +class crm_contact_us(osv.TransientModel): + """ Add employees list to the portal's contact page """ + _description = 'Contact form for the portal' + _inherit = 'portal_crm.crm_contact_us' + _columns = { + 'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True), + } + """ Little trick to display employees in our wizard view """ + def _get_employee(self, cr, uid, context=None): + """ Employees flagged as 'private' won't appear on the contact page """ + r = self.pool.get('hr.employee').search(cr, uid, [('visibility', '!=', 'private')], context=context) + return r + + _defaults = { + 'employee_ids' : _get_employee, + } class hr_employee(osv.osv): - _description = "Portal CRM Employee" + _description = "Portal CRM employee" _inherit = 'hr.employee' """ diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml new file mode 100644 index 00000000000..d8bc535057e --- /dev/null +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -0,0 +1,56 @@ + + + + + + + portal_hr_employees.employee.form + hr.employee + form + + + + + + + + + + + + + portal_hr_employees.employees_list + portal_crm.crm_contact_us + form + + + +

    Meet the team

    + + + + +
    +
    + +
    +
    +

    ()

    +
      +
      • +
    • Tel:
      • +
    • Mobile:
      • +
      • +
    +
    +
    +     +     +     +     +     +     +     + +     +     diff --git a/addons/portal_crm/security/ir.model.access.csv b/addons/portal_hr_employees/security/ir.model.access.csv similarity index 100% rename from addons/portal_crm/security/ir.model.access.csv rename to addons/portal_hr_employees/security/ir.model.access.csv diff --git a/addons/portal_crm/security/portal_crm_security.xml b/addons/portal_hr_employees/security/portal_crm_security.xml similarity index 100% rename from addons/portal_crm/security/portal_crm_security.xml rename to addons/portal_hr_employees/security/portal_crm_security.xml diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css new file mode 100644 index 00000000000..d153f8c52fb --- /dev/null +++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css @@ -0,0 +1,11 @@ +/* Employees list section */ +.openerp .oe_portal_crm_contact .oe_portal_crm_team { + padding: 8px 0 0 0; +} +.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details { + width: 170px; +} +.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image { + width: 65px; + height: 65px; +} diff --git a/addons/portal_hr_recruitment/__openerp__.py b/addons/portal_hr_recruitment/__openerp__.py index 015e76d3d06..0b7fb78b7f0 100644 --- a/addons/portal_hr_recruitment/__openerp__.py +++ b/addons/portal_hr_recruitment/__openerp__.py @@ -21,13 +21,12 @@ { - 'name': 'Portal Jobs', + 'name': 'Portal HR recruitment', 'version': '0.1', 'category': 'Tools', 'complexity': "easy", 'description': """ -This module adds applications menu and features to your portal if hr and portal -are installed. +This module adds a jobs page to your portal if hr and portal are installed. """, 'author': 'OpenERP SA', 'depends': ['hr','portal'],