From fe370800e5ce1bea98832259b96e2cf55e0405a5 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:05:45 +0300
Subject: [PATCH 01/18] Update res_partner.py

---
 .../dev_membership/models/res_partner.py      | 77 +++++++++++--------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index 0ccff0170..9cd8ec49a 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -44,38 +44,17 @@ class PartnerExtended(models.Model):
         for rec in self:
             if rec.active_membership_id:
                 print('if in.....')
-    # todo end
-    def check_memebership_status(self):
-        for partner in self:
-            partner.memebership_status = ''
-            if partner.membership_count == 0:
-                partner.memebership_status = 'No Membership'
-
-            else:
-                if partner.active_membership_id:
-                    partner.memebership_status = 'Membership : ' + partner.active_membership_id.name
-                else:
-                    # البحث عن حالة الاشتراك الأخيرة
-                    last_membership = self.env['dev.membership'].search([('partner_id', '=', partner.id)], order='to_date desc', limit=1)
-                    print('last_membership = ',last_membership)
-                    if last_membership:
-                        if last_membership.state=='draft':
-                            partner.memebership_status = 'Membership Waitting'
-                        elif last_membership.state=='cancel':
-                            partner.memebership_status = 'Membership Cancelled'
-                        elif last_membership.state=='confirm':
-                            if not last_membership.invoice_id and not last_membership.is_free:
-                                partner.memebership_status = 'Membership Waitting invoice'
-                            elif  last_membership.invoice_id.payment_state in ['paid','in_payment']:
-                                partner.memebership_status = 'Membership  Paid'
-                            elif  last_membership.invoice_id.payment_state not in  ['paid','in_payment']:
-                                partner.memebership_status = 'Membership  Waitting Paid'
-##############################################################################################################################################
-                # if partner.is_membership_expire:
-                #     partner.memebership_status = 'Membership Expire'
-                # else:
-                if partner.active_membership_id:
-                    partner.memebership_status = 'Membership : ' + partner.active_membership_id.name
+    # def check_memebership_status(self):
+    #     for partner in self:
+    #         partner.memebership_status = ''
+    #         if partner.membership_count == 0:
+    #             partner.memebership_status = 'No Membership'
+    #         else:
+    #             if partner.is_membership_expire:
+    #                 partner.memebership_status = 'Membership Expire'
+    #             else:
+    #                 if partner.active_membership_id:
+    #                     partner.memebership_status = 'Membership : ' + partner.active_membership_id.name
 
     def check_active_membership(self):
         for partner in self:
@@ -92,6 +71,38 @@ class PartnerExtended(models.Model):
                 else:
                     partner.is_membership_expire = True
 
+
+    # todo end
+    def check_memebership_status(self):
+        for partner in self:
+            partner.memebership_status = ''
+            if partner.membership_count == 0:
+                partner.memebership_status = 'No Membership'
+            else:
+                if partner.is_membership_expire:
+                    partner.memebership_status = 'Membership Expire'
+                else:
+                    if partner.active_membership_id:
+                        partner.memebership_status = 'Membership : ' + partner.active_membership_id.name
+                    else:
+                        # البحث عن حالة الاشتراك الأخيرة
+                        last_membership = self.env['dev.membership'].search([('partner_id', '=', partner.id)],
+                                                                            order='to_date desc', limit=1)
+                        if last_membership:
+                            if last_membership.state == 'draft':
+                                partner.memebership_status = 'Membership Waitting'
+                            elif last_membership.state == 'cancel':
+                                partner.memebership_status = 'Membership Cancelled'
+                            elif last_membership.state == 'confirm':
+                                if not last_membership.invoice_id and not last_membership.is_free:
+                                    partner.memebership_status = 'Membership Waitting invoice'
+                                elif last_membership.invoice_id.payment_state in ['paid', 'in_payment']:
+                                    partner.memebership_status = 'Membership  Paid'
+                                elif last_membership.invoice_id.payment_state not in ['paid', 'in_payment']:
+                                    partner.memebership_status = 'Membership  Waitting Paid'
+                    ##############################################################################################################################################
+
+    
     def _get_membership_count(self):
         for rec in self:
             membership_count = self.env['dev.membership'].search_count([('partner_id', '=', rec.id)])
