Revision 90ff0811
Added by Jérôme Schneider almost 12 years ago
| calebasse/actes/forms.py | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
class ActSearchForm(forms.Form): |
| 9 | 9 |
STATES = ( |
| 10 |
('valide', u'Validé'),
|
|
| 10 |
('valide', u'Validés'),
|
|
| 11 | 11 |
('non-valide', u'Non validé'),
|
| 12 |
# ('absent-or-canceled', u'Absent ou annulés'),
|
|
| 12 |
('absent-or-canceled', u'Absent ou annulés'),
|
|
| 13 | 13 |
('is-billable', u'Facturable'),
|
| 14 | 14 |
('non-invoicable', u'Non facturable'),
|
| 15 | 15 |
('switch-billable', u'Inversion de facturabilité'),
|
| calebasse/actes/models.py | ||
|---|---|---|
| 81 | 81 |
is_lost = models.BooleanField(default=False, |
| 82 | 82 |
verbose_name=u'Acte perdu', db_index=True) |
| 83 | 83 |
valide = models.BooleanField(default=False, |
| 84 |
verbose_name=u'Valide', db_index=True)
|
|
| 84 |
verbose_name=u'Validé', db_index=True)
|
|
| 85 | 85 |
switch_billable = models.BooleanField(default=False, |
| 86 | 86 |
verbose_name=u'Inverser type facturable') |
| 87 | 87 |
healthcare = models.ForeignKey('dossiers.HealthCare',
|
| calebasse/actes/templates/actes/act_listing.html | ||
|---|---|---|
| 88 | 88 |
<th>Dossier</th> |
| 89 | 89 |
<th>État</th> |
| 90 | 90 |
<th>Type d'acte</th> |
| 91 |
<th>Validé</th> |
|
| 92 | 91 |
<th>Facturé</th> |
| 92 |
<th>Facturable</th> |
|
| 93 |
<th>Perdu</th> |
|
| 94 |
<th>Pause</th> |
|
| 93 | 95 |
<th>Intervenants</th> |
| 94 | 96 |
<th>Heure</th> |
| 95 | 97 |
<th>Durée</th> |
| ... | ... | |
| 106 | 108 |
</td> |
| 107 | 109 |
<td>{{ act.get_state }}</td>
|
| 108 | 110 |
<td>({{ act.act_type.id }}) {{ act.act_type }}</td>
|
| 109 |
<td>{{ act.valide|yesno:"Oui,Non," }}</td>
|
|
| 110 |
<td>{{ act.is_billed|yesno:"Oui,Non,None" }}</td>
|
|
| 111 |
<td>{% if act.invoice_set.all %}{{ act.invoice_set.all.0.number }}{% endif %}</td>
|
|
| 112 |
<td>{{ act.is_billable|yesno:"Oui,Non," }}{% if act.switch_billable %} (I){% endif %}</td>
|
|
| 113 |
<td>{{ act.is_lost|yesno:"Oui,Non," }}</td>
|
|
| 114 |
<td>{{ act.pause|yesno:"Oui,Non," }}</td>
|
|
| 111 | 115 |
<td> |
| 112 | 116 |
{% for doctor in act.doctors.all %}
|
| 113 | 117 |
({{ doctor.id }}) {{ doctor }}
|
| calebasse/actes/views.py | ||
|---|---|---|
| 40 | 40 |
qs = qs.filter(valide=False) |
| 41 | 41 |
if 'absent-or-canceled' in filters: |
| 42 | 42 |
# TODO : how to filter this without change the model ? |
| 43 |
pass |
|
| 44 | 43 |
if 'is-billable' in filters: |
| 45 | 44 |
qs = qs.filter( |
| 46 | 45 |
(Q(act_type__billable=True) & Q(switch_billable=False)) | \ |
| calebasse/views.py | ||
|---|---|---|
| 13 | 13 |
APPLICATIONS = ( |
| 14 | 14 |
(u'Gestion des dossiers', 'dossiers', False), |
| 15 | 15 |
(u'Agenda', 'agenda', False), |
| 16 |
# (u'Saisie des actes', 'actes', True),
|
|
| 16 |
(u'Saisie des actes', 'actes', True), |
|
| 17 | 17 |
(u'Facturation et décompte', 'facturation', True), |
| 18 | 18 |
(u'Gestion des personnes', 'personnes', True), |
| 19 | 19 |
(u'Gestion des ressources', 'ressources', True), |
Also available in: Unified diff
actes: improve presentation (#2092)