diff --git a/golem_activity_registration_custom_price/__manifest__.py b/golem_activity_registration_custom_price/__manifest__.py index 59853a3..fc5ac2d 100644 --- a/golem_activity_registration_custom_price/__manifest__.py +++ b/golem_activity_registration_custom_price/__manifest__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2018 Fabien Bourgeois +# Copyright 2018-2019 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 @@ -24,7 +24,7 @@ - allow set price per area and slice ; - computes automatically applicable price ; - anticipate ruleset to be implemented for computing.''', - 'version': '10.0.0.2.0', + 'version': '10.0.0.3.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois', 'license': 'AGPL-3', @@ -36,5 +36,6 @@ 'views/golem_payment_rule_quotient_slice_views.xml', 'views/golem_member_views.xml', 'views/golem_activity_views.xml', - 'wizard/golem_activity_registration_invoicing_views.xml'] + 'wizard/golem_activity_registration_invoicing_views.xml', + 'wizard/golem_member_analysis_views.xml'] } diff --git a/golem_activity_registration_custom_price/wizard/__init__.py b/golem_activity_registration_custom_price/wizard/__init__.py index bcc8d2a..d9b7940 100644 --- a/golem_activity_registration_custom_price/wizard/__init__.py +++ b/golem_activity_registration_custom_price/wizard/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2018 Fabien Bourgeois +# Copyright 2018-2019 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 @@ -15,4 +15,5 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import golem_activity_registration_invoicing +from . import (golem_activity_registration_invoicing, + golem_member_analysis, golem_member_analysis_wizard) diff --git a/golem_activity_registration_custom_price/wizard/golem_member_analysis.py b/golem_activity_registration_custom_price/wizard/golem_member_analysis.py new file mode 100644 index 0000000..af0084c --- /dev/null +++ b/golem_activity_registration_custom_price/wizard/golem_member_analysis.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2019 Fabien Bourgeois +# Copyright 2019 Youssef El Ouahby +# +# 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 . + +""" GOLEM Members Analysis Pivot Adaption """ + +from odoo import models, fields, api + + +class GolemMemberAnalysisPivot(models.TransientModel): + """ GOLEM Members Analysis Pivot Adaption """ + _inherit = 'golem.member.analysis' + _description = 'GOLEM Members Analysis Adaption' + + + family_quotient_slice_id = fields.Many2one( + 'golem.payment.rule.familyquotient.slice', index=True, ondelete='cascade', + store=True, compute='_compute_family_quotient_slice_id' + ) + + @api.depends('family_quotient') + def _compute_family_quotient_slice_id(self): + """ Computes family quotient slice """ + for rec in self: + if rec.family_quotient: + fq_int = int(rec.family_quotient) + domain = [('family_quotient_from', '<=', fq_int), + ('family_quotient_to', '>=', fq_int)] + rule_slice_id = self.env['golem.payment.rule.familyquotient.slice'].search( + domain, limit=1 + ) + if rule_slice_id: + rec.family_quotient_slice_id = rule_slice_id diff --git a/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml b/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml new file mode 100644 index 0000000..0557413 --- /dev/null +++ b/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml @@ -0,0 +1,37 @@ + + + + + + + + + + Golem Member Analysis Fquotient Slice and Area Pivot + golem.member.analysis + + + + + + + + + + diff --git a/golem_activity_registration_custom_price/wizard/golem_member_analysis_wizard.py b/golem_activity_registration_custom_price/wizard/golem_member_analysis_wizard.py new file mode 100644 index 0000000..5fde1f4 --- /dev/null +++ b/golem_activity_registration_custom_price/wizard/golem_member_analysis_wizard.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2019 Fabien Bourgeois +# Copyright 2019 Youssef El Ouahby +# +# 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 . + +""" GOLEM Members Analysis Adaptation """ + +from odoo import models, fields, api + + +class GolemMemberAnalysis(models.TransientModel): + """ GOLEM Members Analysis Adaptation """ + _inherit = 'golem.member.analysis.wizard' + _description = 'GOLEM Members Analysis Wizard Adaptation' + + analyse_type = fields.Selection( + selection_add=[('fquotientslice_area', + 'By family quotient slice and area')] + ) + + @api.multi + def get_pivot_view(self): + """ override get_pivot_view function """ + self.ensure_one() + rec = self[0] + pivot_view = super(GolemMemberAnalysis, self).get_pivot_view() + if pivot_view: + return pivot_view + if rec.analyse_type == 'fquotientslice_area': + return self.env.ref( + ('golem_activity_registration_custom_price.' + 'golem_member_analysis_pivot_fquotientslice_area'), + False + ) + return False