From 0889ff70f1439d72171c3dee4dfe3b832aac3411 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 21 Dec 2015 17:25:01 +0100 Subject: [PATCH 1/8] Rename to partner_contact_department. --- partner_contact_department/README.rst | 19 +++ partner_contact_department/__init__.py | 6 + partner_contact_department/__openerp__.py | 42 +++++++ .../i18n/crm_department.pot | 108 ++++++++++++++++++ partner_contact_department/i18n/es.po | 108 ++++++++++++++++++ partner_contact_department/models/__init__.py | 8 ++ .../models/crm_department.py | 20 ++++ partner_contact_department/models/crm_lead.py | 23 ++++ .../models/res_partner.py | 11 ++ .../security/ir.model.access.csv | 5 + .../static/description/icon.png | Bin 0 -> 22620 bytes .../views/crm_department_view.xml | 30 +++++ .../views/crm_lead_view.xml | 64 +++++++++++ .../views/res_partner_view.xml | 55 +++++++++ 14 files changed, 499 insertions(+) create mode 100644 partner_contact_department/README.rst create mode 100644 partner_contact_department/__init__.py create mode 100644 partner_contact_department/__openerp__.py create mode 100644 partner_contact_department/i18n/crm_department.pot create mode 100644 partner_contact_department/i18n/es.po create mode 100644 partner_contact_department/models/__init__.py create mode 100644 partner_contact_department/models/crm_department.py create mode 100644 partner_contact_department/models/crm_lead.py create mode 100644 partner_contact_department/models/res_partner.py create mode 100644 partner_contact_department/security/ir.model.access.csv create mode 100644 partner_contact_department/static/description/icon.png create mode 100644 partner_contact_department/views/crm_department_view.xml create mode 100644 partner_contact_department/views/crm_lead_view.xml create mode 100644 partner_contact_department/views/res_partner_view.xml diff --git a/partner_contact_department/README.rst b/partner_contact_department/README.rst new file mode 100644 index 000000000..34548936e --- /dev/null +++ b/partner_contact_department/README.rst @@ -0,0 +1,19 @@ +Department field in CRM contact +=============================== + +This module adds the concept of department to the CRM main objects (lead, +opportunity, partner), and propagate them through the workflow. + +Department is a drop-down field in lead, opportunity and partner forms. It +refers to contact department in its own company + +Departments available list must be defined first at +Sales > Configuration > Leads & Opportunities > Departments + +Credits +======= + +Contributors +------------ +* Pedro M. Baeza +* Antonio Espinosa diff --git a/partner_contact_department/__init__.py b/partner_contact_department/__init__.py new file mode 100644 index 000000000..054c8853d --- /dev/null +++ b/partner_contact_department/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in root directory +############################################################################## + +from . import models diff --git a/partner_contact_department/__openerp__.py b/partner_contact_department/__openerp__.py new file mode 100644 index 000000000..4ffb8fe2b --- /dev/null +++ b/partner_contact_department/__openerp__.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Odoo Source Management Solution +# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) +# Pedro M. Baeza +# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) +# Antonio Espinosa +# +# 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': 'Department field in CRM contact', + 'version': '1.0', + 'category': 'Customer Relationship Management', + 'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, ' + 'Antiun Ingeniería S.L.', + 'website': 'http://www.serviciosbaeza.com, http://www.antiun.com', + 'depends': [ + 'crm', + ], + 'data': [ + 'views/crm_department_view.xml', + 'views/crm_lead_view.xml', + 'views/res_partner_view.xml', + 'security/ir.model.access.csv', + ], + "installable": True, +} diff --git a/partner_contact_department/i18n/crm_department.pot b/partner_contact_department/i18n/crm_department.pot new file mode 100644 index 000000000..9a33d3ef9 --- /dev/null +++ b/partner_contact_department/i18n/crm_department.pot @@ -0,0 +1,108 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_partner_department +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-27 08:51+0000\n" +"PO-Revision-Date: 2015-05-27 08:51+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: crm_partner_department +#: field:crm.department,children:0 +msgid "Children" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,create_uid:0 +msgid "Created by" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,create_date:0 +msgid "Created on" +msgstr "" + +#. module: crm_partner_department +#: view:crm.lead:crm_partner_department.crm_case_form_view_leads_department +#: view:crm.lead:crm_partner_department.crm_case_form_view_oppor_department +#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department +#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department +#: field:crm.lead,department:0 +#: model:ir.model,name:crm_partner_department.model_crm_department +#: view:res.partner:crm_partner_department.view_partner_form_department +#: view:res.partner:crm_partner_department.view_res_partner_filter_department +#: field:res.partner,department:0 +msgid "Department" +msgstr "" + +#. module: crm_partner_department +#: view:crm.department:crm_partner_department.crm_department_tree_view +#: model:ir.actions.act_window,name:crm_partner_department.crm_department_action +#: model:ir.ui.menu,name:crm_partner_department.menu_crm_department +msgid "Departments" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,id:0 +msgid "ID" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,write_uid:0 +msgid "Last Updated by" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,write_date:0 +msgid "Last Updated on" +msgstr "" + +#. module: crm_partner_department +#: model:ir.model,name:crm_partner_department.model_crm_lead +msgid "Lead/Opportunity" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,name:0 +msgid "Name" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,parent_left:0 +msgid "Parent Left" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,parent_right:0 +msgid "Parent Right" +msgstr "" + +#. module: crm_partner_department +#: field:crm.department,parent_id:0 +msgid "Parent id" +msgstr "" + +#. module: crm_partner_department +#: model:ir.model,name:crm_partner_department.model_res_partner +msgid "Partner" +msgstr "" + +#. module: crm_partner_department +#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department +#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department +msgid "Sales Team" +msgstr "" + +#. module: crm_partner_department +#: view:res.partner:crm_partner_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "" + diff --git a/partner_contact_department/i18n/es.po b/partner_contact_department/i18n/es.po new file mode 100644 index 000000000..2c519e3c8 --- /dev/null +++ b/partner_contact_department/i18n/es.po @@ -0,0 +1,108 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_partner_department +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-27 08:51+0000\n" +"PO-Revision-Date: 2015-05-27 08:51+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: crm_partner_department +#: field:crm.department,children:0 +msgid "Children" +msgstr "Hijos" + +#. module: crm_partner_department +#: field:crm.department,create_uid:0 +msgid "Created by" +msgstr "Creado por" + +#. module: crm_partner_department +#: field:crm.department,create_date:0 +msgid "Created on" +msgstr "Creado en" + +#. module: crm_partner_department +#: view:crm.lead:crm_partner_department.crm_case_form_view_leads_department +#: view:crm.lead:crm_partner_department.crm_case_form_view_oppor_department +#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department +#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department +#: field:crm.lead,department:0 +#: model:ir.model,name:crm_partner_department.model_crm_department +#: view:res.partner:crm_partner_department.view_partner_form_department +#: view:res.partner:crm_partner_department.view_res_partner_filter_department +#: field:res.partner,department:0 +msgid "Department" +msgstr "Departamento" + +#. module: crm_partner_department +#: view:crm.department:crm_partner_department.crm_department_tree_view +#: model:ir.actions.act_window,name:crm_partner_department.crm_department_action +#: model:ir.ui.menu,name:crm_partner_department.menu_crm_department +msgid "Departments" +msgstr "Departamentos" + +#. module: crm_partner_department +#: field:crm.department,id:0 +msgid "ID" +msgstr "ID" + +#. module: crm_partner_department +#: field:crm.department,write_uid:0 +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: crm_partner_department +#: field:crm.department,write_date:0 +msgid "Last Updated on" +msgstr "Última actualización en" + +#. module: crm_partner_department +#: model:ir.model,name:crm_partner_department.model_crm_lead +msgid "Lead/Opportunity" +msgstr "Iniciativa/Oportunidad" + +#. module: crm_partner_department +#: field:crm.department,name:0 +msgid "Name" +msgstr "Nombre" + +#. module: crm_partner_department +#: field:crm.department,parent_left:0 +msgid "Parent Left" +msgstr "Padre Izquierdo" + +#. module: crm_partner_department +#: field:crm.department,parent_right:0 +msgid "Parent Right" +msgstr "Padre Derecho" + +#. module: crm_partner_department +#: field:crm.department,parent_id:0 +msgid "Parent id" +msgstr "ID Padre" + +#. module: crm_partner_department +#: model:ir.model,name:crm_partner_department.model_res_partner +msgid "Partner" +msgstr "Empresa" + +#. module: crm_partner_department +#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department +#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department +msgid "Sales Team" +msgstr "Equipo de ventas" + +#. module: crm_partner_department +#: view:res.partner:crm_partner_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "Comercial" + diff --git a/partner_contact_department/models/__init__.py b/partner_contact_department/models/__init__.py new file mode 100644 index 000000000..006c33b3b --- /dev/null +++ b/partner_contact_department/models/__init__.py @@ -0,0 +1,8 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in root directory +############################################################################## + +from . import crm_department +from . import crm_lead +from . import res_partner diff --git a/partner_contact_department/models/crm_department.py b/partner_contact_department/models/crm_department.py new file mode 100644 index 000000000..71bc4067e --- /dev/null +++ b/partner_contact_department/models/crm_department.py @@ -0,0 +1,20 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in root directory +############################################################################## +from openerp import models, fields + + +class CrmDepartment(models.Model): + _name = 'crm.department' + _order = "parent_left" + _parent_order = "name" + _parent_store = True + _description = "Department" + + name = fields.Char(required=True, translate=True) + parent_id = fields.Many2one(comodel_name='crm.department') + children = fields.One2many(comodel_name='crm.department', + inverse_name='parent_id') + parent_left = fields.Integer('Parent Left', select=True) + parent_right = fields.Integer('Parent Right', select=True) diff --git a/partner_contact_department/models/crm_lead.py b/partner_contact_department/models/crm_lead.py new file mode 100644 index 000000000..33fa82850 --- /dev/null +++ b/partner_contact_department/models/crm_lead.py @@ -0,0 +1,23 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in root directory +############################################################################## +from openerp import models, fields + + +class CrmLead(models.Model): + _inherit = 'crm.lead' + + department = fields.Many2one(comodel_name='crm.department') + + def _lead_create_contact(self, cr, uid, lead, name, is_company, + parent_id=False, context=None): + """Propagate department to created partner. + """ + partner_id = super(CrmLead, self)._lead_create_contact( + cr, uid, lead, name, is_company, parent_id=parent_id, + context=context) + self.pool['res.partner'].write( + cr, uid, partner_id, {'department': lead.department.id}, + context=context) + return partner_id diff --git a/partner_contact_department/models/res_partner.py b/partner_contact_department/models/res_partner.py new file mode 100644 index 000000000..b8c7cd3a8 --- /dev/null +++ b/partner_contact_department/models/res_partner.py @@ -0,0 +1,11 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in root directory +############################################################################## +from openerp import models, fields + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + department = fields.Many2one(comodel_name='crm.department') diff --git a/partner_contact_department/security/ir.model.access.csv b/partner_contact_department/security/ir.model.access.csv new file mode 100644 index 000000000..dc285f926 --- /dev/null +++ b/partner_contact_department/security/ir.model.access.csv @@ -0,0 +1,5 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_crm_department_public","crm_department group_public","model_crm_department","base.group_public",1,0,0,0 +"access_crm_department_portal","crm_department group_portal","model_crm_department","base.group_portal",1,0,0,0 +"access_crm_department_group_partner_manager","crm_department group_partner_manager","model_crm_department","base.group_partner_manager",1,1,1,1 +"access_crm_department_group_user","crm_department group_user","model_crm_department","base.group_user",1,0,0,0 diff --git a/partner_contact_department/static/description/icon.png b/partner_contact_department/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..add81b17a4847ff2663923593ecc364587d3dd9f GIT binary patch literal 22620 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%0A{Ckv_A`d0n`sc6nr@&!27fYc51Y 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 P00000NkvXXu0mjfiBcmQ literal 0 HcmV?d00001 diff --git a/partner_contact_department/views/crm_department_view.xml b/partner_contact_department/views/crm_department_view.xml new file mode 100644 index 000000000..981e7d7b7 --- /dev/null +++ b/partner_contact_department/views/crm_department_view.xml @@ -0,0 +1,30 @@ + + + + + + Departments + crm.department + form + tree + + + + CRM department tree + crm.department + + + + + + + + + + + + \ No newline at end of file diff --git a/partner_contact_department/views/crm_lead_view.xml b/partner_contact_department/views/crm_lead_view.xml new file mode 100644 index 000000000..6b4d289af --- /dev/null +++ b/partner_contact_department/views/crm_lead_view.xml @@ -0,0 +1,64 @@ + + + + + + Add department field + crm.lead + + + + + + + + + + Add department field for searching and grouping + crm.lead + + + + + + + + + + + + + Add department field + crm.lead + + + + + + + + + + Add department field for searching and grouping + crm.lead + + + + + + + + + + + + + \ No newline at end of file diff --git a/partner_contact_department/views/res_partner_view.xml b/partner_contact_department/views/res_partner_view.xml new file mode 100644 index 000000000..8856abd93 --- /dev/null +++ b/partner_contact_department/views/res_partner_view.xml @@ -0,0 +1,55 @@ + + + + + + Partner form with department + res.partner + + + + + + + + + + + + + + + Partner search with department + res.partner + + + + + + + + + + + + + \ No newline at end of file From 9adfdf80a6f13afaf7f75e4e8e4d49cd5ad34fe3 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 21 Dec 2015 17:27:10 +0100 Subject: [PATCH 2/8] Prepare for OCA. - Update translation. - Reduce garbage code. - Update license and copyright headers. - Improve README. - Drop CRM stuff. --- partner_contact_department/README.rst | 71 ++++++++++-- partner_contact_department/__init__.py | 11 +- partner_contact_department/__openerp__.py | 41 +++---- .../i18n/crm_department.pot | 108 ------------------ partner_contact_department/i18n/es.po | 107 ++++++++--------- partner_contact_department/models/__init__.py | 13 ++- .../models/crm_department.py | 20 ---- partner_contact_department/models/crm_lead.py | 23 ---- .../models/res_partner.py | 37 +++++- .../security/ir.model.access.csv | 8 +- .../views/crm_department_view.xml | 30 ----- .../views/crm_lead_view.xml | 64 ----------- .../views/res_partner_department_view.xml | 47 ++++++++ .../views/res_partner_view.xml | 36 +++--- 14 files changed, 235 insertions(+), 381 deletions(-) delete mode 100644 partner_contact_department/i18n/crm_department.pot delete mode 100644 partner_contact_department/models/crm_department.py delete mode 100644 partner_contact_department/models/crm_lead.py delete mode 100644 partner_contact_department/views/crm_department_view.xml delete mode 100644 partner_contact_department/views/crm_lead_view.xml create mode 100644 partner_contact_department/views/res_partner_department_view.xml diff --git a/partner_contact_department/README.rst b/partner_contact_department/README.rst index 34548936e..d142645b8 100644 --- a/partner_contact_department/README.rst +++ b/partner_contact_department/README.rst @@ -1,19 +1,74 @@ -Department field in CRM contact -=============================== +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 -This module adds the concept of department to the CRM main objects (lead, -opportunity, partner), and propagate them through the workflow. +================== +Contact department +================== -Department is a drop-down field in lead, opportunity and partner forms. It -refers to contact department in its own company +This module extends the functionality of the address book to support +departments. -Departments available list must be defined first at -Sales > Configuration > Leads & Opportunities > Departments +Department is a drop-down field in partner forms, and it refers to contact +department in its own company. + +Configuration +============= + +To configure departments, you need to: + +* Go to *Sales > Configuration > Address Book > Departments*. + +Usage +===== + +To use this module, you need to: + +* Go to any partner's form. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/134/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed `feedback +`_. Credits ======= +Images +------ + +* `Antiun Ingeniería S.L. `_: Icon. + Contributors ------------ + * Pedro M. Baeza * Antonio Espinosa +* Rafael Blasco +* Jairo Llopis + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/partner_contact_department/__init__.py b/partner_contact_department/__init__.py index 054c8853d..9af8488e4 100644 --- a/partner_contact_department/__init__.py +++ b/partner_contact_department/__init__.py @@ -1,6 +1,9 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) +# Pedro M. Baeza +# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) +# Antonio Espinosa +# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/partner_contact_department/__openerp__.py b/partner_contact_department/__openerp__.py index 4ffb8fe2b..a5323db87 100644 --- a/partner_contact_department/__openerp__.py +++ b/partner_contact_department/__openerp__.py @@ -1,42 +1,29 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Odoo Source Management Solution +# -*- coding: utf-8 -*- # Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) # Pedro M. Baeza # Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) # Antonio Espinosa -# -# 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 . -# -############################################################################## +# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - 'name': 'Department field in CRM contact', - 'version': '1.0', + 'name': 'Contact department', + "summary": "Assign contacts to departments", + 'version': '8.0.1.0.0', 'category': 'Customer Relationship Management', 'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, ' - 'Antiun Ingeniería S.L.', - 'website': 'http://www.serviciosbaeza.com, http://www.antiun.com', + 'Antiun Ingeniería S.L., ' + "Odoo Community Association (OCA)", + "license": "AGPL-3", + 'website': 'http://www.antiun.com', + "application": False, 'depends': [ - 'crm', + 'base', ], 'data': [ - 'views/crm_department_view.xml', - 'views/crm_lead_view.xml', - 'views/res_partner_view.xml', 'security/ir.model.access.csv', + 'views/res_partner_department_view.xml', + 'views/res_partner_view.xml', ], "installable": True, } diff --git a/partner_contact_department/i18n/crm_department.pot b/partner_contact_department/i18n/crm_department.pot deleted file mode 100644 index 9a33d3ef9..000000000 --- a/partner_contact_department/i18n/crm_department.pot +++ /dev/null @@ -1,108 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * crm_partner_department -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-27 08:51+0000\n" -"PO-Revision-Date: 2015-05-27 08:51+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: crm_partner_department -#: field:crm.department,children:0 -msgid "Children" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,create_uid:0 -msgid "Created by" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,create_date:0 -msgid "Created on" -msgstr "" - -#. module: crm_partner_department -#: view:crm.lead:crm_partner_department.crm_case_form_view_leads_department -#: view:crm.lead:crm_partner_department.crm_case_form_view_oppor_department -#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department -#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department -#: field:crm.lead,department:0 -#: model:ir.model,name:crm_partner_department.model_crm_department -#: view:res.partner:crm_partner_department.view_partner_form_department -#: view:res.partner:crm_partner_department.view_res_partner_filter_department -#: field:res.partner,department:0 -msgid "Department" -msgstr "" - -#. module: crm_partner_department -#: view:crm.department:crm_partner_department.crm_department_tree_view -#: model:ir.actions.act_window,name:crm_partner_department.crm_department_action -#: model:ir.ui.menu,name:crm_partner_department.menu_crm_department -msgid "Departments" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,id:0 -msgid "ID" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,write_uid:0 -msgid "Last Updated by" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,write_date:0 -msgid "Last Updated on" -msgstr "" - -#. module: crm_partner_department -#: model:ir.model,name:crm_partner_department.model_crm_lead -msgid "Lead/Opportunity" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,name:0 -msgid "Name" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,parent_left:0 -msgid "Parent Left" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,parent_right:0 -msgid "Parent Right" -msgstr "" - -#. module: crm_partner_department -#: field:crm.department,parent_id:0 -msgid "Parent id" -msgstr "" - -#. module: crm_partner_department -#: model:ir.model,name:crm_partner_department.model_res_partner -msgid "Partner" -msgstr "" - -#. module: crm_partner_department -#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department -#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department -msgid "Sales Team" -msgstr "" - -#. module: crm_partner_department -#: view:res.partner:crm_partner_department.view_res_partner_filter_department -msgid "Salesperson" -msgstr "" - diff --git a/partner_contact_department/i18n/es.po b/partner_contact_department/i18n/es.po index 2c519e3c8..e3c3ae378 100644 --- a/partner_contact_department/i18n/es.po +++ b/partner_contact_department/i18n/es.po @@ -6,103 +6,88 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-27 08:51+0000\n" -"PO-Revision-Date: 2015-05-27 08:51+0000\n" +"POT-Creation-Date: 2015-12-21 16:54+0100\n" +"PO-Revision-Date: 2015-12-21 16:55+0100\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" +"X-Generator: Poedit 1.8.5\n" -#. module: crm_partner_department -#: field:crm.department,children:0 -msgid "Children" -msgstr "Hijos" +#. module: partner_contact_department +#: field:res.partner.department,child_ids:0 +msgid "Child departments" +msgstr "Departamentos hijo" -#. module: crm_partner_department -#: field:crm.department,create_uid:0 +#. module: partner_contact_department +#: field:res.partner.department,create_uid:0 msgid "Created by" msgstr "Creado por" -#. module: crm_partner_department -#: field:crm.department,create_date:0 +#. module: partner_contact_department +#: field:res.partner.department,create_date:0 msgid "Created on" msgstr "Creado en" -#. module: crm_partner_department -#: view:crm.lead:crm_partner_department.crm_case_form_view_leads_department -#: view:crm.lead:crm_partner_department.crm_case_form_view_oppor_department -#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department -#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department -#: field:crm.lead,department:0 -#: model:ir.model,name:crm_partner_department.model_crm_department -#: view:res.partner:crm_partner_department.view_partner_form_department -#: view:res.partner:crm_partner_department.view_res_partner_filter_department -#: field:res.partner,department:0 +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner_department +#: view:res.partner:partner_contact_department.view_partner_form_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +#: field:res.partner,department_id:0 msgid "Department" msgstr "Departamento" -#. module: crm_partner_department -#: view:crm.department:crm_partner_department.crm_department_tree_view -#: model:ir.actions.act_window,name:crm_partner_department.crm_department_action -#: model:ir.ui.menu,name:crm_partner_department.menu_crm_department +#. module: partner_contact_department +#: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action +#: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department +#: view:res.partner.department:partner_contact_department.res_partner_department_tree_view msgid "Departments" msgstr "Departamentos" -#. module: crm_partner_department -#: field:crm.department,id:0 +#. module: partner_contact_department +#: field:res.partner.department,id:0 msgid "ID" msgstr "ID" -#. module: crm_partner_department -#: field:crm.department,write_uid:0 +#. module: partner_contact_department +#: field:res.partner.department,write_uid:0 msgid "Last Updated by" msgstr "Última actualización por" -#. module: crm_partner_department -#: field:crm.department,write_date:0 +#. module: partner_contact_department +#: field:res.partner.department,write_date:0 msgid "Last Updated on" msgstr "Última actualización en" -#. module: crm_partner_department -#: model:ir.model,name:crm_partner_department.model_crm_lead -msgid "Lead/Opportunity" -msgstr "Iniciativa/Oportunidad" - -#. module: crm_partner_department -#: field:crm.department,name:0 +#. module: partner_contact_department +#: field:res.partner.department,name:0 msgid "Name" msgstr "Nombre" -#. module: crm_partner_department -#: field:crm.department,parent_left:0 -msgid "Parent Left" -msgstr "Padre Izquierdo" +#. module: partner_contact_department +#: field:res.partner.department,parent_id:0 +msgid "Parent department" +msgstr "Departamento padre" -#. module: crm_partner_department -#: field:crm.department,parent_right:0 -msgid "Parent Right" -msgstr "Padre Derecho" +#. module: partner_contact_department +#: field:res.partner.department,parent_left:0 +msgid "Parent left" +msgstr "Padre izquierdo" -#. module: crm_partner_department -#: field:crm.department,parent_id:0 -msgid "Parent id" -msgstr "ID Padre" +#. module: partner_contact_department +#: field:res.partner.department,parent_right:0 +msgid "Parent right" +msgstr "Padre derecho" -#. module: crm_partner_department -#: model:ir.model,name:crm_partner_department.model_res_partner +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner msgid "Partner" msgstr "Empresa" -#. module: crm_partner_department -#: view:crm.lead:crm_partner_department.view_crm_case_leads_filter_department -#: view:crm.lead:crm_partner_department.view_crm_case_opportunities_filter_department -msgid "Sales Team" -msgstr "Equipo de ventas" - -#. module: crm_partner_department -#: view:res.partner:crm_partner_department.view_res_partner_filter_department +#. module: partner_contact_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department msgid "Salesperson" msgstr "Comercial" - diff --git a/partner_contact_department/models/__init__.py b/partner_contact_department/models/__init__.py index 006c33b3b..213b25fdc 100644 --- a/partner_contact_department/models/__init__.py +++ b/partner_contact_department/models/__init__.py @@ -1,8 +1,9 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) +# Pedro M. Baeza +# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) +# Antonio Espinosa +# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import crm_department -from . import crm_lead from . import res_partner diff --git a/partner_contact_department/models/crm_department.py b/partner_contact_department/models/crm_department.py deleted file mode 100644 index 71bc4067e..000000000 --- a/partner_contact_department/models/crm_department.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## -from openerp import models, fields - - -class CrmDepartment(models.Model): - _name = 'crm.department' - _order = "parent_left" - _parent_order = "name" - _parent_store = True - _description = "Department" - - name = fields.Char(required=True, translate=True) - parent_id = fields.Many2one(comodel_name='crm.department') - children = fields.One2many(comodel_name='crm.department', - inverse_name='parent_id') - parent_left = fields.Integer('Parent Left', select=True) - parent_right = fields.Integer('Parent Right', select=True) diff --git a/partner_contact_department/models/crm_lead.py b/partner_contact_department/models/crm_lead.py deleted file mode 100644 index 33fa82850..000000000 --- a/partner_contact_department/models/crm_lead.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## -from openerp import models, fields - - -class CrmLead(models.Model): - _inherit = 'crm.lead' - - department = fields.Many2one(comodel_name='crm.department') - - def _lead_create_contact(self, cr, uid, lead, name, is_company, - parent_id=False, context=None): - """Propagate department to created partner. - """ - partner_id = super(CrmLead, self)._lead_create_contact( - cr, uid, lead, name, is_company, parent_id=parent_id, - context=context) - self.pool['res.partner'].write( - cr, uid, partner_id, {'department': lead.department.id}, - context=context) - return partner_id diff --git a/partner_contact_department/models/res_partner.py b/partner_contact_department/models/res_partner.py index b8c7cd3a8..20e2cfd27 100644 --- a/partner_contact_department/models/res_partner.py +++ b/partner_contact_department/models/res_partner.py @@ -1,11 +1,38 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# -*- coding: utf-8 -*- +# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) +# Pedro M. Baeza +# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) +# Antonio Espinosa +# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from openerp import models, fields class ResPartner(models.Model): _inherit = 'res.partner' - department = fields.Many2one(comodel_name='crm.department') + department_id = fields.Many2one( + "res.partner.department", + "Department", + oldname="department") + + +class ResPartnerDepartment(models.Model): + _name = 'res.partner.department' + _order = "parent_left" + _parent_order = "name" + _parent_store = True + _description = "Department" + + name = fields.Char(required=True, translate=True) + parent_id = fields.Many2one( + "res.partner.department", + "Parent department") + child_ids = fields.One2many( + "res.partner.department", + "parent_id", + "Child departments", + oldname="children") + parent_left = fields.Integer(index=True) + parent_right = fields.Integer(index=True) diff --git a/partner_contact_department/security/ir.model.access.csv b/partner_contact_department/security/ir.model.access.csv index dc285f926..9a73e7a61 100644 --- a/partner_contact_department/security/ir.model.access.csv +++ b/partner_contact_department/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_crm_department_public","crm_department group_public","model_crm_department","base.group_public",1,0,0,0 -"access_crm_department_portal","crm_department group_portal","model_crm_department","base.group_portal",1,0,0,0 -"access_crm_department_group_partner_manager","crm_department group_partner_manager","model_crm_department","base.group_partner_manager",1,1,1,1 -"access_crm_department_group_user","crm_department group_user","model_crm_department","base.group_user",1,0,0,0 +"access_res_partner_department_public","res_partner_department group_public","model_res_partner_department","base.group_public",1,0,0,0 +"access_res_partner_department_portal","res_partner_department group_portal","model_res_partner_department","base.group_portal",1,0,0,0 +"access_res_partner_department_group_partner_manager","res_partner_department group_partner_manager","model_res_partner_department","base.group_partner_manager",1,1,1,1 +"access_res_partner_department_group_user","res_partner_department group_user","model_res_partner_department","base.group_user",1,0,0,0 diff --git a/partner_contact_department/views/crm_department_view.xml b/partner_contact_department/views/crm_department_view.xml deleted file mode 100644 index 981e7d7b7..000000000 --- a/partner_contact_department/views/crm_department_view.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Departments - crm.department - form - tree - - - - CRM department tree - crm.department - - - - - - - - - - - - \ No newline at end of file diff --git a/partner_contact_department/views/crm_lead_view.xml b/partner_contact_department/views/crm_lead_view.xml deleted file mode 100644 index 6b4d289af..000000000 --- a/partner_contact_department/views/crm_lead_view.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - Add department field - crm.lead - - - - - - - - - - Add department field for searching and grouping - crm.lead - - - - - - - - - - - - - Add department field - crm.lead - - - - - - - - - - Add department field for searching and grouping - crm.lead - - - - - - - - - - - - - \ No newline at end of file diff --git a/partner_contact_department/views/res_partner_department_view.xml b/partner_contact_department/views/res_partner_department_view.xml new file mode 100644 index 000000000..f7aae91f9 --- /dev/null +++ b/partner_contact_department/views/res_partner_department_view.xml @@ -0,0 +1,47 @@ + + + + + + + + Departments + res.partner.department + form + tree + + + + CRM department tree + res.partner.department + + + + + + + + + + CRM department form + res.partner.department + +
+ + + + + +
+ + + + + + + diff --git a/partner_contact_department/views/res_partner_view.xml b/partner_contact_department/views/res_partner_view.xml index 8856abd93..108a2415e 100644 --- a/partner_contact_department/views/res_partner_view.xml +++ b/partner_contact_department/views/res_partner_view.xml @@ -1,4 +1,9 @@ + + @@ -7,14 +12,16 @@ res.partner - - + - - - + + + @@ -22,34 +29,21 @@ - - Partner search with department res.partner - + + context="{'group_by': 'department_id'}"/> - \ No newline at end of file + From 83d652b6b7ea4169930b798c2273cbe27f6477e9 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 22 Dec 2015 16:08:30 +0100 Subject: [PATCH 3/8] Improve README. --- partner_contact_department/README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/partner_contact_department/README.rst b/partner_contact_department/README.rst index d142645b8..f15fcdce0 100644 --- a/partner_contact_department/README.rst +++ b/partner_contact_department/README.rst @@ -25,6 +25,7 @@ Usage To use this module, you need to: * Go to any partner's form. +* You will find the new *Department* field below *Job Position*. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot From 7aecd8c7ac9839271efcfe9f4f10c3c3b4f3a594 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 9 Jan 2016 16:44:18 -0500 Subject: [PATCH 4/8] OCA Transbot updated translations from Transifex --- partner_contact_department/i18n/de.po | 94 +++++++++++++++++++++++++++ partner_contact_department/i18n/en.po | 93 ++++++++++++++++++++++++++ partner_contact_department/i18n/sl.po | 94 +++++++++++++++++++++++++++ 3 files changed, 281 insertions(+) create mode 100644 partner_contact_department/i18n/de.po create mode 100644 partner_contact_department/i18n/en.po create mode 100644 partner_contact_department/i18n/sl.po diff --git a/partner_contact_department/i18n/de.po b/partner_contact_department/i18n/de.po new file mode 100644 index 000000000..779e6c5fe --- /dev/null +++ b/partner_contact_department/i18n/de.po @@ -0,0 +1,94 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * partner_contact_department +# +# Translators: +# Rudolf Schnapka , 2016 +msgid "" +msgstr "" +"Project-Id-Version: partner-contact (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-19 01:46+0000\n" +"PO-Revision-Date: 2016-01-18 16:40+0000\n" +"Last-Translator: Rudolf Schnapka \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: partner_contact_department +#: field:res.partner.department,child_ids:0 +msgid "Child departments" +msgstr "Unter-Abteilungen" + +#. module: partner_contact_department +#: field:res.partner.department,create_uid:0 +msgid "Created by" +msgstr "Angelegt durch" + +#. module: partner_contact_department +#: field:res.partner.department,create_date:0 +msgid "Created on" +msgstr "Angelegt am" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner_department +#: view:res.partner:partner_contact_department.view_partner_form_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +#: field:res.partner,department_id:0 +msgid "Department" +msgstr "Abteilung" + +#. module: partner_contact_department +#: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action +#: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department +#: view:res.partner.department:partner_contact_department.res_partner_department_tree_view +msgid "Departments" +msgstr "Abteilungen" + +#. module: partner_contact_department +#: field:res.partner.department,id:0 +msgid "ID" +msgstr "ID" + +#. module: partner_contact_department +#: field:res.partner.department,write_uid:0 +msgid "Last Updated by" +msgstr "Zuletzt aktualisiert durch" + +#. module: partner_contact_department +#: field:res.partner.department,write_date:0 +msgid "Last Updated on" +msgstr "Zuletzt aktualisiert am" + +#. module: partner_contact_department +#: field:res.partner.department,name:0 +msgid "Name" +msgstr "Bezeichnung" + +#. module: partner_contact_department +#: field:res.partner.department,parent_id:0 +msgid "Parent department" +msgstr "Übergeordnete Abteilung" + +#. module: partner_contact_department +#: field:res.partner.department,parent_left:0 +msgid "Parent left" +msgstr "Links übergeordnet" + +#. module: partner_contact_department +#: field:res.partner.department,parent_right:0 +msgid "Parent right" +msgstr "Rechts übergeordnet" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: partner_contact_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "Verkäufer" diff --git a/partner_contact_department/i18n/en.po b/partner_contact_department/i18n/en.po new file mode 100644 index 000000000..66faf09ba --- /dev/null +++ b/partner_contact_department/i18n/en.po @@ -0,0 +1,93 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * partner_contact_department +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: partner-contact (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-08 01:38+0000\n" +"PO-Revision-Date: 2015-12-22 15:56+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: English (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: partner_contact_department +#: field:res.partner.department,child_ids:0 +msgid "Child departments" +msgstr "Child departments" + +#. module: partner_contact_department +#: field:res.partner.department,create_uid:0 +msgid "Created by" +msgstr "Created by" + +#. module: partner_contact_department +#: field:res.partner.department,create_date:0 +msgid "Created on" +msgstr "Created on" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner_department +#: view:res.partner:partner_contact_department.view_partner_form_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +#: field:res.partner,department_id:0 +msgid "Department" +msgstr "Department" + +#. module: partner_contact_department +#: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action +#: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department +#: view:res.partner.department:partner_contact_department.res_partner_department_tree_view +msgid "Departments" +msgstr "Departments" + +#. module: partner_contact_department +#: field:res.partner.department,id:0 +msgid "ID" +msgstr "ID" + +#. module: partner_contact_department +#: field:res.partner.department,write_uid:0 +msgid "Last Updated by" +msgstr "Last Updated by" + +#. module: partner_contact_department +#: field:res.partner.department,write_date:0 +msgid "Last Updated on" +msgstr "Last Updated on" + +#. module: partner_contact_department +#: field:res.partner.department,name:0 +msgid "Name" +msgstr "Name" + +#. module: partner_contact_department +#: field:res.partner.department,parent_id:0 +msgid "Parent department" +msgstr "Parent department" + +#. module: partner_contact_department +#: field:res.partner.department,parent_left:0 +msgid "Parent left" +msgstr "Parent left" + +#. module: partner_contact_department +#: field:res.partner.department,parent_right:0 +msgid "Parent right" +msgstr "Parent right" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: partner_contact_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "Salesperson" diff --git a/partner_contact_department/i18n/sl.po b/partner_contact_department/i18n/sl.po new file mode 100644 index 000000000..c236cc7aa --- /dev/null +++ b/partner_contact_department/i18n/sl.po @@ -0,0 +1,94 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * partner_contact_department +# +# Translators: +# Matjaž Mozetič , 2015 +msgid "" +msgstr "" +"Project-Id-Version: partner-contact (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-08 01:38+0000\n" +"PO-Revision-Date: 2015-12-23 14:13+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: partner_contact_department +#: field:res.partner.department,child_ids:0 +msgid "Child departments" +msgstr "Podrejeni oddelki" + +#. module: partner_contact_department +#: field:res.partner.department,create_uid:0 +msgid "Created by" +msgstr "Ustvaril" + +#. module: partner_contact_department +#: field:res.partner.department,create_date:0 +msgid "Created on" +msgstr "Ustvarjeno" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner_department +#: view:res.partner:partner_contact_department.view_partner_form_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +#: field:res.partner,department_id:0 +msgid "Department" +msgstr "Oddelek" + +#. module: partner_contact_department +#: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action +#: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department +#: view:res.partner.department:partner_contact_department.res_partner_department_tree_view +msgid "Departments" +msgstr "Oddelki" + +#. module: partner_contact_department +#: field:res.partner.department,id:0 +msgid "ID" +msgstr "ID" + +#. module: partner_contact_department +#: field:res.partner.department,write_uid:0 +msgid "Last Updated by" +msgstr "Zadnji posodobil" + +#. module: partner_contact_department +#: field:res.partner.department,write_date:0 +msgid "Last Updated on" +msgstr "Zadnjič posodobljeno" + +#. module: partner_contact_department +#: field:res.partner.department,name:0 +msgid "Name" +msgstr "Naziv" + +#. module: partner_contact_department +#: field:res.partner.department,parent_id:0 +msgid "Parent department" +msgstr "Nadrejeni oddelek" + +#. module: partner_contact_department +#: field:res.partner.department,parent_left:0 +msgid "Parent left" +msgstr "Levo nadrejeni" + +#. module: partner_contact_department +#: field:res.partner.department,parent_right:0 +msgid "Parent right" +msgstr "Desno nadrejeni" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: partner_contact_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "Prodajalec" From 1f93c75c37fbbc884d4eb42ced29b32528beef20 Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Sun, 24 Jan 2016 23:34:00 -0800 Subject: [PATCH 5/8] Add ondelete option to parent_id, runbot fails to lack of attribute. --- partner_contact_department/models/res_partner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/partner_contact_department/models/res_partner.py b/partner_contact_department/models/res_partner.py index 20e2cfd27..0bf3eb793 100644 --- a/partner_contact_department/models/res_partner.py +++ b/partner_contact_department/models/res_partner.py @@ -28,7 +28,8 @@ class ResPartnerDepartment(models.Model): name = fields.Char(required=True, translate=True) parent_id = fields.Many2one( "res.partner.department", - "Parent department") + "Parent department", + ondelete='cascade') child_ids = fields.One2many( "res.partner.department", "parent_id", From 3dbfede4233011b16ed3736edd4026bc3029be28 Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Mon, 25 Jan 2016 02:22:26 -0800 Subject: [PATCH 6/8] Update ondelete to restrict. --- partner_contact_department/models/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partner_contact_department/models/res_partner.py b/partner_contact_department/models/res_partner.py index 0bf3eb793..5efdd40c0 100644 --- a/partner_contact_department/models/res_partner.py +++ b/partner_contact_department/models/res_partner.py @@ -29,7 +29,7 @@ class ResPartnerDepartment(models.Model): parent_id = fields.Many2one( "res.partner.department", "Parent department", - ondelete='cascade') + ondelete='restrict') child_ids = fields.One2many( "res.partner.department", "parent_id", From 63b26001bab997600a1c25ec65d690e644abe904 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 30 Jan 2016 17:16:15 -0500 Subject: [PATCH 7/8] OCA Transbot updated translations from Transifex --- partner_contact_department/i18n/es.po | 33 ++++--- .../i18n/{en.po => fi.po} | 34 +++---- partner_contact_department/i18n/it.po | 94 +++++++++++++++++++ partner_contact_department/i18n/sl.po | 16 +++- 4 files changed, 146 insertions(+), 31 deletions(-) rename partner_contact_department/i18n/{en.po => fi.po} (82%) create mode 100644 partner_contact_department/i18n/it.po diff --git a/partner_contact_department/i18n/es.po b/partner_contact_department/i18n/es.po index e3c3ae378..7c422d0cc 100644 --- a/partner_contact_department/i18n/es.po +++ b/partner_contact_department/i18n/es.po @@ -1,21 +1,22 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * crm_partner_department -# +# * partner_contact_department +# +# Translators: +# Oihane Crucelaegui , 2016 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: partner-contact (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-21 16:54+0100\n" -"PO-Revision-Date: 2015-12-21 16:55+0100\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"Language: es\n" +"POT-Creation-Date: 2016-07-25 11:58+0000\n" +"PO-Revision-Date: 2016-07-14 09:05+0000\n" +"Last-Translator: Oihane Crucelaegui \n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"X-Generator: Poedit 1.8.5\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: partner_contact_department #: field:res.partner.department,child_ids:0 @@ -47,11 +48,21 @@ msgstr "Departamento" msgid "Departments" msgstr "Departamentos" +#. module: partner_contact_department +#: field:res.partner.department,display_name:0 +msgid "Display Name" +msgstr "Nombre mostrado" + #. module: partner_contact_department #: field:res.partner.department,id:0 msgid "ID" msgstr "ID" +#. module: partner_contact_department +#: field:res.partner.department,__last_update:0 +msgid "Last Modified on" +msgstr "Última modificación el" + #. module: partner_contact_department #: field:res.partner.department,write_uid:0 msgid "Last Updated by" diff --git a/partner_contact_department/i18n/en.po b/partner_contact_department/i18n/fi.po similarity index 82% rename from partner_contact_department/i18n/en.po rename to partner_contact_department/i18n/fi.po index 66faf09ba..004f29ba6 100644 --- a/partner_contact_department/i18n/en.po +++ b/partner_contact_department/i18n/fi.po @@ -7,30 +7,30 @@ msgid "" msgstr "" "Project-Id-Version: partner-contact (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-08 01:38+0000\n" +"POT-Creation-Date: 2016-01-19 01:46+0000\n" "PO-Revision-Date: 2015-12-22 15:56+0000\n" -"Last-Translator: OCA Transbot \n" -"Language-Team: English (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/en/)\n" +"Last-Translator: <>\n" +"Language-Team: Finnish (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: en\n" +"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: partner_contact_department #: field:res.partner.department,child_ids:0 msgid "Child departments" -msgstr "Child departments" +msgstr "" #. module: partner_contact_department #: field:res.partner.department,create_uid:0 msgid "Created by" -msgstr "Created by" +msgstr "Luonut" #. module: partner_contact_department #: field:res.partner.department,create_date:0 msgid "Created on" -msgstr "Created on" +msgstr "Luotu" #. module: partner_contact_department #: model:ir.model,name:partner_contact_department.model_res_partner_department @@ -38,14 +38,14 @@ msgstr "Created on" #: view:res.partner:partner_contact_department.view_res_partner_filter_department #: field:res.partner,department_id:0 msgid "Department" -msgstr "Department" +msgstr "" #. module: partner_contact_department #: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action #: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department #: view:res.partner.department:partner_contact_department.res_partner_department_tree_view msgid "Departments" -msgstr "Departments" +msgstr "" #. module: partner_contact_department #: field:res.partner.department,id:0 @@ -55,39 +55,39 @@ msgstr "ID" #. module: partner_contact_department #: field:res.partner.department,write_uid:0 msgid "Last Updated by" -msgstr "Last Updated by" +msgstr "Viimeksi päivitetty" #. module: partner_contact_department #: field:res.partner.department,write_date:0 msgid "Last Updated on" -msgstr "Last Updated on" +msgstr "Viimeksi päivittänyt" #. module: partner_contact_department #: field:res.partner.department,name:0 msgid "Name" -msgstr "Name" +msgstr "Nimi" #. module: partner_contact_department #: field:res.partner.department,parent_id:0 msgid "Parent department" -msgstr "Parent department" +msgstr "" #. module: partner_contact_department #: field:res.partner.department,parent_left:0 msgid "Parent left" -msgstr "Parent left" +msgstr "" #. module: partner_contact_department #: field:res.partner.department,parent_right:0 msgid "Parent right" -msgstr "Parent right" +msgstr "" #. module: partner_contact_department #: model:ir.model,name:partner_contact_department.model_res_partner msgid "Partner" -msgstr "Partner" +msgstr "Kumppani" #. module: partner_contact_department #: view:res.partner:partner_contact_department.view_res_partner_filter_department msgid "Salesperson" -msgstr "Salesperson" +msgstr "Myyjä" diff --git a/partner_contact_department/i18n/it.po b/partner_contact_department/i18n/it.po new file mode 100644 index 000000000..5bae950e7 --- /dev/null +++ b/partner_contact_department/i18n/it.po @@ -0,0 +1,94 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * partner_contact_department +# +# Translators: +# Paolo Valier, 2016 +msgid "" +msgstr "" +"Project-Id-Version: partner-contact (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-13 00:57+0000\n" +"PO-Revision-Date: 2016-03-13 17:22+0000\n" +"Last-Translator: Paolo Valier\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: partner_contact_department +#: field:res.partner.department,child_ids:0 +msgid "Child departments" +msgstr "" + +#. module: partner_contact_department +#: field:res.partner.department,create_uid:0 +msgid "Created by" +msgstr "Creato da" + +#. module: partner_contact_department +#: field:res.partner.department,create_date:0 +msgid "Created on" +msgstr "Creato il" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner_department +#: view:res.partner:partner_contact_department.view_partner_form_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +#: field:res.partner,department_id:0 +msgid "Department" +msgstr "" + +#. module: partner_contact_department +#: model:ir.actions.act_window,name:partner_contact_department.res_partner_department_action +#: model:ir.ui.menu,name:partner_contact_department.menu_res_partner_department +#: view:res.partner.department:partner_contact_department.res_partner_department_tree_view +msgid "Departments" +msgstr "" + +#. module: partner_contact_department +#: field:res.partner.department,id:0 +msgid "ID" +msgstr "ID" + +#. module: partner_contact_department +#: field:res.partner.department,write_uid:0 +msgid "Last Updated by" +msgstr "Ultimo aggiornamento di" + +#. module: partner_contact_department +#: field:res.partner.department,write_date:0 +msgid "Last Updated on" +msgstr "Ultimo aggiornamento il" + +#. module: partner_contact_department +#: field:res.partner.department,name:0 +msgid "Name" +msgstr "Nome" + +#. module: partner_contact_department +#: field:res.partner.department,parent_id:0 +msgid "Parent department" +msgstr "" + +#. module: partner_contact_department +#: field:res.partner.department,parent_left:0 +msgid "Parent left" +msgstr "" + +#. module: partner_contact_department +#: field:res.partner.department,parent_right:0 +msgid "Parent right" +msgstr "" + +#. module: partner_contact_department +#: model:ir.model,name:partner_contact_department.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: partner_contact_department +#: view:res.partner:partner_contact_department.view_res_partner_filter_department +msgid "Salesperson" +msgstr "" diff --git a/partner_contact_department/i18n/sl.po b/partner_contact_department/i18n/sl.po index c236cc7aa..717fc20c1 100644 --- a/partner_contact_department/i18n/sl.po +++ b/partner_contact_department/i18n/sl.po @@ -3,13 +3,13 @@ # * partner_contact_department # # Translators: -# Matjaž Mozetič , 2015 +# Matjaž Mozetič , 2015-2016 msgid "" msgstr "" "Project-Id-Version: partner-contact (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-08 01:38+0000\n" -"PO-Revision-Date: 2015-12-23 14:13+0000\n" +"POT-Creation-Date: 2016-05-07 07:18+0000\n" +"PO-Revision-Date: 2016-05-07 07:15+0000\n" "Last-Translator: Matjaž Mozetič \n" "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/sl/)\n" "MIME-Version: 1.0\n" @@ -48,11 +48,21 @@ msgstr "Oddelek" msgid "Departments" msgstr "Oddelki" +#. module: partner_contact_department +#: field:res.partner.department,display_name:0 +msgid "Display Name" +msgstr "Prikazni naziv" + #. module: partner_contact_department #: field:res.partner.department,id:0 msgid "ID" msgstr "ID" +#. module: partner_contact_department +#: field:res.partner.department,__last_update:0 +msgid "Last Modified on" +msgstr "Zadnjič spremenjeno" + #. module: partner_contact_department #: field:res.partner.department,write_uid:0 msgid "Last Updated by" From 5e09fe024b7f2f6d04595d7d0a4507a4d6fdc138 Mon Sep 17 00:00:00 2001 From: cubells Date: Sat, 12 Nov 2016 17:20:05 +0100 Subject: [PATCH 8/8] [MIG] partner_contact_department * Add tests * Other minor changes --- partner_contact_department/README.rst | 11 +-- partner_contact_department/__init__.py | 7 +- partner_contact_department/__openerp__.py | 16 ++-- partner_contact_department/models/__init__.py | 7 +- .../models/res_partner.py | 16 ++-- partner_contact_department/tests/__init__.py | 5 ++ .../tests/test_recursion.py | 31 +++++++ .../views/res_partner_department_view.xml | 75 ++++++++--------- .../views/res_partner_view.xml | 84 +++++++++---------- 9 files changed, 137 insertions(+), 115 deletions(-) create mode 100644 partner_contact_department/tests/__init__.py create mode 100644 partner_contact_department/tests/test_recursion.py diff --git a/partner_contact_department/README.rst b/partner_contact_department/README.rst index f15fcdce0..85d5a154f 100644 --- a/partner_contact_department/README.rst +++ b/partner_contact_department/README.rst @@ -29,7 +29,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/134/8.0 + :target: https://runbot.odoo-community.org/runbot/134/9.0 Bug Tracker =========== @@ -37,11 +37,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= @@ -49,7 +45,7 @@ Credits Images ------ -* `Antiun Ingeniería S.L. `_: Icon. +* Odoo Community Association: `Icon `_. Contributors ------------ @@ -58,6 +54,7 @@ Contributors * Antonio Espinosa * Rafael Blasco * Jairo Llopis +* Vicent Cubells Maintainer ---------- diff --git a/partner_contact_department/__init__.py b/partner_contact_department/__init__.py index 9af8488e4..44de80558 100644 --- a/partner_contact_department/__init__.py +++ b/partner_contact_department/__init__.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) -# Pedro M. Baeza -# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) -# Antonio Espinosa -# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# © 2014-2015 Tecnativa S.L. - Jairo Llopis +# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/partner_contact_department/__openerp__.py b/partner_contact_department/__openerp__.py index a5323db87..080b98a55 100644 --- a/partner_contact_department/__openerp__.py +++ b/partner_contact_department/__openerp__.py @@ -1,21 +1,17 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) -# Pedro M. Baeza -# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) -# Antonio Espinosa -# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# © 2014-2015 Tecnativa S.L. - Jairo Llopis +# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Contact department', "summary": "Assign contacts to departments", - 'version': '8.0.1.0.0', + 'version': '9.0.1.0.0', 'category': 'Customer Relationship Management', - 'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, ' - 'Antiun Ingeniería S.L., ' - "Odoo Community Association (OCA)", + 'author': 'Tecnativa, ' + 'Odoo Community Association (OCA)', "license": "AGPL-3", - 'website': 'http://www.antiun.com', + 'website': 'http://www.tecnativa.com', "application": False, 'depends': [ 'base', diff --git a/partner_contact_department/models/__init__.py b/partner_contact_department/models/__init__.py index 213b25fdc..6393dbaea 100644 --- a/partner_contact_department/models/__init__.py +++ b/partner_contact_department/models/__init__.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) -# Pedro M. Baeza -# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) -# Antonio Espinosa -# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# © 2014-2015 Tecnativa S.L. - Jairo Llopis +# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import res_partner diff --git a/partner_contact_department/models/res_partner.py b/partner_contact_department/models/res_partner.py index 5efdd40c0..94946ae8f 100644 --- a/partner_contact_department/models/res_partner.py +++ b/partner_contact_department/models/res_partner.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com) -# Pedro M. Baeza -# Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com) -# Antonio Espinosa -# © 2015 Antiun Ingeniería S.L. - Jairo Llopis +# © 2014-2015 Tecnativa S.L. - Jairo Llopis +# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields +from openerp import models, fields, api, _ +from openerp.exceptions import ValidationError class ResPartner(models.Model): @@ -37,3 +35,9 @@ class ResPartnerDepartment(models.Model): oldname="children") parent_left = fields.Integer(index=True) parent_right = fields.Integer(index=True) + + @api.constrains('parent_id') + def _check_parent_id(self): + if not self._check_recursion(): + raise ValidationError( + _('Error! You cannot create recursive departments.')) diff --git a/partner_contact_department/tests/__init__.py b/partner_contact_department/tests/__init__.py new file mode 100644 index 000000000..7630da7d4 --- /dev/null +++ b/partner_contact_department/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl-3.0). + +from . import test_recursion diff --git a/partner_contact_department/tests/test_recursion.py b/partner_contact_department/tests/test_recursion.py new file mode 100644 index 000000000..90204dd0b --- /dev/null +++ b/partner_contact_department/tests/test_recursion.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# © 2016 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl-3.0). +from openerp.tests import common +from openerp.exceptions import ValidationError + + +class TestRecursion(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestRecursion, cls).setUpClass() + cls.department_obj = cls.env['res.partner.department'] + + # Instances + cls.dpt1 = cls.department_obj.create(vals=dict(name='Dpt. 1')) + cls.dpt2 = cls.department_obj.create( + vals=dict( + name='Dpt. 2', + parent_id=cls.dpt1.id + )) + + def test_recursion(self): + """ Testing recursion """ + self.dpt3 = self.department_obj.create(vals=dict( + name='Dpt. 3', + parent_id=self.dpt2.id + )) + # Creating a parent's child department using dpt1. + with self.assertRaises(ValidationError): + self.dpt1.write(vals={'parent_id': self.dpt3.id}) diff --git a/partner_contact_department/views/res_partner_department_view.xml b/partner_contact_department/views/res_partner_department_view.xml index f7aae91f9..f07ab520c 100644 --- a/partner_contact_department/views/res_partner_department_view.xml +++ b/partner_contact_department/views/res_partner_department_view.xml @@ -1,47 +1,44 @@ - + - - + - - Departments - res.partner.department - form - tree - + + Departments + res.partner.department + form + tree + - - CRM department tree - res.partner.department - - - - - - - - - - CRM department form - res.partner.department - -
- + + CRM department tree + res.partner.department + + - - -
- - + + + + + + CRM department form + res.partner.department + +
+ + + + + +
+ + - + - - + diff --git a/partner_contact_department/views/res_partner_view.xml b/partner_contact_department/views/res_partner_view.xml index 108a2415e..e97e209a8 100644 --- a/partner_contact_department/views/res_partner_view.xml +++ b/partner_contact_department/views/res_partner_view.xml @@ -1,49 +1,47 @@ - + - - + - - Partner form with department - res.partner - - - - - - - - - - - + + Partner form with department + res.partner + + + + + + + + + + + - - Partner search with department - res.partner - - - - + + Partner search with department + res.partner + + + + + + + + - - - - - + - - +