Overview
Comment: | Corrections diverses compta |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
96a4392911000f685b37de43606ae678 |
User & Date: | bohwaz on 2017-08-17 04:46:21 |
Other Links: | branch diff | manifest | tags |
Context
2017-08-17
| ||
05:51 | Améliorer l'ergonomie du menu en version mobile check-in: 8210e2358b user: bohwaz tags: dev | |
04:46 | Corrections diverses compta check-in: 96a4392911 user: bohwaz tags: dev | |
04:45 | Correction rapport d'erreur dans page config check-in: 06ebefa8c7 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Compta/Rapprochement.php from [0ca57367ca] to [86bba5a596].
︙ | ︙ | |||
50 51 52 53 54 55 56 | } $solde_final = $solde; return $result; } | | < < < < < | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | } $solde_final = $solde; return $result; } public function record($compte, array $journal, array $cases = null, $id_auteur) { if (!is_array($cases) && empty($cases)) { $cases = []; } $db = DB::getInstance(); $db->begin(); // Synchro des trucs cochés $st = $db->prepare('INSERT OR REPLACE INTO compta_rapprochement (id_operation, id_auteur) VALUES (:operation, :auteur);'); $st->bindValue(':auteur', (int)$id_auteur, \SQLITE3_INTEGER); foreach ($journal as $row) { if (!array_key_exists($row->id, $cases)) continue; $st->bindValue(':operation', (int)$row->id, \SQLITE3_INTEGER); |
︙ | ︙ |
Modified src/templates/admin/compta/banques/index.tpl from [a86799ae10] to [0a7511f564].
︙ | ︙ | |||
39 40 41 42 43 44 45 | {/foreach} </tbody> </table> </dl> {/if} {if $user.droits.compta >= Garradin\Membres::DROIT_ADMIN} | < < | < < | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | {/foreach} </tbody> </table> </dl> {/if} {if $user.droits.compta >= Garradin\Membres::DROIT_ADMIN} {form_errors} <form method="post" action="{$self_url}"> <fieldset> <legend>Ajouter un compte bancaire</legend> <dl> <dt><label for="f_libelle">Libellé</label> <b title="(Champ obligatoire)">obligatoire</b></dt> |
︙ | ︙ |
Modified src/templates/admin/compta/banques/rapprocher.tpl from [a6ece77d56] to [83adac4f18].
︙ | ︙ | |||
18 19 20 21 22 23 24 | </dl> </fieldset> {/if} <fieldset> <legend>Période de rapprochement</legend> <p> Du | | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | </dl> </fieldset> {/if} <fieldset> <legend>Période de rapprochement</legend> <p> Du <span><input type="date" name="debut" id="f_debut" value="{form_field name='debut' default=$debut}" /></span> au <span><input type="date" name="fin" id="f_fin" value="{form_field name='fin' default=$fin}" /></span> <input type="hidden" name="id" value="{$compte.id}" /> <input type="submit" value="Afficher" /> </p> </fieldset> </form> {form_errors} |
︙ | ︙ |
Modified src/templates/admin/membres/cotisations/index.tpl from [584a0a21f3] to [5123c182b4].
︙ | ︙ | |||
124 125 126 127 128 129 130 | if (!$('#f_periodicite_jours').checked) hide.push('.periode_jours'); if (!$('#f_periodicite_dates').checked) hide.push('.periode_dates'); | | | | | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | if (!$('#f_periodicite_jours').checked) hide.push('.periode_jours'); if (!$('#f_periodicite_dates').checked) hide.push('.periode_dates'); g.toggle(hide, false); $('#f_categorie').onchange = function() { g.toggle('.cat_compta', this.checked); return true; }; function togglePeriode() { g.toggle(['.periode_jours', '.periode_dates'], false); if (this.checked && this.value == 'jours') g.toggle('.periode_jours', true); else if (this.checked && this.value == 'date') g.toggle('.periode_dates', true); } $('#f_periodicite_ponctuel').onchange = togglePeriode; $('#f_periodicite_dates').onchange = togglePeriode; $('#f_periodicite_jours').onchange = togglePeriode; })(); {/literal} </script> {/if} {include file="admin/_foot.tpl"} |