Overview
Comment: | Fix last minute issues |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev | 1.0.0-beta8 |
Files: | files | file ages | folders |
SHA1: |
3a8f287453533b2fc7482d49cab86c7d |
User & Date: | bohwaz on 2020-11-25 22:11:52 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-25
| ||
22:26 | Fix issues with background check-in: 8bfc828da2 user: bohwaz tags: dev, 1.0.0-beta8 | |
22:11 | Fix last minute issues check-in: 3a8f287453 user: bohwaz tags: dev, 1.0.0-beta8 | |
19:31 | Add column with project code, patch by @zou check-in: f9f9d935a7 user: bohwaz tags: dev, 1.0.0-beta8 | |
Changes
Modified src/include/lib/Garradin/Utils.php from [2f36c3168c] to [b88f9cb850].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | else { return null; } } static public function strftime_fr($ts, $format) { $ts = self::get_datetime($ts); $date = strftime($format, $ts->getTimestamp()); $date = strtr($date, self::FRENCH_DATE_NAMES); $date = strtolower($date); return $date; } static public function date_fr($ts, $format = null) { if (is_null($format)) { $format = 'd/m/Y à H:i'; } $date = self::get_datetime($ts); $date = $date->format($format); | > > > > > > > > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | else { return null; } } static public function strftime_fr($ts, $format) { if (null === $ts) { return $ts; } $ts = self::get_datetime($ts); $date = strftime($format, $ts->getTimestamp()); $date = strtr($date, self::FRENCH_DATE_NAMES); $date = strtolower($date); return $date; } static public function date_fr($ts, $format = null) { if (null === $ts) { return $ts; } if (is_null($format)) { $format = 'd/m/Y à H:i'; } $date = self::get_datetime($ts); $date = $date->format($format); |
︙ | ︙ |
Modified src/templates/acc/transactions/actions_analytical.tpl from [f3e59030a3] to [326812a369].
1 2 3 4 5 6 7 8 9 10 | {include file="admin/_head.tpl" title="Ajouter/supprimer des écritures à un projet" current="acc/accounts"} {form_errors} <form method="post" action="{$self_url}"> <fieldset> <legend>Affecter {$count} écritures sélectionnées à un projet</legend> <dl> <dd> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | {include file="admin/_head.tpl" title="Ajouter/supprimer des écritures à un projet" current="acc/accounts"} {form_errors} <form method="post" action="{$self_url}"> <fieldset> <legend>Affecter {$count} écritures sélectionnées à un projet</legend> <dl> <dd> {input type="select" name="id_analytical" options=$analytical_accounts label="Projet à utiliser" help="Pour retirer les écritures de leur projet actuellement affecté, sélectionner simplement « Aucun projet »."} </dd> </dl> </fieldset> <p class="submit"> {csrf_field key="acc_actions"} <input type="hidden" name="action" value="add" /> |
︙ | ︙ |