@@ -107,4 +118,4 @@ class PartnerExtended(models.Model):
             'view_mode': 'tree,form',
             'target': 'current',
             'context': ctx,
-        }
\ No newline at end of file
+        }

From 7ef300ab7cb718881f4cfedc433992a2b2fff8f4 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:07:32 +0300
Subject: [PATCH 02/18] Update dev_membership.py

---
 odex25_sales/dev_membership/models/dev_membership.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odex25_sales/dev_membership/models/dev_membership.py b/odex25_sales/dev_membership/models/dev_membership.py
index 6a18374a1..22799cbec 100644
--- a/odex25_sales/dev_membership/models/dev_membership.py
+++ b/odex25_sales/dev_membership/models/dev_membership.py
@@ -148,10 +148,10 @@ class DevMembership(models.Model):
         if  self.product_id.nationality_ids:
             if self.partner_id.nationality_id not in self.product_id.nationality_ids:
                 raise ValidationError(_("The member's nationality does not meet the membership requirements"))
-        if self.partner_id.age < 18:
-            raise ValidationError(_('The member must be at least 18 years old.'))
+        if self.product_id.age!=0  and  self.partner_id.age !=self.product_id.age:
+            raise ValidationError(_('The member must be at least %s years old.')%self.product_id.age)
         if self.partner_id.gender != self.product_id.gender and self.product_id.gender != False:
-            raise ValidationError(_('Membership is only allowed for %s') % self.product_id.gender)
+            raise ValidationError(_('Membership is only  %s allowed') % self.product_id.gender)
 
 
     

From 6ba235438b23c8dd3831e0fc386c0d3a2f6369c6 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:10:33 +0300
Subject: [PATCH 03/18] Update partner_extended.xml

---
 odex25_sales/dev_membership/views/partner_extended.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 439dc2e0d..658b9b79b 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -48,6 +48,7 @@
                 <field name="mobile"/>
                 <field name="state_id"/>
                 <field name="join_date"/>
+                <field name="memebership_end_date"/>
                 <field name="membrship_level"/>
                 <field name="category_id" widget="many2many_tags"/>
 
@@ -133,7 +134,7 @@
                                 <div class="o_kanban_record_bottom">
                                     <div class="oe_kanban_bottom_left text-muted">
                                         <span>
-                                            <t t-esc="record.join_date.value"/>
+                                            <t t-esc="record.memebership_end_date.value"/>
                                         </span>
                                     </div>
                                 </div>

From 697128885132b6268d3e3bb6efb5b4d05d081ea6 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:14:13 +0300
Subject: [PATCH 04/18] Update dev_membership.py

---
 odex25_sales/dev_membership/models/dev_membership.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/odex25_sales/dev_membership/models/dev_membership.py b/odex25_sales/dev_membership/models/dev_membership.py
index 22799cbec..66631765f 100644
--- a/odex25_sales/dev_membership/models/dev_membership.py
+++ b/odex25_sales/dev_membership/models/dev_membership.py
@@ -152,11 +152,8 @@ class DevMembership(models.Model):
             raise ValidationError(_('The member must be at least %s years old.')%self.product_id.age)
         if self.partner_id.gender != self.product_id.gender and self.product_id.gender != False:
             raise ValidationError(_('Membership is only  %s allowed') % self.product_id.gender)
-
-
-    
-
         self.state = 'confirm'
+        
     def action_active_membership(self):
         if not self.invoice_id and not self.is_free:
             raise ValidationError(_('Please Create Membership Invoice'))
@@ -166,6 +163,8 @@ class DevMembership(models.Model):
         self.partner_id.product_id = self.product_id.id
         if not self.partner_id.join_date:
             self.partner_id.join_date = self.from_date
+        if not self.partner_id.memebership_end_date:
+            self.partner_id.memebership_end_date = self.to_date
 
     def action_cancel_membership(self):
         self.state = 'cancel'

From 4cb72d216faf3e7111a34a3da55f1fc5a6c99c65 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:20:50 +0300
Subject: [PATCH 05/18] Update partner_extended.xml

---
 odex25_sales/dev_membership/views/partner_extended.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 658b9b79b..46f940ee3 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -169,7 +169,7 @@
             </xpath>
 
             <xpath expr="//page" position="after">
