[13.0][MIG] membership_withdrawal

membership_withdrawal/__init__.py

@@ -1,2 +1,2 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import models

membership_withdrawal/__manifest__.py

@@ -1,17 +1,17 @@
 # Copyright 2016 Tecnativa  - Antonio Espinosa
 # Copyright 2017-19 Tecnativa - David Vidal
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Membership withdrawal",
     "summary": "Log membership withdrawal reason and date of request",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Association",
     "website": "https://github.com/OCA/vertical-association",
-    "author": "Tecnativa, " "Odoo Community Association (OCA)",
+    "author": "Tecnativa, " "Onestein, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,
     "installable": True,
-    "depends": ["membership_extension",],
+    "depends": ["membership_extension"],
     "data": [
         "security/ir.model.access.csv",
         "data/membership_withdrawal_reason_data.xml",

membership_withdrawal/models/__init__.py

@@ -1,4 +1,4 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import membership_withdrawal_reason
 from . import membership_line
 from . import res_partner

membership_withdrawal/models/membership_line.py

@@ -1,5 +1,5 @@
 # Copyright 2016 Tecnativa  - Antonio Espinosa
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import fields, models
 
 

membership_withdrawal/models/membership_withdrawal_reason.py

@@ -1,5 +1,5 @@
 # Copyright 2016 Tecnativa  - Antonio Espinosa
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import fields, models
 
 

membership_withdrawal/models/res_partner.py

@@ -1,5 +1,6 @@
 # Copyright 2016 Tecnativa  - Antonio Espinosa
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# Copyright 2019 Onestein - Andrea Stirpe
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import api, fields, models
 
 
@@ -40,15 +41,9 @@ def _compute_last_withdrawal(self):
                     parent.membership_last_withdrawal_date
                 )
             else:
-                withdrawal_reason_id = False
-                date_withdrawal = False
-                for line in partner.member_lines:
-                    if line.withdrawal_reason_id and line.date_withdrawal:
-                        withdrawal_reason_id = line.withdrawal_reason_id
-                        date_withdrawal = line.date_withdrawal
-                        break
-                partner.membership_last_withdrawal_reason_id = (
-                    withdrawal_reason_id.id if withdrawal_reason_id else False
-                )
-                partner.membership_last_withdrawal_date = date_withdrawal
-        return True
+                lines = partner.member_lines.filtered(
+                    lambda l: l.withdrawal_reason_id and l.date_withdrawal
+                ).sorted("date_withdrawal", reverse=True)
+                line = fields.first(lines)
+                partner.membership_last_withdrawal_reason_id = line.withdrawal_reason_id
+                partner.membership_last_withdrawal_date = line.date_withdrawal

membership_withdrawal/readme/CONTRIBUTORS.rst

@@ -3,3 +3,7 @@
   * Antonio Espinosa
   * Rafael Blasco
   * David Vidal
+
+* `Onestein <https://onestein.eu>`__:
+
+  * Andrea Stirpe

membership_withdrawal/tests/__init__.py

@@ -1,2 +1,2 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import test_membership

membership_withdrawal/tests/test_membership.py

@@ -1,6 +1,6 @@
 # Copyright 2016 Tecnativa - Antonio Espinosa
 # Copyright 2017-19 Tecnativa - David Vidal
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from datetime import timedelta
 
 from odoo import fields
@@ -9,14 +9,14 @@
 
 class TestMembership(TransactionCase):
     def setUp(self):
-        super(TestMembership, self).setUp()
+        super().setUp()
 
         self.next_two_months = fields.Date.today() + timedelta(days=60)
         self.next_month = fields.Date.today() + timedelta(days=30)
         self.reason = self.env.ref("membership_withdrawal.reason_unsatisfied")
-        self.partner = self.env["res.partner"].create({"name": "Test company",})
+        self.partner = self.env["res.partner"].create({"name": "Test company"})
         self.child = self.env["res.partner"].create(
-            {"name": "Test child", "associate_member": self.partner.id,}
+            {"name": "Test child", "associate_member": self.partner.id}
         )
         self.product = self.env["product.product"].create(
             {

membership_withdrawal/views/membership_withdrawal_reason_view.xml

@@ -5,14 +5,13 @@
     <record id="membership_withdrawal_reason_action" model="ir.actions.act_window">
         <field name="name">Membership withdrawal reasons</field>
         <field name="res_model">membership.withdrawal_reason</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree</field>
     </record>
     <record id="membership_withdrawal_reason_tree_view" model="ir.ui.view">
         <field name="name">Membership withdrawal reasons</field>
         <field name="model">membership.withdrawal_reason</field>
         <field name="arch" type="xml">
-            <tree string="Membership withdrawal reasons" editable="top">
+            <tree editable="top">
                 <field name="name" />
             </tree>
         </field>

membership_withdrawal/views/res_partner_view.xml

@@ -2,7 +2,7 @@
 <!-- Copyright 2016 Tecnativa - Atonio Espinosa
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
-    <record model="ir.ui.view" id="view_partner_form">
+    <record id="view_partner_form" model="ir.ui.view">
         <field name="name">Add membership withdrawal fields</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="membership.view_partner_form" />
@@ -19,7 +19,7 @@
             </field>
         </field>
     </record>
-    <record model="ir.ui.view" id="extension_view_partner_form">
+    <record id="extension_view_partner_form" model="ir.ui.view">
         <field name="name">Add membership withdrawal fields</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="membership_extension.view_partner_form" />
@@ -33,7 +33,7 @@
             </xpath>
         </field>
     </record>
-    <record model="ir.ui.view" id="view_res_partner_member_filter">
+    <record id="view_res_partner_member_filter" model="ir.ui.view">
         <field name="name">Add membership withdrawal filters</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="membership.view_res_partner_member_filter" />