Project

General

Profile

« Previous | Next » 

Revision 1f17fe24

Added by Mikaël Ates over 12 years ago

ressources: add HolidayType, fix Office, remove redundant codeCFTMEA.

View differences:

calebasse/ressources/models.py
94 94
        verbose_name_plural = u'Compagnies de transport'
95 95

  
96 96

  
97
class CFTMEACode(NamedAbstractModel):
98
    class Meta:
99
        verbose_name = u'Code CFTMEA'
100
        verbose_name_plural = u'Codes CFTMEA'
101

  
102

  
103 97
class UninvoicableCode(models.Model):
104 98
    class Meta:
105 99
        verbose_name = u'Code de non-facturation'
106 100
        verbose_name_plural = u'Codes de non-facturation'
107 101

  
108 102

  
109
class Office(ServiceLinkedAbstractModel):
103
class Office(NamedAbstractModel):
110 104
    class Meta:
111 105
        verbose_name = u'Établissement'
112 106
        verbose_name_plural = u'Établissements'
113 107

  
114 108
    def __unicode__(self):
115
        return self.slug
109
        return self.name
116 110

  
117
    slug = models.SlugField(verbose_name='Label')
118 111
    description = models.TextField(blank=True, null=True)
119 112

  
120 113
    # Contact
......
124 117

  
125 118
    # Address
126 119
    address = models.CharField(max_length=120,
127
            verbose_name=u"Adresse")
120
            verbose_name=u"Adresse", blank=True, null=True, default=None)
128 121
    address_complement = models.CharField(max_length=120,
129 122
            blank=True,
130 123
            null=True,
131 124
            default=None,
132 125
            verbose_name=u"Complément d'adresse")
133
    zip_code = ZipCodeField(verbose_name=u"Code postal")
134
            #verbose_name=u"Code postal")
135
    city = models.CharField(max_length=80,
136
            verbose_name=u"Ville")
126
    zip_code = ZipCodeField(verbose_name=u"Code postal",
127
            blank=True, null=True, default=None)
128
    city = models.CharField(max_length=80, verbose_name=u"Ville",
129
            blank=True, null=True, default=None)
137 130

  
138 131
    # TODO: add this fields : finess, suite, dm, dpa, genre, categorie, statut_juridique, mft, mt, dmt
139 132

  
......
337 330

  
338 331
    class Meta:
339 332
        ordering = ['code']
333
        verbose_name = u'Code CFTMEA'
334
        verbose_name_plural = u'Codes CFTMEA'
340 335

  
341 336
class MDPH(models.Model):
342 337
    class Meta:
343
        verbose_name = u'MDPH'
344
        verbose_name_plural = u'MDPHs'
338
        verbose_name = u'Etablissement MDPH'
339
        verbose_name_plural = u'Etablissements MDPH'
345 340

  
346 341
    def __unicode__(self):
347 342
        return self.department
......
372 367
            verbose_name=u"Ville", blank=True, null=True)
373 368

  
374 369
class MDPHRequest(models.Model):
370
    class Meta:
371
        verbose_name = u'Demande MDPH'
372
        verbose_name_plural = u'Demandes MDPH'
373

  
375 374
    start_date = models.DateField(verbose_name=u"Date de la demande")
376 375
    mdph = models.ForeignKey('ressources.MDPH',
377 376
            verbose_name=u"MDPH")
......
387 386
)
388 387

  
389 388
class MDPHResponse(models.Model):
389
    class Meta:
390
        verbose_name = u'Réponse MDPH'
391
        verbose_name_plural = u'Réponses MDPH'
392

  
390 393
    start_date = models.DateField(verbose_name=u"Date de début")
391 394
    end_date = models.DateField(verbose_name=u"Date de fin")
392 395
    mdph = models.ForeignKey('ressources.MDPH',
......
400 403
            verbose_name=u"Nom", blank=True, null=True)
401 404
    rate =  models.CharField(max_length=10,
402 405
            verbose_name=u"Taux", blank=True, null=True)
406

  
407

  
408
class HolidayType(NamedAbstractModel):
409
    for_group = models.BooleanField(
410
            verbose_name=u'Congé de groupe',
411
            blank=True)
412

  
413
    class Meta:
414
        verbose_name = u'Type de congé'
415
        verbose_name_plural = u'Types de congé'

Also available in: Unified diff