Skip to content

Commit

Permalink
Correction export Filoue
Browse files Browse the repository at this point in the history
  • Loading branch information
bsongis committed Apr 13, 2021
1 parent c51580d commit c70e9d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion generation/export_filoue.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def execute(self, text):
"heures-realisees": "%04.02f" % heures_realisees,
"total-facture": "%06.02f" % total_facture,
"tarif-horaire": "%02.02f" % ((total_facture / heures_facturees) if heures_facturees else 0),
"taux-effort": ("%01.02f" % facture_heures.taux_effort) if facture_heures.taux_effort else None,
"taux-effort": ("%01.02f" % facture.taux_effort) if facture.taux_effort else None,
"premier-jour": max(self.start, min([contrat.debut for contrat in inscrit.get_inscriptions() if contrat.debut and not contrat.preinscription])).strftime("%d/%m/%Y"),
"dernier-jour": min(self.end, max([(contrat.GetFin() if contrat.GetFin() else self.end) for contrat in inscrit.get_inscriptions() if contrat.debut and not contrat.preinscription])).strftime("%d/%m/%Y"),
}
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Gertrude; if not, see <http://www.gnu.org/licenses/>.

VERSION = '1.22.35'
VERSION = '1.22.36'

0 comments on commit c70e9d2

Please sign in to comment.