-                <page name="memebership" string='Memebership'>
+                <page group="dev_membership.group_membership_user"  name="memebership" string='Memebership'>
                     <group>
                         <group name="memeber">
                             <field name="is_member"/>
@@ -190,7 +190,7 @@
                 <attribute name="required">True</attribute>
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
-                <button name="view_membership" type="object"
+                <button group="dev_membership.group_membership_user"  name="view_membership" type="object"
                         class="oe_stat_button"
                         icon="fa-vcard-o" attrs="{'invisible' : [('membership_count', '=', 0)]}">
                     <div class="o_stat_info">

From 6cf14419caccd8954524f8db915c74e6128d2bb4 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:39:37 +0300
Subject: [PATCH 06/18] Update sequence.xml

---
 odex25_sales/dev_membership/data/sequence.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/odex25_sales/dev_membership/data/sequence.xml b/odex25_sales/dev_membership/data/sequence.xml
index 37ace0587..15bbea5de 100644
--- a/odex25_sales/dev_membership/data/sequence.xml
+++ b/odex25_sales/dev_membership/data/sequence.xml
@@ -5,7 +5,33 @@
         For Module Support : devintelle@gmail.com  or Skype : devintelle
         -->
 <odoo>
+<!-- membership no -->
+        <record id="seq_membership_type" model="ir.sequence">
+            <field name="name">Membership Type Number</field>
+            <field name="code">seq.product.template</field>
+            <field name="prefix">MEMT%(y)s-</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
 
+         <record id="seq_membership_reasons" model="ir.sequence">
+            <field name="name">Membership resonse Number</field>
+            <field name="code">se.cancellation.reason</field>
+            <field name="prefix">MEMR%(y)s-</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+        
+ <record id="seq_membership_level" model="ir.sequence">
+            <field name="name">Membership level Number</field>
+            <field name="code">seq.membership.level</field>
+            <field name="prefix">MEML%(y)s-</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+
+<!--         end -->
     <record id="seq_dev_membership" model="ir.sequence">
         <field name="name">seq.dev.membership</field>
         <field name="code">seq.dev.membership</field>

From 24d8c6eed7dd0fb49b883ee2fb4ecd4298c0db72 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:45:54 +0300
Subject: [PATCH 07/18] Update product_template.py

---
 .../dev_membership/models/product_template.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/odex25_sales/dev_membership/models/product_template.py b/odex25_sales/dev_membership/models/product_template.py
index 031346608..62af208f7 100644
--- a/odex25_sales/dev_membership/models/product_template.py
+++ b/odex25_sales/dev_membership/models/product_template.py
@@ -14,6 +14,26 @@ from odoo import fields,api, models,_
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
+    type_no = fields.Char("Number", default=lambda self: self._get_next_projectno(), tracking=True,copy=False)
+
+    @api.model
+    def _get_next_projectno(self):
+        next_sequence = "/ "
+        sequence = self.env['ir.sequence'].search(
+            ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
+             ('code', '=', 'seq.product.template')], limit=1)
+        if sequence:
+            next_sequence = sequence.get_next_char(sequence.number_next_actual)
+        return next_sequence
+
+    @api.model
+    def create(self, vals):
+        company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
+        self_comp = self.with_company(company_id)
+        if not vals.get('type_no', False):
+            vals['type_no'] = self_comp.env['ir.sequence'].next_by_code('seq.product.template') or '/'
+        return super().create(vals)
+
     gender = fields.Selection(
         selection=[("male", "Male"), ("female", "Female")], default="male",string='Gender'
     )

From 1d77c3aea93a9a62550c74dcf71f1200fd8a26ef Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:47:14 +0300
Subject: [PATCH 08/18] Update membershib_level.py

---
 .../dev_membership/models/membershib_level.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/odex25_sales/dev_membership/models/membershib_level.py b/odex25_sales/dev_membership/models/membershib_level.py
index 4af6143e6..220d30e3f 100644
--- a/odex25_sales/dev_membership/models/membershib_level.py
+++ b/odex25_sales/dev_membership/models/membershib_level.py
@@ -9,3 +9,23 @@ class MembershipLevel(models.Model):
     min = fields.Integer(string='Maximum', required=True)
     max = fields.Integer(string='Maximum', required=True)
     color = fields.Char(string='Membership Card Color')
