Compare commits
1 commit
main
...
batch_clas
| Author | SHA1 | Date | |
|---|---|---|---|
|
bb7cbc9d3b |
17 changed files with 188 additions and 360 deletions
|
|
@ -37,9 +37,10 @@
|
|||
{{* Immobilisation avec une écriture de sortie de bilan *}}
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
|
||||
{{:assign condition="("}}
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{:assign code=$code|cat:"%"|quote_sql}}
|
||||
{{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}}
|
||||
{{/foreach}}
|
||||
|
|
@ -78,6 +79,8 @@
|
|||
{{/select}}
|
||||
|
||||
<section class="immobilisation">
|
||||
<h2 class="ruler">Immobilisations archivées</h2>
|
||||
|
||||
{{:assign nb_immo=0}}
|
||||
<table class="list">
|
||||
<thead>
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{*
|
||||
Récupérer la config
|
||||
*}}
|
||||
|
||||
{{* config par défaut *}}
|
||||
{{:read file="./defaut.json" assign="config_defaut"}}
|
||||
{{:assign config_defaut=$config_defaut|json_decode}}
|
||||
|
||||
{{*
|
||||
{{if $module.config.tva != null}}
|
||||
{{:assign var="config.tva" value=$module.config.tva}}
|
||||
{{else}}
|
||||
{{:assign var="config.tva" value=$config_defaut.tva}}
|
||||
{{/if}}
|
||||
*}}
|
||||
|
||||
{{if $module.config.prefixes != null}}
|
||||
{{:assign var="config.prefixes" value=$module.config.prefixes}}
|
||||
{{else}}
|
||||
{{:assign var="config.prefixes" value=$config_defaut.prefixes}}
|
||||
{{/if}}
|
||||
|
|
@ -3,6 +3,11 @@
|
|||
{{* Liste des immobilisations en cours ou amorties *}}
|
||||
|
||||
<section class="immobilisation">
|
||||
{{if $type_immo == "encours"}}
|
||||
<h2 class="ruler">Immobilisations en cours</h2>
|
||||
{{elseif $type_immo == "amortie"}}
|
||||
<h2 class="ruler">Immobilisations amorties</h2>
|
||||
{{/if}}
|
||||
{{:assign nb_immo=0}}
|
||||
|
||||
<table class="list">
|
||||
|
|
@ -23,8 +28,9 @@
|
|||
{{* lister les immobilisations *}}
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
{{:assign condition="("}}
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{:assign code=$code|cat:"%"|quote_sql}}
|
||||
{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
|
||||
{{/foreach}}
|
||||
|
|
@ -125,12 +131,12 @@
|
|||
{{/if}}
|
||||
{{/select}}
|
||||
|
||||
{{* classement par onglet *}}
|
||||
{{if $type_immo == "managed" && $amort_amount >= $debit}}{{:continue}}{{/if}}
|
||||
{{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}}
|
||||
{{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}}
|
||||
{{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}}
|
||||
|
||||
{{* classement par onglet *}}
|
||||
{{if $type_immo == "encours" && $amort_amount >= $debit}}{{:continue}}{{/if}}
|
||||
{{if $type_immo == "encours" && $status == "amortized"}}{{:continue}}{{/if}}
|
||||
{{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}}
|
||||
{{if $type_immo == "amortie" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}}
|
||||
{{:assign nb_immo="%d+1"|math:$nb_immo}}
|
||||
<tr>
|
||||
<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
|
||||
|
|
@ -144,14 +150,14 @@
|
|||
{{if ! $exist_amort}}
|
||||
{{:linkbutton
|
||||
label="Paramètres"
|
||||
href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo
|
||||
href="add_infos.html?immo_id=%s&amort=1&op=modif&type_immo=%s"|args:$immo_id:$type_immo
|
||||
shape="settings"
|
||||
target="_dialog"
|
||||
}}
|
||||
{{elseif $status == "unknown"}}
|
||||
{{:linkbutton
|
||||
label="Paramètres"
|
||||
href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo
|
||||
href="add_infos.html?immo_id=%s&amort=1&op=new&type_immo=%s"|args:$immo_id:$type_immo
|
||||
shape="settings"
|
||||
target="_dialog"
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -3,21 +3,17 @@
|
|||
{{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
|
||||
|
||||
<section class="immobilisation">
|
||||
<h2 class="ruler">Autres immobilisations</h2>
|
||||
{{:assign nb_immo=0}}
|
||||
|
||||
<p class="help">
|
||||
Cette page liste les écritures pas (encore) prises en charges par le module ou classées non amortissables
|
||||
</p>
|
||||
|
||||
<form method="post" action="">
|
||||
<fieldset>
|
||||
{{:input type="checkbox" value=1 name="unhide" label="Afficher les écritures marquées ignorées" }}
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<form method="post" action="confirm_action.html?target=_dialog" target="_dialog">
|
||||
<table class="list">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="check">
|
||||
<input type="checkbox" title="Tout cocher / décocher" id="f_all" />
|
||||
<label for="f_all" title="Tout cocher / décocher"></label>
|
||||
</td>
|
||||
<th>N°</th>
|
||||
<th>Date</th>
|
||||
<th>Libellé</th>
|
||||
|
|
@ -32,8 +28,9 @@
|
|||
{{* lister les immobilisations *}}
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
{{:assign condition="("}}
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{:assign code=$code|cat:"%"|quote_sql}}
|
||||
{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
|
||||
{{/foreach}}
|
||||
|
|
@ -67,14 +64,8 @@
|
|||
{{else}}
|
||||
{{:assign status="unknown"}}
|
||||
{{/load}}
|
||||
{{if $_POST.unhide == null}}
|
||||
{{if $status != "unknown"}}
|
||||
{{:continue}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{if $status != "ignored" && $status != "unknown"}}
|
||||
{{:continue}}
|
||||
{{/if}}
|
||||
{{if $status != "unknown"}}
|
||||
{{:continue}}
|
||||
{{/if}}
|
||||
|
||||
{{* voir s'il existe des écritures d'amortissement associées *}}
|
||||
|
|
@ -102,7 +93,7 @@
|
|||
account.code LIKE '28%';
|
||||
:line_id = $immo_id|intval
|
||||
}}
|
||||
{{if $amort_amount != null}}
|
||||
{{if $status == "unknown" && $amort_amount != null}}
|
||||
{{:assign ignore=true}}
|
||||
{{else}}
|
||||
{{:assign ignore=false}}
|
||||
|
|
@ -115,6 +106,11 @@
|
|||
{{:assign nb_immo="%d+1"|math:$nb_immo}}
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
{{:input type="checkbox" name="check[%s]"|args:$immo_id value=$immo_id default=0}}
|
||||
<input type="hidden" name="label[{{$immo_id}}]" value="{{$trans_label}}">
|
||||
<input type="hidden" name="trans[{{$immo_id}}]" value="{{$trans_id}}">
|
||||
</td>
|
||||
<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
|
||||
<td>{{$trans_date|date_short}}</td>
|
||||
<td>{{$trans_label}}</td>
|
||||
|
|
@ -125,41 +121,52 @@
|
|||
{{if $status == "unknown"}}
|
||||
{{:linkbutton
|
||||
label="Paramètres"
|
||||
href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id
|
||||
href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autre"|args:$immo_id
|
||||
shape="settings"
|
||||
target="_dialog"
|
||||
}}
|
||||
{{else}}
|
||||
{{:linkbutton
|
||||
label="Paramètres"
|
||||
href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id
|
||||
href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autre"|args:$immo_id
|
||||
shape="settings"
|
||||
target="_dialog"
|
||||
}}
|
||||
{{/if}}
|
||||
{{:linkbutton
|
||||
label="Amortissements"
|
||||
href="amortization.html?immo_id=%s&type_immo=other"|args:$immo_id
|
||||
href="amortization.html?immo_id=%s&type_immo=autre"|args:$immo_id
|
||||
shape="table"
|
||||
}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/select}}
|
||||
</tbody>
|
||||
|
||||
{{:assign var="actions.amortize" value="Marquer l'immobilisation amortie"}}
|
||||
{{:assign var="actions.ignore" value="Ignorer l'écriture"}}
|
||||
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" />
|
||||
<label for="f_all2"></label>
|
||||
</td>
|
||||
<td class="actions" colspan="10">
|
||||
<em>Pour les écritures cochées :</em>
|
||||
{{*
|
||||
<input type="hidden" name="from" value="{$self_url}" />
|
||||
<input type="hidden" name="year" value="{$year.id}" />
|
||||
{csrf_field key="projects_action"}
|
||||
*}}
|
||||
|
||||
{{:input type="select" name="actions" options=$actions default_empty="— Choisir une action à effectuer —"}}
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
||||
</table>
|
||||
</form>
|
||||
{{if $nb_immo == 0}}
|
||||
<p class="block alert">Aucune immobilisation</p>
|
||||
{{/if}}
|
||||
</section>
|
||||
|
||||
<script type="text/javascript">
|
||||
function changeVisibility(evt, idcheck = 'f_unhide_1') {
|
||||
this.form.dispatchEvent(new Event('submit'));
|
||||
this.form.submit();
|
||||
}
|
||||
|
||||
(function () {
|
||||
document.getElementById('f_unhide_1').onclick = changeVisibility;
|
||||
})();
|
||||
|
||||
</script>
|
||||
|
|
|
|||
25
_nav.html
25
_nav.html
|
|
@ -1,33 +1,34 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
<nav class="tabs">
|
||||
{{if $current == "index" && $subsubcurrent == null}}
|
||||
{{if $current == 'index' && $subsubcurrent == null}}
|
||||
<aside>
|
||||
{{:linkbutton label="Ajouter une immobilisation" shape="plus" href="add_asset.html" target="_dialog"}}
|
||||
</aside>
|
||||
{{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "managed" || $type_immo == "other"}}
|
||||
{{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autre"}}
|
||||
<aside>
|
||||
{{if $autres_amort != null}}
|
||||
{{:linkbutton label="Rattacher une écriture" href="other_amortizations.html?immo_id=%s"|args:$_GET.immo_id shape="link" target="_dialog"}}
|
||||
{{:linkbutton label="Attacher un amortissement" href="other_amortizations.html?immo_id=%s"|args:$_GET.immo_id shape="plus" target="_dialog"}}
|
||||
{{/if}}
|
||||
{{:linkbutton label="Enregistrer un amortissement" shape="plus"
|
||||
href="save_amort.html?immo_id=%s"|args:$_GET.immo_id target="_dialog"}}
|
||||
</aside>
|
||||
{{/if}}
|
||||
|
||||
<ul>
|
||||
<li {{if $subcurrent == "managed"}}class="current"{{/if}}><a href="index.html?type_immo=managed">En cours</a></li>
|
||||
<li {{if $subcurrent == "amortized"}}class="current"{{/if}}><a href="index.html?type_immo=amortized">Amorties</a></li>
|
||||
<li {{if $subcurrent == "archived"}}class="current"{{/if}}><a href="index.html?type_immo=archived">Sorties du bilan</a></li>
|
||||
<li {{if $subcurrent == "other"}}class="current"{{/if}}><a href="index.html?type_immo=other">Autres</a></li>
|
||||
<li {{if $current == "config"}} class="current"{{/if}}><a href="config.html">Configuration</a></li>
|
||||
</ul>
|
||||
{{if $current == 'index'}} {{* && $subsubcurrent != 'balance_exit' *}}
|
||||
<ul>
|
||||
<li {{if $subcurrent == 'encours'}}class="current"{{/if}}><a href="index.html?type_immo=encours">En cours</a></li>
|
||||
<li {{if $subcurrent == 'amortie'}}class="current"{{/if}}><a href="index.html?type_immo=amortie">Amorties</a></li>
|
||||
<li {{if $subcurrent == 'sortie'}}class="current"{{/if}}><a href="index.html?type_immo=sortie">Sorties du bilan</a></li>
|
||||
<li {{if $subcurrent == 'autre'}}class="current"{{/if}}><a href="index.html?type_immo=autre">Autres</a></li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
|
||||
{{if $subsubcurrent == "amortization"}}
|
||||
{{if $subsubcurrent == 'amortization'}}
|
||||
<ul class="sub">
|
||||
<li class="title"><strong>Amortissements</strong></li>
|
||||
</ul>
|
||||
{{elseif $subsubcurrent == "balance_exit"}}
|
||||
{{elseif $subsubcurrent == 'balance_exit'}}
|
||||
<ul class="sub">
|
||||
<li class="title"><strong>Sortie de bilan</strong></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
|
||||
{{#years closed=false order="start_date" assign=years.}}
|
||||
{{:assign ts_debut=$start_date|strtotime}}
|
||||
|
|
@ -73,7 +74,7 @@
|
|||
file="_check_account.html"
|
||||
account=$debit_account
|
||||
chart_id=$selected_chart
|
||||
prefix_array=$config_defaut.prefixes
|
||||
prefix_array=$prefix_array
|
||||
keep="account_ok"
|
||||
}}
|
||||
|
||||
|
|
@ -116,9 +117,9 @@
|
|||
status=$status
|
||||
}}
|
||||
{{if $_POST.amortir}}
|
||||
{{:assign type_immo="managed"}}
|
||||
{{:assign type_immo="encours"}}
|
||||
{{else}}
|
||||
{{:assign type_immo="other"}}
|
||||
{{:assign type_immo="autre"}}
|
||||
{{/if}}
|
||||
{{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}}
|
||||
{{/form}}
|
||||
|
|
@ -133,14 +134,16 @@
|
|||
|
||||
{{* formulaire d'ajout d'immobilisation *}}
|
||||
|
||||
{{:assign var="immo_account.2" value="2 — Classe 2 — Comptes d'immobilisations"}}
|
||||
|
||||
{{#select id,label FROM acc_projects WHERE archived = 0;}}
|
||||
{{:assign var="projects.%d"|args:$id value=$label}}
|
||||
{{/select}}
|
||||
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{:assign var="pattern_array." value="%s*"|args:$code}}
|
||||
{{/foreach}}
|
||||
{{:assign var="patterns" value=$pattern_array|implode:"|"}}
|
||||
{{:assign patterns=$pattern_array|implode:"|"}}
|
||||
|
||||
<div id="erreur" class="hidden">
|
||||
<p class="block error">La date choisie n'est dans aucun exercice ouvert !</p>
|
||||
|
|
@ -179,7 +182,7 @@
|
|||
<fieldset>
|
||||
<legend>Amortissement</legend>
|
||||
<dl>
|
||||
{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
|
||||
{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur plusieurs années" checked="cheched" help="Dé-cocher pour ne pas amortir"}}
|
||||
<div id="div_amort">
|
||||
{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
|
||||
{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,19 @@
|
|||
|
||||
{{*
|
||||
@param immo_id
|
||||
@param type_immo : managed, amortized, archived, other
|
||||
@param amort = 1 si immo amortissable, 0 si non
|
||||
@param op = new ou modif
|
||||
@param type_immo : encours, amortie, sortie, autre
|
||||
*}}
|
||||
|
||||
{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}
|
||||
{{/load}}
|
||||
{{if $_GET.op == "modif"}}
|
||||
{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}
|
||||
{{/load}}
|
||||
{{/if}}
|
||||
|
||||
{{* Traiter l'envoi du formulaire *}}
|
||||
{{#form on="save"}}
|
||||
{{:debug post=$_POST}}
|
||||
{{if $_POST.classify == null}}
|
||||
{{:error message="Vous devez choisir une action"}}
|
||||
{{/if}}
|
||||
|
|
@ -51,11 +56,13 @@
|
|||
{{/if}}
|
||||
|
||||
{{* enregistrer les infos de l'immobilisation *}}
|
||||
{{if $info_immo == null}}
|
||||
{{if $_GET.op == "new"}}
|
||||
{{:assign key=""|uuid}}
|
||||
{{else}}
|
||||
{{:assign key=$info_immo.key}}
|
||||
{{/if}}
|
||||
{{:debug duree=$duration date=$date_debut classif=$_POST.classify status=$status}}
|
||||
|
||||
{{:save
|
||||
key=$key
|
||||
validate_schema="schema.json"
|
||||
|
|
@ -66,8 +73,10 @@
|
|||
status=$status
|
||||
}}
|
||||
|
||||
{{if $_POST.classify == "managed" || $_POST.classify == "amortized"}}
|
||||
{{:assign type_immo=$_POST.classify}}
|
||||
{{if $_POST.classify == "managed"}}
|
||||
{{:assign type_immo="encours"}}
|
||||
{{elseif $_POST.classify == "amortized"}}
|
||||
{{:assign type_immo="amortie"}}
|
||||
{{else}}
|
||||
{{:assign type_immo=$_GET.type_immo}}
|
||||
{{/if}}
|
||||
|
|
@ -76,43 +85,31 @@
|
|||
{{:form_errors}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Informations amortissement" custom_css=$custom_css current="module_amortissement"}}
|
||||
{{:admin_header title="Renseigner informations amortissement" custom_css=$custom_css current="module_amortissement"}}
|
||||
|
||||
{{* barre de navigation *}}
|
||||
{{if ! $dialog}}
|
||||
{{:include file="_nav.html" current="index"}}
|
||||
{{/if}}
|
||||
|
||||
{{if $info_immo == null}}
|
||||
{{:assign default=$_GET.type_immo}}
|
||||
{{else}}
|
||||
{{:assign default=$info_immo.status}}
|
||||
{{/if}}
|
||||
|
||||
{{if $_GET.type_immo == "managed" || $_GET.type_immo == "amortized"}}
|
||||
{{:assign disabled=0}}
|
||||
{{else}}
|
||||
{{* renseigner ou modifier la date de mise en service et la durée d'amortissement *}}
|
||||
{{if $_GET.amort == 0}}
|
||||
{{:assign disabled=1}}
|
||||
{{:assign default=""}}
|
||||
{{else}}
|
||||
{{:assign disabled=0}}
|
||||
{{:assign default="managed"}}
|
||||
{{/if}}
|
||||
|
||||
{{*
|
||||
- classer l'immobilisation
|
||||
- renseigner ou modifier la date de mise en service et la durée d'amortissement
|
||||
*}}
|
||||
<form method="post" action="">
|
||||
<fieldset id="classement_immo">
|
||||
<legend>Classement</legend>
|
||||
<fieldset id="infos_immo">
|
||||
<legend></legend>
|
||||
<dl>
|
||||
<dt><label>Faites un choix</label> <b>(obligatoire)</b></dt>
|
||||
{{:input type="radio-btn" name="classify" value="managed" label="Amortir" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
{{:input type="radio-btn" name="classify" value="amortized" label="Amortissement terminé" help="Cette immobilisation sera classée parmi les immobilisations amorties" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
{{:input type="radio-btn" name="classify" value="ignored" label="Ignorer l'écriture" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
{{:input type="radio" name="classify" value="managed" label="Amortir" help="Amortir cette immobilisation" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
{{:input type="radio" name="classify" value="amortized" label="Marquer amortie" help="Cette immobilisation sera classée parmi les immobilisations amorties" onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
{{:input type="radio" name="classify" value="ignored" label="Ignorer l'écriture" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}}
|
||||
|
||||
<fieldset id="infos_immo">
|
||||
<legend>Informations</legend>
|
||||
<dl>
|
||||
{{if $info_immo != null}}
|
||||
{{:assign date_defaut=$info_immo.date}}
|
||||
{{:assign duree_defaut=$info_immo.duration}}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{{*
|
||||
Lister les écritures d'amortissement associées à une immobilisation
|
||||
@param immo_id : id de la ligne d'immo
|
||||
@param type_immo : managed, amortized, archived, others
|
||||
@param type_immo : encours, amortie, sortie, autres
|
||||
*}}
|
||||
|
||||
{{* récupérer les infos de l'immobilisation *}}
|
||||
|
|
@ -114,14 +114,14 @@
|
|||
{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}}
|
||||
|
||||
{{* barre de navigation *}}
|
||||
{{if $_GET.type_immo == "amortized" || $valeur_residuelle== 0 }}
|
||||
{{:assign subcurrent="amortized"}}
|
||||
{{elseif $_GET.type_immo == "archived"}}
|
||||
{{:assign subcurrent="archived"}}
|
||||
{{elseif $_GET.type_immo == null || $_GET.type_immo == "managed"}}
|
||||
{{:assign subcurrent="managed"}}
|
||||
{{if $_GET.type_immo == "amortie" || $valeur_residuelle== 0 }}
|
||||
{{:assign subcurrent="amortie"}}
|
||||
{{elseif $_GET.type_immo == "sortie"}}
|
||||
{{:assign subcurrent="sortie"}}
|
||||
{{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}}
|
||||
{{:assign subcurrent="encours"}}
|
||||
{{else}}
|
||||
{{:assign subcurrent="other"}}
|
||||
{{:assign subcurrent="autre"}}
|
||||
{{/if}}
|
||||
|
||||
{{:include
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
<p class="block alert">Aucun amortissement enregistré pour cette immobilisation</p>
|
||||
{{/if}}
|
||||
|
||||
{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}}
|
||||
{{if $_GET.type_immo == null || $_GET.type_immo != "amortie"}}
|
||||
|
||||
{{* Autres amortissements non rattachés *}}
|
||||
|
||||
|
|
|
|||
191
config.html
191
config.html
|
|
@ -1,191 +0,0 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
|
||||
{{* barre de navigation *}}
|
||||
{{:include file="_nav.html" current="config"}}
|
||||
{{if $_GET.ok == 1}}
|
||||
<p class="block confirm">Configuration enregistrée.</p>
|
||||
{{/if}}
|
||||
|
||||
{{* lecture config (défaut ou enregistrée) *}}
|
||||
{{:include file="./_get_config.html" keep="config"}}
|
||||
|
||||
{{#form on="save"}}
|
||||
{{:assign ok=0}}
|
||||
{{#foreach from=$_POST.immo_accounts item="line"}}
|
||||
{{:assign elem=$line|values}}
|
||||
{{:assign elem=$elem.0}}
|
||||
{{:assign var="fields" value=$elem|explode:" "}}
|
||||
{{:assign present=false}}
|
||||
{{* ne pas garder si préfixe d'un compte déjà présent *}}
|
||||
{{#foreach from=$account_codes item="code"}}
|
||||
{{:assign pos=$code|strpos:$fields.0}}
|
||||
{{if $pos !== false}}
|
||||
{{:assign present=true}}
|
||||
{{:break}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
{{if ! $present}}
|
||||
{{:assign var="account_codes." value=$fields.0}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
{{:save
|
||||
key="config"
|
||||
prefixes=$account_codes|sort
|
||||
}}
|
||||
{{:assign ok=1}}
|
||||
|
||||
{{:redirect to="./config.html?ok=%d"|args:$ok}}
|
||||
{{/form}}
|
||||
|
||||
{{* récupérer l'exercice courant *}}
|
||||
{{:assign var="selected_year" from="logged_user.preferences.accounting_year}}
|
||||
{{if $selected_year == null}}
|
||||
{{* sélectionner l'exercice le plus probable *}}
|
||||
{{#years closed=false order="start_date"}}
|
||||
{{:assign var="open_years.%d"|args:$id value=$label}}
|
||||
{{if $start_date|strtotime <= $now && $end_date|strtotime >= $now}}
|
||||
{{:assign selected_year=$id}}
|
||||
{{:break}}
|
||||
{{/if}}
|
||||
{{/years}}
|
||||
{{/if}}
|
||||
|
||||
{{* libellés des comptes d'immobilisation *}}
|
||||
{{:assign condition="("}}
|
||||
{{#foreach from=$config.prefixes item="code"}}
|
||||
{{:assign code=$code|quote_sql}}
|
||||
{{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}}
|
||||
{{/foreach}}
|
||||
{{:assign condition=$condition|cat:"0)"}}
|
||||
{{:assign condition=$condition|cat:" AND year.id = %s"|args:$selected_year}}
|
||||
|
||||
{{#select
|
||||
account.id as account_id,
|
||||
account.code,
|
||||
account.id_chart,
|
||||
account.label,
|
||||
year.label as year_label,
|
||||
chart.label as chart_label
|
||||
FROM acc_accounts AS account
|
||||
INNER JOIN acc_charts AS chart ON chart.id = account.id_chart
|
||||
INNER JOIN acc_years AS year ON year.id_chart = chart.id
|
||||
WHERE !condition
|
||||
;
|
||||
!condition=$condition
|
||||
}}
|
||||
{{:assign var="accounts.%s"|args:$code label=$label id=$account_id}}
|
||||
{{/select}}
|
||||
|
||||
<h3>Comptes d'immobilisation</h3>
|
||||
<form method="post" action="">
|
||||
|
||||
<p class="help">
|
||||
Les immobilisations sont cherchées dans les comptes sélectionnées et leurs sous-comptes.
|
||||
</p>
|
||||
|
||||
<table class="list transaction-lines" id="asset_prefixes">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Compte</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#foreach from=$accounts key=code item=elem}}
|
||||
<tr>
|
||||
<td>
|
||||
{{:assign var="immo_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}}
|
||||
{{:assign var="current_account" from="immo_account.%s"|args:$code}}
|
||||
{{*:debug immo_account=$immo_account current_account=$current_account*}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="immo_accounts[]"
|
||||
target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code::$selected_year
|
||||
default=$current_account
|
||||
}}
|
||||
</td>
|
||||
<td class="actions">
|
||||
{{:button
|
||||
label="Enlever"
|
||||
title="Enlever une ligne"
|
||||
shape="minus"
|
||||
min="1"
|
||||
name="remove_line"
|
||||
}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/foreach}}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td class="actions">{{:button shape="plus" label="Ajouter" title="Ajouter un compte"}}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
<p class="submit">
|
||||
{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
|
||||
</p>
|
||||
</form>
|
||||
|
||||
<script type="text/javascript" src="scripts.js"></script>
|
||||
<script type="text/javascript">
|
||||
function remove_line(idtable, code) {
|
||||
let trouve = false, row = null;
|
||||
const table = document.getElementById(idtable);
|
||||
for (let i = 0; i < table.rows.length; ++i) {
|
||||
row = table.rows[i];
|
||||
for (let j = 0; j < row.cells.length; ++j) {
|
||||
const col = row.cells[j];
|
||||
if (col.innerText == code) {
|
||||
trouve = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (trouve) { break; }
|
||||
}
|
||||
if (row != null) {
|
||||
row.parentNode.removeChild(row);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" async="async">
|
||||
|
||||
// bouton - : supprimer une ligne
|
||||
var lines = $('.transaction-lines tbody tr');
|
||||
lines.forEach(initLine);
|
||||
|
||||
// bouton + : dupliquer une ligne
|
||||
$('.transaction-lines tfoot button')[0].onclick = () => {
|
||||
let lines = $('.transaction-lines tbody tr');
|
||||
var line = lines[lines.length - 1];
|
||||
var n = line.cloneNode(true);
|
||||
|
||||
// Réinitialiser le sélecteur de compte
|
||||
let b = n.querySelector('.input-list button');
|
||||
let url = b.value;
|
||||
let new_url = url.replace(/codes=[0-9]+\*?/, "codes=2*");
|
||||
b.value = new_url;
|
||||
|
||||
// gestionnaire d'événement
|
||||
b.onclick = () => {
|
||||
g.current_list_input = b.parentNode;
|
||||
let url = b.value + (b.value.indexOf('?') > 0 ? '&' : '?') + '_dialog';
|
||||
g.openFrameDialog(url);
|
||||
return false;
|
||||
};
|
||||
|
||||
// réinitialiser le label
|
||||
let l = n.querySelector('.input-list span.label');
|
||||
console.log("label=" + l.innerText);
|
||||
l.innerText = '';
|
||||
|
||||
line.parentNode.appendChild(n);
|
||||
initLine(n);
|
||||
|
||||
};
|
||||
</script>
|
||||
50
confirm_action.html
Normal file
50
confirm_action.html
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{#form on="validate"}}
|
||||
{{:debug get=$_GET post=$_POST}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Confirmer"}}
|
||||
{{:assign .="infos"}}
|
||||
{{*:debug post=$_POST*}}
|
||||
{{if $_POST.actions == "amortize"}}
|
||||
{{:assign action="Marquer l'immobilisation amortie"}}
|
||||
{{elseif $_POST.actions == "ignore"}}
|
||||
{{:assign action="Ignorer l'écriture"}}
|
||||
{{/if}}
|
||||
{{:assign msg_titre="Appliquer l'opération « %s » sur les écritures : "|args:$action}}
|
||||
|
||||
{{:assign msg_lines=""}}
|
||||
|
||||
{{:admin_header title="Confirmer l'opération" custom_css="./style.css" current="module_amortissement"*}}
|
||||
|
||||
<form method="post" action="">
|
||||
<div class="block alert">
|
||||
<p>Appliquer l'opération « {{$action}} » sur les écritures :</p>
|
||||
</div>
|
||||
<table class="list">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="num">N°</td>
|
||||
<td>Libellé</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#foreach from=$_POST.check item="line"}}
|
||||
<tr>
|
||||
{{:assign var="label" from="_POST.label.%s"|args:$line}}
|
||||
{{:assign var="trans_id" from="_POST.trans.%s"|args:$line}}
|
||||
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}}
|
||||
<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
|
||||
<td>{{$label}}</td>
|
||||
</tr>
|
||||
<input type="hidden" name="trans[{{$trans_id}}]" value="{{$line}}">
|
||||
{{/foreach}}
|
||||
</tbody>
|
||||
</table>
|
||||
<p class="submit">
|
||||
{{:button type="submit" name="validate" label="Confirmer" shape="right" class="main"}}
|
||||
</p>
|
||||
</form>
|
||||
|
||||
{{:admin_footer}}
|
||||
10
defaut.json
10
defaut.json
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"tva": false,
|
||||
"prefixes": [
|
||||
"20",
|
||||
"21",
|
||||
"27"
|
||||
]
|
||||
"prefixes": {
|
||||
"20": "Immobilisations incorporelles",
|
||||
"21": "Immobilisations corporelles",
|
||||
"27": "Immobilisations financières"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
19
index.html
19
index.html
|
|
@ -1,22 +1,13 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
{{:admin_header title="Immobilisations et amortissements" custom_css="./style.css" current="module_amortization"}}
|
||||
|
||||
{{* barre de navigation *}}
|
||||
{{if $_GET.type_immo == null}}
|
||||
{{:assign type_immo="managed"}}
|
||||
{{:assign type_immo="encours"}}
|
||||
{{else}}
|
||||
{{:assign type_immo=$_GET.type_immo}}
|
||||
{{/if}}
|
||||
|
||||
{{if $type_immo == "managed"}}
|
||||
{{:admin_header title="Immobilisations en cours" custom_css="./style.css" current="module_amortization"}}
|
||||
{{elseif $type_immo == "amortized"}}
|
||||
{{:admin_header title="Immobilisations amorties" custom_css="./style.css" current="module_amortization"}}
|
||||
{{elseif $type_immo == "archived"}}
|
||||
{{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}}
|
||||
{{elseif $type_immo == "other"}}
|
||||
{{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}}
|
||||
{{/if}}
|
||||
|
||||
{{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}}
|
||||
|
||||
{{if $_GET.ok}}
|
||||
|
|
@ -43,11 +34,11 @@
|
|||
{{/select}}
|
||||
{{/load}}
|
||||
|
||||
{{if $type_immo == "other"}}
|
||||
{{if $type_immo == "autre"}}
|
||||
{{:include file="_immobilisations_autres.html"}}
|
||||
{{elseif $type_immo == "archived"}}
|
||||
{{elseif $type_immo == "sortie"}}
|
||||
{{:include file="_archives.html"}}
|
||||
{{elseif $type_immo == "managed" || $type_immo == "amortized"}}
|
||||
{{elseif $type_immo == "encours" || $type_immo == "amortie"}}
|
||||
{{:include file="_immobilisations.html"}}
|
||||
{{/if}}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
name="Amortissements"
|
||||
description="Immobilisations et amortissements"
|
||||
description="Gestion des amortissements pour le logiciel de comptabilité Paheko"
|
||||
author="Jean-Christophe Engel"
|
||||
author_url="https://gitea.zaclys.com/lesanges"
|
||||
home_button=false
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@
|
|||
{{:include
|
||||
file="_nav.html"
|
||||
current="index"
|
||||
subcurrent="other"
|
||||
subcurrent="autre"
|
||||
subsubcurrent="amortization"
|
||||
type_immo="other"
|
||||
type_immo="autre"
|
||||
autres_amort=$autres_amortissements
|
||||
}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -149,7 +149,8 @@
|
|||
*}}
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{* déterminer le numéro du compte d'amortissement associé au compte d'immobilisation *}}
|
||||
{{:include
|
||||
file="./_get_amort_code.html"
|
||||
|
|
@ -213,7 +214,7 @@
|
|||
|
||||
{{* barre de navigation *}}
|
||||
{{if ! $dialog}}
|
||||
{{:include file="_nav.html" current="index" subcurrent="managed" subsubcurrent="amortization"}}
|
||||
{{:include file="_nav.html" current="index" subcurrent="encours" subsubcurrent="amortization"}}
|
||||
{{/if}}
|
||||
|
||||
{{:form_errors}}
|
||||
|
|
@ -253,7 +254,7 @@
|
|||
{{:input
|
||||
type="list"
|
||||
name="credit_account"
|
||||
label="Compte d'amortissement (28xx)"
|
||||
label="Compte d'amortissement (280xx ou 281xx)"
|
||||
required=true
|
||||
target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"28*":$selected_year
|
||||
default=$credit_account
|
||||
|
|
|
|||
18
scripts.js
18
scripts.js
|
|
@ -139,21 +139,3 @@ function setSelectorYear(button_names, f_years_selector) {
|
|||
const selected_year = document.getElementById(f_years_selector).value;
|
||||
setAccountYear(button_names, selected_year);
|
||||
}
|
||||
|
||||
// config : gestion des ajouts/suppression comptes immo
|
||||
|
||||
function initLine(row) {
|
||||
var removeBtn = row.querySelector('button[name="remove_line"]');
|
||||
removeBtn.onclick = () => {
|
||||
var count = $('.transaction-lines tbody tr').length;
|
||||
var min = removeBtn.getAttribute('min');
|
||||
|
||||
if (count <= min) {
|
||||
alert("Il n'est pas possible d'avoir moins de " + min + " compte(s).");
|
||||
return false;
|
||||
}
|
||||
|
||||
row.parentNode.removeChild(row);
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@
|
|||
}}
|
||||
{{/if}}
|
||||
|
||||
{{:redirect to="index.html?type_immo=archived"}}
|
||||
{{:redirect to="index.html?type_immo=sortie"}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}
|
||||
|
|
@ -311,8 +311,9 @@
|
|||
|
||||
{{:read file="./defaut.json" assign="config_json"}}
|
||||
{{:assign config_defaut=$config_json|json_decode}}
|
||||
{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}}
|
||||
|
||||
{{#foreach from=$config_defaut.prefixes item="code"}}
|
||||
{{#foreach from=$prefix_array item="code"}}
|
||||
{{:assign var="pattern_array." value="%s*"|args:$code}}
|
||||
{{/foreach}}
|
||||
{{:assign patterns=$pattern_array|implode:"|"}}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue