diff --git a/odex25_sales/dev_membership/data/sequence.xml b/odex25_sales/dev_membership/data/sequence.xml index 15bbea5de..a47bd47ec 100644 --- a/odex25_sales/dev_membership/data/sequence.xml +++ b/odex25_sales/dev_membership/data/sequence.xml @@ -16,7 +16,7 @@ Membership resonse Number - se.cancellation.reason + seq.cancellation.reason MEMR%(y)s- 5 diff --git a/odex25_sales/dev_membership/models/membershib_level.py b/odex25_sales/dev_membership/models/membershib_level.py index cbe07e92a..b78e185cc 100644 --- a/odex25_sales/dev_membership/models/membershib_level.py +++ b/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) + diff --git a/odex25_sales/dev_membership/models/res_config_settings.py b/odex25_sales/dev_membership/models/res_config_settings.py index c1156a29a..d0a8a168f 100644 --- a/odex25_sales/dev_membership/models/res_config_settings.py +++ b/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) - - diff --git a/odex25_sales/dev_membership/views/res_config_settings.xml b/odex25_sales/dev_membership/views/res_config_settings.xml index 32cdcac98..920c3c501 100644 --- a/odex25_sales/dev_membership/views/res_config_settings.xml +++ b/odex25_sales/dev_membership/views/res_config_settings.xml @@ -41,6 +41,7 @@ +

Membership Experience Evaluation

@@ -74,6 +75,7 @@
+

Membership Cancellation