+    level_no = fields.Char("Number", default=lambda self: self._get_next_levelno(), tracking=True,copy=False)
+
+    @api.model
+    def _get_next_levelno(self):
+        next_sequence = "/ "
+        sequence = self.env['ir.sequence'].search(
+            ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
+             ('code', '=', 'seq.product.template')], limit=1)
+        if sequence:
+            next_sequence = sequence.get_next_char(sequence.number_next_actual)
+        return next_sequence
+
+    @api.model
+    def create(self, vals):
+        company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
+        self_comp = self.with_company(company_id)
+        if not vals.get('level_no', False):
+            vals['level_no'] = self_comp.env['ir.sequence'].next_by_code('seq.product.template') or '/'
+        return super().create(vals)
+

From 0c5da24651e3b31ef9a387070c2aa6dbc46c3508 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:49:18 +0300
Subject: [PATCH 09/18] Update res_config_settings.py

---
 .../models/res_config_settings.py             | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py
index 0f548b8f1..027381133 100644
--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@@ -59,3 +59,24 @@ class CancellReason(models.Model):
     _description = 'Cancellation Reason'
 
     name = fields.Char(string='Reasone of Cancellation')
+    reasone_no = fields.Char("Number", default=lambda self: self._get_next_reasone_no(), tracking=True,copy=False)
+
+    @api.model
+    def _get_next_reasone_no(self):
+        next_sequence = "/ "
+        sequence = self.env['ir.sequence'].search(
+            ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
+             ('code', '=', 'seq.product.template')], limit=1)
+        if sequence:
+            next_sequence = sequence.get_next_char(sequence.number_next_actual)
+        return next_sequence
+
+    @api.model
+    def create(self, vals):
+        company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
+        self_comp = self.with_company(company_id)
+        if not vals.get('reasone_no', False):
+            vals['reasone_no'] = self_comp.env['ir.sequence'].next_by_code('seq.cancellation.reason') or '/'
+        return super().create(vals)
+
+

From ef7a0180496d5eec3131ba09e40fb6c4688b13d0 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:50:02 +0300
Subject: [PATCH 10/18] Update membershib_level.py

---
 odex25_sales/dev_membership/models/membershib_level.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odex25_sales/dev_membership/models/membershib_level.py b/odex25_sales/dev_membership/models/membershib_level.py
index 220d30e3f..1959275cc 100644
--- a/odex25_sales/dev_membership/models/membershib_level.py
+++ b/odex25_sales/dev_membership/models/membershib_level.py
@@ -16,7 +16,7 @@ class MembershipLevel(models.Model):
         next_sequence = "/ "
         sequence = self.env['ir.sequence'].search(
             ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
-             ('code', '=', 'seq.product.template')], limit=1)
+             ('code', '=', 'seq.membership.level')], limit=1)
         if sequence:
             next_sequence = sequence.get_next_char(sequence.number_next_actual)
         return next_sequence
@@ -26,6 +26,6 @@ class MembershipLevel(models.Model):
         company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
         self_comp = self.with_company(company_id)
         if not vals.get('level_no', False):
-            vals['level_no'] = self_comp.env['ir.sequence'].next_by_code('seq.product.template') or '/'
+            vals['level_no'] = self_comp.env['ir.sequence'].next_by_code('seq.membership.level') or '/'
         return super().create(vals)
 

From e18f17088b80284189b5095569f349cde5adf922 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:50:36 +0300
Subject: [PATCH 11/18] Update res_config_settings.py

---
 odex25_sales/dev_membership/models/res_config_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py
index 027381133..5d1a20747 100644
--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@@ -66,7 +66,7 @@ class CancellReason(models.Model):
         next_sequence = "/ "
         sequence = self.env['ir.sequence'].search(
             ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
-             ('code', '=', 'seq.product.template')], limit=1)
+             ('code', '=', 'seq.cancellation.reason')], limit=1)
         if sequence:
             next_sequence = sequence.get_next_char(sequence.number_next_actual)
         return next_sequence

From 270ddb28c5e5b982efc0fffa1b3030b739aac2ff Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:25:22 +0300
Subject: [PATCH 12/18] Update res_config_settings.py

