Merge pull request #624 from expsa/membership

Membership

odex25_sales/dev_membership/models/membershib_level.py

@@ -14,25 +14,25 @@ class MembershipLevel(models.Model):
     company_id = fields.Many2one('res.company', string='Company', readonly=True,
         default=lambda self: self.env.company)
 
-    @api.model
-    def _get_next_levelno(self):
-        sequence = self.env['ir.sequence'].search(
-            [('code', '=', 'seq.membership.level'), 
-             '|', 
-             ('company_id', '=', self.env.company.id), 
-             ('company_id', '=', False)], 
-            limit=1
-        )
-        if sequence:
-            return sequence.next_by_id()
-        return '/'
+    # @api.model
+    # def _get_next_levelno(self):
+    #     sequence = self.env['ir.sequence'].search(
+    #         [('code', '=', 'seq.membership.level'), 
+    #          '|', 
+    #          ('company_id', '=', self.env.company.id), 
+    #          ('company_id', '=', False)], 
+    #         limit=1
+    #     )
+    #     if sequence:
+    #         return sequence.next_by_id()
+    #     return '/'
 
-    @api.model
-    def create(self, 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)
+    # @api.model
+    # def create(self, 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/product_template.py

@@ -19,23 +19,23 @@ class ProductTemplate(models.Model):
     company_id = fields.Many2one('res.company', string='Company', readonly=True,
         default=lambda self: self.env.company)
 
-    @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 _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)
+    # @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'

odex25_sales/dev_membership/models/res_config_settings.py

@@ -63,19 +63,19 @@ class CancellReason(models.Model):
     sequence = fields.Integer(string="Sequence", help="Define the display order")
     company_id = fields.Many2one('res.company', string='Company', readonly=True,default=lambda self: self.env.company)
 
-    @api.model
-    def _get_next_reasone_no(self):
-        sequence = self.env['ir.sequence'].search(
-            ['|', ('company_id', '=', self.env.company.id), ('company_id', '=', False),
-             ('code', '=', 'seq.cancellation.reason')], limit=1)
-        if sequence:
-            return sequence.next_by_code('seq.cancellation.reason')
-        return '/'
+    # @api.model
+    # def _get_next_reasone_no(self):
+    #     sequence = self.env['ir.sequence'].search(
+    #         ['|', ('company_id', '=', self.env.company.id), ('company_id', '=', False),
+    #          ('code', '=', 'seq.cancellation.reason')], limit=1)
+    #     if sequence:
+    #         return sequence.next_by_code('seq.cancellation.reason')
+    #     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('reasone_no', False):
-            vals['reasone_no'] = self_comp.env['ir.sequence'].next_by_code('seq.cancellation.reason') or '/'
-        return super().create(vals)
+    # @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)

odex25_sales/dev_membership/views/membership_level.xml

@@ -5,7 +5,7 @@
         <field name="arch" type="xml">
             <tree editable="bottom" string="Membership Level">
                 <field name="sequence" widget="handle"/>
-                <field name="level_no"/>
+<!--                 <field name="level_no"/> -->
                 <field name="name"/>
                 <field name="years"/>
                 <field name="min"/>

odex25_sales/dev_membership/views/product_template.xml

@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <tree string="Membership Product Tree View">
                  <field name="sequence_no" widget="handle"/>
-                <field name="type_no"/>
+<!--                 <field name="type_no"/> -->
                 <field name="name"/>
                 <field name="default_code"/>
                 <field name="duration"/>

odex25_sales/dev_membership/views/res_config_settings.xml

@@ -117,7 +117,7 @@
         <field name="arch" type="xml">
             <tree editable='top' string="cancell_tree">
                 <field name="sequence" widget="handle"/>
-                <field name="reasone_no"/>
+<!--                 <field name="reasone_no"/> -->
                 <field name="name"/>
              <field invisible="1" name="company_id"/>