From cac13bf183d2374414e8202f49465e1f2024afa0 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Wed, 20 Jul 2016 18:49:23 +0200 Subject: [PATCH] [IMP]GOLEM Families Member Minor adaptation for multiple guardians --- golem_family_minor/__init__.py | 2 ++ golem_family_minor/__openerp__.py | 2 +- golem_family_minor/golem_member.py | 26 +++++++++++++++ golem_family_minor/golem_member_view.xml | 40 ------------------------ 4 files changed, 29 insertions(+), 41 deletions(-) create mode 100644 golem_family_minor/golem_member.py delete mode 100644 golem_family_minor/golem_member_view.xml diff --git a/golem_family_minor/__init__.py b/golem_family_minor/__init__.py index 643d893b..8d289628 100644 --- a/golem_family_minor/__init__.py +++ b/golem_family_minor/__init__.py @@ -14,3 +14,5 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . + +from . import golem_member diff --git a/golem_family_minor/__openerp__.py b/golem_family_minor/__openerp__.py index c35ff9ec..3cd49e59 100644 --- a/golem_family_minor/__openerp__.py +++ b/golem_family_minor/__openerp__.py @@ -28,5 +28,5 @@ 'installable': True, 'auto_install': True, 'depends': ['golem_family', 'golem_member_minor'], - 'data': ['golem_member_view.xml'] + 'data': [] } diff --git a/golem_family_minor/golem_member.py b/golem_family_minor/golem_member.py new file mode 100644 index 00000000..f7eb1746 --- /dev/null +++ b/golem_family_minor/golem_member.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +# Copyright 2016 Fabien Bourgeois +# +# 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 import models, fields + +LEGAL_DMN = "['&', ('family_id', '=', family_id), ('id', '!=', partner_id)]" + + +class GolemMember(models.Model): + _inherit = 'golem.member' + + legal_guardian_ids = fields.Many2many(domain=LEGAL_DMN) diff --git a/golem_family_minor/golem_member_view.xml b/golem_family_minor/golem_member_view.xml deleted file mode 100644 index 3bc222b4..00000000 --- a/golem_family_minor/golem_member_view.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - Restrict domain for legal_guardian - golem.member - - - - - - - ['&', ('family_id', '=', family_id), ('id', '!=', partner_id)] - {'no_create': True} - - - - - -