---
 odex25_sales/dev_membership/models/res_config_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py
index 5d1a20747..505160c27 100644
--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@@ -60,6 +60,8 @@ class CancellReason(models.Model):
 
     name = fields.Char(string='Reasone of Cancellation')
     reasone_no = fields.Char("Number", default=lambda self: self._get_next_reasone_no(), tracking=True,copy=False)
+    sequence = fields.Integer(string="Sequence", help="Define the display order")
+
 
     @api.model
     def _get_next_reasone_no(self):

From f227262f1354c7b898138e7b4bf7c9b7f6304490 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:25:59 +0300
Subject: [PATCH 13/18] Update membershib_level.py

---
 odex25_sales/dev_membership/models/membershib_level.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_sales/dev_membership/models/membershib_level.py b/odex25_sales/dev_membership/models/membershib_level.py
index 1959275cc..45a31b938 100644
--- a/odex25_sales/dev_membership/models/membershib_level.py
+++ b/odex25_sales/dev_membership/models/membershib_level.py
@@ -10,6 +10,8 @@ class MembershipLevel(models.Model):
     max = fields.Integer(string='Maximum', required=True)
     color = fields.Char(string='Membership Card Color')
     level_no = fields.Char("Number", default=lambda self: self._get_next_levelno(), tracking=True,copy=False)
+    sequence = fields.Integer(string="Sequence", help="Define the display order")
+
 
     @api.model
     def _get_next_levelno(self):

From a864b2dced9da24b741c81d38513db24b57a89bc Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:26:45 +0300
Subject: [PATCH 14/18] Update product_template.py

---
 odex25_sales/dev_membership/models/product_template.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_sales/dev_membership/models/product_template.py b/odex25_sales/dev_membership/models/product_template.py
index 62af208f7..e1bac225a 100644
--- a/odex25_sales/dev_membership/models/product_template.py
+++ b/odex25_sales/dev_membership/models/product_template.py
@@ -15,6 +15,7 @@ class ProductTemplate(models.Model):
     _inherit = "product.template"
 
     type_no = fields.Char("Number", default=lambda self: self._get_next_projectno(), tracking=True,copy=False)
+    sequence_no = fields.Integer(string="Sequence", help="Define the display order")
 
     @api.model
     def _get_next_projectno(self):

From 40ea0285415bbfbbea63e9968e7ee3008f216b42 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:28:54 +0300
Subject: [PATCH 15/18] Update membership_level.xml

---
 odex25_sales/dev_membership/views/membership_level.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_sales/dev_membership/views/membership_level.xml b/odex25_sales/dev_membership/views/membership_level.xml
index cb8aee351..df6031bec 100644
--- a/odex25_sales/dev_membership/views/membership_level.xml
+++ b/odex25_sales/dev_membership/views/membership_level.xml
@@ -4,6 +4,8 @@
         <field name="model">membership.level</field>
         <field name="arch" type="xml">
             <tree editable="bottom" string="Membership Level">
+                <field name="sequence" widget="handle"/>
+                <field name="level_no"/>
                 <field name="name"/>
                 <field name="years"/>
                 <field name="min"/>

From 2937bc364a2c159bcaefe795cbb0ed78b104c029 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:31:33 +0300
Subject: [PATCH 16/18] Update res_config_settings.xml

---
 odex25_sales/dev_membership/views/res_config_settings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_sales/dev_membership/views/res_config_settings.xml b/odex25_sales/dev_membership/views/res_config_settings.xml
index 1fac21e7b..cdf8dc464 100644
--- a/odex25_sales/dev_membership/views/res_config_settings.xml
+++ b/odex25_sales/dev_membership/views/res_config_settings.xml
@@ -119,6 +119,8 @@
     <field name="model">cancellation.reason</field>
     <field name="arch" type="xml">
         <tree editable='top'  string="cancell_tree">
+             <field name="sequence" widget="handle"/>
+            <field name="reasone_no"/>
             <field name="name"/>
         </tree>
     </field>

From 5c6b1238a650182047239a31242f35780a6d4b87 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:33:28 +0300
Subject: [PATCH 17/18] Update product_template.xml

---
 odex25_sales/dev_membership/views/product_template.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_sales/dev_membership/views/product_template.xml b/odex25_sales/dev_membership/views/product_template.xml
