michel/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

[FIX]GOLEM Member Number generation : fix for apply_config without whole recomputing

Browse Source
This commit is contained in:
Fabien Bourgeois 2017-06-20 08:23:32 +02:00
parent 112902d82e
commit 7421b88b1e
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
golem_member/models/golem_member.py
View File

@ -268,6 +268,11 @@ class GolemNumberConfig(models.TransientModel):
conf.set_param('golem_numberconfig_isautomatic', self.is_automatic) conf.set_param('golem_numberconfig_isautomatic', self.is_automatic)
conf.set_param('golem_numberconfig_isperseason', self.is_per_season) conf.set_param('golem_numberconfig_isperseason', self.is_per_season)
conf.set_param('golem_numberconfig_prefix', self.prefix or '') conf.set_param('golem_numberconfig_prefix', self.prefix or '')
if self.number_from:
conf.set_param('golem_number_counter', self.number_from)
self.env['golem.season'].search([]).write({
'member_counter': int(self.number_from)
})
@api.multi @api.multi
def apply_recompute(self): def apply_recompute(self):

70
golem_member/tests/test_golem_member.py
View File

@ -87,6 +87,24 @@ class GolemMemberTestCase(TransactionCase):
self.assertFalse(self.member1.is_current) self.assertFalse(self.member1.is_current)
self.assertFalse(self.member1.number) self.assertFalse(self.member1.number)
def test_mnumbers_auto_season_from(self):
""" Tests per season automatic member number + number_from """
conf = self.member_numberconfig_model.create({'is_automatic': '1',
'is_per_season': '1',
'prefix': False,
'number_from': 100})
conf.apply_recompute()
self.assertEqual(self.member1.number, u'100')
self.assertEqual(self.member2.number, u'101')
self.member2.season_ids += self.season_next
self.assertEqual(self.member2.number, u'101')
self.season_next.do_default_season()
self.assertTrue(self.member2.is_current)
self.assertEqual(self.member2.number, u'100')
self.assertFalse(self.member1.is_current)
self.assertFalse(self.member1.number)
def test_member_numbers_auto_global(self): def test_member_numbers_auto_global(self):
""" Tests global automatic member number generation """ """ Tests global automatic member number generation """
conf = self.member_numberconfig_model.create({'is_automatic': '1', conf = self.member_numberconfig_model.create({'is_automatic': '1',
@ -98,3 +116,55 @@ class GolemMemberTestCase(TransactionCase):
'firstname': 'Buddy', 'firstname': 'Buddy',
'season_ids': [self.season_next]}) 'season_ids': [self.season_next]})
self.assertEqual(new_m.number, u'3') self.assertEqual(new_m.number, u'3')
def test_mnumbers_auto_global_from(self):
""" Tests global automatic member number generation + number_from """
conf = self.member_numberconfig_model.create({'is_automatic': '1',
'is_per_season': '0',
'number_from': 50})
conf.apply_recompute()
self.assertEqual(self.member1.number, u'50')
self.assertEqual(self.member2.number, u'51')
new_m = self.member_model.create({'lastname': 'NEW',
'firstname': 'Buddy',
'season_ids': [self.season_next]})
self.assertEqual(new_m.number, u'52')
def test_mnumbers_manual_to_auto(self):
""" Tests generation change withtout whole recompute """
conf = self.member_numberconfig_model.create({'is_automatic': '0'})
conf.apply_recompute()
self.assertFalse(self.member1.number)
self.member1.number_manual = u'M01'
self.assertEqual(self.member1.number_manual, self.member1.number)
# Without number_from
conf = self.member_numberconfig_model.create({'is_automatic': '1',
'is_per_season': '0',
'prefix': False})
conf.apply_config()
self.assertEqual(self.member1.number, u'M01')
new_m = self.member_model.create({'lastname': 'NEW',
'firstname': 'Buddy',
'season_ids': [self.season_current]})
new_m2 = self.member_model.create({'lastname': 'NEW',
'firstname': 'Buddy',
'season_ids': [self.season_current]})
self.assertEqual(new_m.number, u'1')
self.assertEqual(new_m2.number, u'2')
# With number_from
conf = self.member_numberconfig_model.create({'is_automatic': '1',
'is_per_season': '0',
'prefix': False,
'number_from': 50})
conf.apply_config()
self.assertEqual(self.member1.number, u'M01')
new_m = self.member_model.create({'lastname': 'NEW',
'firstname': 'Buddy',
'season_ids': [self.season_current]})
new_m2 = self.member_model.create({'lastname': 'NEW',
'firstname': 'Buddy',
'season_ids': [self.season_current]})
self.assertEqual(new_m.number, u'50')
self.assertEqual(new_m2.number, u'51')