Merge pull request #620 from expsa/membership_dev

Membership dev

odex25_sales/dev_membership/data/sequence.xml

@@ -16,7 +16,7 @@
 
          <record id="seq_membership_reasons" model="ir.sequence">
             <field name="name">Membership resonse Number</field>
-            <field name="code">se.cancellation.reason</field>
+            <field name="code">seq.cancellation.reason</field>
             <field name="prefix">MEMR%(y)s-</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>

odex25_sales/dev_membership/models/membershib_level.py

@@ -14,21 +14,25 @@ class MembershipLevel(models.Model):
     company_id = fields.Many2one('res.company', string='Company', readonly=True,
         default=lambda self: self.env.company)
 
-    @api.model
+     @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.membership.level')], limit=1)
+            [('code', '=', 'seq.membership.level'), 
+             '|', 
+             ('company_id', '=', self.env.company.id), 
+             ('company_id', '=', False)], 
+            limit=1
+        )
         if sequence:
-            next_sequence = sequence.get_next_char(sequence.number_next_actual)
-        return next_sequence
+            return sequence.next_by_id()
+        return '/'
 
     @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.membership.level') or '/'
-        return super().create(vals)
+        if 'company_id' not in vals:
+            vals['company_id'] = self.env.company.id
+        if not vals.get('level_no'):
+            vals['level_no'] = self.env['ir.sequence'].with_company(vals['company_id']).next_by_code('seq.membership.level') or '/'
+        return super(MembershipLevel, self).create(vals)
+
 

odex25_sales/dev_membership/models/res_config_settings.py

@@ -65,13 +65,12 @@ class CancellReason(models.Model):
 
     @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),
+            ['|', ('company_id', '=', self.env.company.id), ('company_id', '=', False),
              ('code', '=', 'seq.cancellation.reason')], limit=1)
         if sequence:
-            next_sequence = sequence.get_next_char(sequence.number_next_actual)
-        return next_sequence
+            return sequence.next_by_code('seq.cancellation.reason')
+        return '/'
 
     @api.model
     def create(self, vals):
@@ -80,5 +79,3 @@ class CancellReason(models.Model):
         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)
-
-

odex25_sales/dev_membership/views/res_config_settings.xml

@@ -41,6 +41,7 @@
                         </div>
                         <!--                    todo end -->
                     </div>
+                    <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"/>
@@ -74,6 +75,7 @@
                         </div>
                         <!--                    todo end -->
                     </div>
+                    <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"/>