index 3db2715a3..f7175f1a7 100644
--- a/odex25_sales/dev_membership/views/product_template.xml
+++ b/odex25_sales/dev_membership/views/product_template.xml
@@ -6,6 +6,8 @@
         <field name="model">product.template</field>
         <field name="arch" type="xml">
             <tree string="Membership Product Tree View">
+                <field name="type_no"/>
+              <field name="sequence_no" widget="handle"/>
                 <field name="name"/>
                 <field name="default_code"/>
                 <field name="duration"/>

From fb98b9ab145dd59db76583819f57c0db5937f3c5 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:39:41 +0300
Subject: [PATCH 18/18] Update res_config_settings.xml

---
 .../views/res_config_settings.xml             | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/odex25_sales/dev_membership/views/res_config_settings.xml b/odex25_sales/dev_membership/views/res_config_settings.xml
index cdf8dc464..c5b9e39d5 100644
--- a/odex25_sales/dev_membership/views/res_config_settings.xml
+++ b/odex25_sales/dev_membership/views/res_config_settings.xml
@@ -18,7 +18,7 @@
                                 </div>
                                 <div class="text-muted content-group mt16">
                                     <field name="days_before" class="text-left oe_inline"/>
-                                    <field name="interval"  readonly="1"
+                                    <field name="interval" readonly="1"
                                            style="width: 48%; padding:3px; font-size:13px;"/>
                                 </div>
                             </div>
@@ -34,16 +34,13 @@
                                 </div>
                                 <div class="text-muted content-group mt16">
                                     <field name="days_before_second" class="text-left oe_inline"/>
-                                    <field name="interval"  readonly="1"
+                                    <field name="interval" readonly="1"
                                            style="width: 48%; padding:3px; font-size:13px;"/>
                                 </div>
                             </div>
                         </div>
                         <!--                    todo end -->
                     </div>
-                </div>
-                <div class="app_settings_block"  data-key="dev_membership">
-                    <h2>Membership Experience Evaluation</h2>
                     <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
                         <div class="col-12 col-lg-6 o_setting_box" id="late_reg">
                             <div class="o_setting_left_pane"/>
@@ -77,9 +74,6 @@
                         </div>
                         <!--                    todo end -->
                     </div>
-                </div>
-                <div class="app_settings_block"  data-key="dev_membership">
-                    <h2>Membership Cancellation</h2>
                     <div class="row mt16 o_settings_container" name="dev_membership_setting_container">
                         <div class="col-12 col-lg-6 o_setting_box" id="late_cancellfine">
                             <div class="o_setting_left_pane"/>
@@ -91,8 +85,9 @@
                                 </div>
                                 <div class="text-muted content-group mt16">
                                     <field name="post_expiry_period"/>
-                                    <field name="interval"  readonly="1"
-                                           style="width: 48%; padding:3px; font-size:13px;"/>                                </div>
+                                    <field name="interval" readonly="1"
+                                           style="width: 48%; padding:3px; font-size:13px;"/>
+                                </div>
                                 <div class="text-muted content-group mt16">
                                     <field name="cancellation_reason"/>
                                 </div>
@@ -114,17 +109,17 @@
         <field name="target">inline</field>
         <field name="context">{'module' : 'dev_membership', 'bin_size': False}</field>
     </record>
-<record id="cancell_view_tree" model="ir.ui.view">
-    <field name="name">cancell_view_tree</field>
-    <field name="model">cancellation.reason</field>
-    <field name="arch" type="xml">
-        <tree editable='top'  string="cancell_tree">
-             <field name="sequence" widget="handle"/>
-            <field name="reasone_no"/>
-            <field name="name"/>
-        </tree>
-    </field>
-</record>
+    <record id="cancell_view_tree" model="ir.ui.view">
+        <field name="name">cancell_view_tree</field>
+        <field name="model">cancellation.reason</field>
+        <field name="arch" type="xml">
+            <tree editable='top' string="cancell_tree">
+                <field name="sequence" widget="handle"/>
+                <field name="reasone_no"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
     <record id="action_dev_membership_config_refuse_resone" model="ir.actions.act_window">
         <field name="name">Cancell Resone</field>