diff --git a/_archives.html b/_archives.html index 791db91..fafad3b 100644 --- a/_archives.html +++ b/_archives.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations archivées *}} +{{* Liste des immobilisations sorties du bilan *}}

Cette page liste les immobilisations sorties du bilan

@@ -8,48 +8,21 @@ {{* Immobilisation avec une écriture de sortie de bilan *}} {{:include file="_get_config.html" keep="module.config"}} -{{:assign accounts_condition="("}} +{{* lister les immobilisations *}} +{{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign accounts_condition=$accounts_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} + {{:assign account_condition=$account_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} -{{:assign accounts_condition=$accounts_condition|cat:"0)"}} -{{:assign condition=$accounts_condition|cat:" AND acc2.code = account.code AND line.debit > 0 AND line.debit = line2.credit AND NOT (trans.status & 16)"}} +{{:assign account_condition=$account_condition|cat:"0)"}} -{{:assign filter_condition=" NOT ("}} +{{:assign filter_condition=" AND NOT ("}} {{#foreach from=$module.config.filters item="filter"}} {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} {{/foreach}} {{:assign filter_condition=$filter_condition|cat:"0)"}} -{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}} - -{{#select - trans.id as trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_id, - account.id as account_id, - account.code as account_code, - account.label as account_label, - line.debit AS debit, - project.label as project_label, - trans.id_year as trans_id_year, - trans2.date as exit_date - FROM acc_transactions AS trans - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_transactions_lines AS line2 ON line.debit = line2.credit - INNER JOIN acc_transactions AS trans2 ON trans2.id = line2.id_transaction - INNER JOIN acc_accounts AS acc2 ON acc2.id = line2.id_account - LEFT JOIN acc_projects AS project ON line.id_project = project.id - WHERE !condition - ORDER BY trans.date DESC; - !condition=$condition - assign="immo_archivee" - }} - {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} -{{/select}} +{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}}
@@ -67,28 +40,79 @@ - {{:assign nb_immo=0}} - {{:assign total_immo = 0}} - {{:assign total_cessions = 0}} - {{#foreach from=$immo_archivees}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} - {{:assign nb_immo="%d+1"|math:$nb_immo}} - {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}} - - - - - - - - - - - + + {{:assign nb_immo=0}} + {{:assign total_immo = 0}} + {{:assign total_cessions = 0}} + + {{#select + trans.id as trans_id, + trans.label as trans_label, + trans.date as trans_date, + trans.id_year as trans_id_year, + line.id as immo_id, + line.debit AS debit, + account.id as account_id, + account.code as account_code, + account.label as account_label, + project.label as project_label + FROM acc_transactions AS trans + INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id + INNER JOIN acc_accounts AS account ON line.id_account = account.id + INNER JOIN acc_years AS years ON trans.id_year = years.id + LEFT JOIN acc_projects AS project ON line.id_project = project.id + WHERE !condition + ORDER BY trans.date DESC; + !condition=$condition + }} + {{:assign montant_immo=$debit}} + {{* voir si l'immo est prise en charge *}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} + {{/if}} + {{else}} + {{:assign amortissable="nsp"}} + {{:assign status="unknown"}} + {{/load}} + {{if $status == "ignored"}} + {{:continue}} + {{/if}} + + {{* voir s'il existe une écriture liée qui solde l'immobilisation *}} + {{#select + trans.date as exit_date + FROM acc_transactions_links AS link + INNER JOIN acc_transactions AS trans ON + (CASE + WHEN link.id_transaction = :trans_id THEN link.id_related + WHEN link.id_related = :trans_id THEN link.id_transaction + END) = trans.id + INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id + INNER JOIN acc_accounts AS acc on line.id_account=acc.id + WHERE line.credit = :montant_immo + AND acc.code = :account_code + ; + :trans_id = $trans_id + :montant_immo = $montant_immo + :account_code = $account_code + }} + {{:assign status="archived"}} + {{:assign exit_date=$exit_date}} + {{/select}} + + {{if $status != "archived"}} + {{:continue}} + {{/if}} + + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} + {{:assign nb_immo="%d+1"|math:$nb_immo}} + {{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}} + {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} + {{* voir s'il y a une écriture de cession associée à cette immo *}} {{#select trans.id, @@ -100,21 +124,33 @@ acc.label FROM acc_transactions_links AS link INNER JOIN acc_transactions AS trans ON (CASE - WHEN link.id_transaction = :trans_id THEN link.id_related - WHEN link.id_related = :trans_id THEN link.id_transaction + WHEN link.id_transaction = :trans_id THEN link.id_related + WHEN link.id_related = :trans_id THEN link.id_transaction END) = trans.id INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS acc ON line.id_account = acc.id WHERE (link.id_transaction = :trans_id OR link.id_related = :trans_id) AND acc.code = 462 ; :trans_id = $trans_id - }} + }} {{:assign var="montant" from="montant_cessions.%d"|args:$account_code}} {{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$debit}} {{:assign total_cessions="%d+%d"|math:$total_cessions:$debit}} {{/select}} - {{/foreach}} - + + + + + + + + + + + + + {{/select}} {{if $total_immo != 0}} @@ -130,18 +166,18 @@ - {{/foreach}} - - - - - - - - - - - + {{/foreach}} + + + + + + + + + + + {{/if}} {{if $total_cessions != 0}} diff --git a/_immobilisations.html b/_immobilisations.html index 16500eb..5af7777 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -31,22 +31,21 @@ {{* lister les immobilisations *}} {{:include file="_get_config.html" keep="module.config"}} - {{:assign condition="("}} + {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} + {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} - {{:assign condition=$condition|cat:"0)"}} - {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} + {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign filter_condition=" NOT ("}} + {{:assign filter_condition=" AND NOT ("}} {{#foreach from=$module.config.filters item="filter"}} {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} {{/foreach}} {{:assign filter_condition=$filter_condition|cat:"0)"}} - {{:assign condition=$condition|cat:" AND "|cat:$filter_condition}} + {{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}} {{:assign nb_immo=0}} {{:assign total_immo = 0}} {{#select @@ -54,10 +53,10 @@ trans.label as trans_label, trans.date as trans_date, line.id as immo_id, + line.debit AS debit, account.id as account_id, account.code as account_code, account.label as account_label, - line.debit AS debit, trans.id_year as trans_id_year FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id @@ -70,11 +69,15 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign duration=null}} + {{:assign montant_immo=$debit}} {{* voir si l'immo est prise en charge *}} {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{:assign duration=$duration}} {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} + {{/if}} {{else}} {{:assign amortissable="nsp"}} {{:assign status="unknown"}} @@ -84,25 +87,17 @@ {{/if}} {{* voir s'il existe une écriture qui solde l'immobilisation *}} - {{:assign ignore=false}} {{#select - line.id AS line, - line.id_transaction AS trans, - line.debit, - line.label, - line2.id AS line2, - line2.id_transaction AS trans2, - line2.credit, - line2.label + line.id AS line FROM acc_transactions_lines AS line INNER JOIN acc_accounts AS acc ON acc.id = line.id_account INNER JOIN acc_transactions_lines AS line2 ON line2.id_account = acc.id WHERE line.id = :line_id - AND line2.credit = line.debit; + AND line2.credit = :montant_immo; :line_id = $immo_id|intval - }} - {{:assign ignore=true}} + :montant_immo = $montant_immo + }} {{:assign status="archived"}} {{/select}} {{if $status == "archived"}} @@ -138,29 +133,29 @@ {{:assign exist_amort=false}} {{:assign amort_amount=0}} {{else}} - {{:assign amort_amount=$amort_amount}} {{:assign exist_amort=true}} + {{:assign amort_amount=$amort_amount}} {{/if}} {{/select}} {{* classement par onglet *}} - {{if $type_immo == "managed" && $amort_amount >= $debit}}{{:continue}}{{/if}} + {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{: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}} + {{if $type_immo == "amortized" && $amort_amount < $montant_immo && $status != "amortized"}}{{:continue}}{{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} - {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} + {{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}} {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} - + - +
#{{$trans_id}}{{$trans_date|date_short}}{{$exit_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{$account_code}}{{$account_label}}{{$project_label}} -
#{{$trans_id}}{{$trans_date|date_short}}{{$exit_date|date_short}}{{$trans_label}}{{"%f"|math:$montant_immo|money_html:false|raw}}{{$account_code}}{{$account_label}}{{$project_label}} +
Total des immobilisations{{$total_immo|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html:false|raw}}
#{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}}{{$debit|money_html:false|raw}}{{$montant_immo|money_html:false|raw}} {{if $duration != null}}{{$duration}}{{/if}} {{$amort_amount|money_html:false|raw}}{{"%d-%d"|math:$debit:$amort_amount|money_html:false|raw}}{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}} {{$account_code}} {{if ! $exist_amort}} diff --git a/add_infos.html b/add_infos.html index 569aff8..68bf6e6 100644 --- a/add_infos.html +++ b/add_infos.html @@ -8,26 +8,28 @@ {{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} {{/load}} +{{* données de l'immobilisaion *}} +{{#select + trans.date as date_achat, + line.debit as montant + FROM acc_transactions_lines AS line + INNER join acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; + :line_id = $_GET.immo_id + assign=ligne_immo + }} +{{/select}} + {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} {{if $_POST.classify == null}} {{:error message="Vous devez choisir une action"}} {{/if}} - {{* chercher la date d'acquisition de l'immobilisation *}} - {{#select - trans.date as date_achat - FROM acc_transactions_lines AS line - INNER join acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :line_id; - :line_id = $_GET.immo_id - assign=ligne_immo - }} - {{/select}} - {{if $_POST.classify == "ignored"}} {{* ne pas amortir *}} {{:assign duration=0}} + {{:assign montant=0}} {{:assign date_debut=$ligne_immo.date_achat|parse_date}} {{:assign status="ignored"}} {{else}} @@ -38,6 +40,7 @@ {{:assign da=$ligne_immo.date_achat|date_short}} {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$dd:$da}} {{/if}} + {{if $_POST.classify == "amortized"}} {{:assign duration=0}} {{:assign status="amortized"}} @@ -48,6 +51,7 @@ {{/if}} {{:assign status="managed"}} {{/if}} + {{:assign montant="%d*100"|math:$_POST.montant}} {{/if}} {{* enregistrer les infos de l'immobilisation *}} @@ -56,18 +60,22 @@ {{else}} {{:assign key=$info_immo.key}} {{/if}} + {{:save key=$key validate_schema="schema.json" type="immo" line=$_GET.immo_id|intval duration=$duration + amount=$montant|intval date=$date_debut status=$status }} {{if $_POST.classify == "managed" || $_POST.classify == "amortized"}} {{:assign type_immo=$_POST.classify}} + {{elseif $_POST.classify == "ignored"}} + {{:assign type_immo="other"}} {{else}} {{:assign type_immo=$_GET.type_immo}} {{/if}} @@ -89,20 +97,24 @@ {{:assign default=$info_immo.status}} {{/if}} -{{if $_GET.type_immo == "managed" || $_GET.type_immo == "amortized"}} - {{:assign disabled=0}} +{{if $info_immo != null}} + {{:assign date_defaut=$info_immo.date}} + {{:assign duree_defaut=$info_immo.duration}} + {{:assign montant_defaut=$info_immo.amount}} {{else}} - {{:assign disabled=1}} + {{:assign duree_defaut=null}} + {{:assign montant_defaut=null}} {{/if}} {{* - classer l'immobilisation - - renseigner ou modifier la date de mise en service et la durée d'amortissement - *}} + - renseigner ou modifier la date de mise en service, le montant de + l'immobilisation et la durée d'amortissement +*}}
-
+
Classement -
+
(obligatoire)
{{:input type="radio-btn" name="classify" value="managed" label="Amortir" default=$default}} {{:input type="radio-btn" name="classify" value="amortized" label="Amortissement terminé" help="Cette immobilisation sera classée parmi les immobilisations amorties" default=$default}} @@ -113,15 +125,10 @@
Informations
- {{if $info_immo != null}} - {{:assign date_defaut=$info_immo.date}} - {{:assign duree_defaut=$info_immo.duration}} - {{else}} - {{:assign duree_defaut=null}} - {{/if}}
- {{:input type="number" name="duree" label="Durée d'amortissement" default=$duree_defaut required=true min=1 disabled=$disabled}} - {{:input type="date" name="date_mes" label="Date de mise en service" default=$date_defaut disabled=$disabled help="à renseigner uniquement si différente de la date d'acquisition"}} + {{:input type="number" name="duree" label="Durée d'amortissement" default=$duree_defaut required=true min=1 }} + {{:input type="money" name="montant" label="Montant" default=$montant_defaut help="à renseigner uniquement si différent du montant de l'acquisition"}} + {{:input type="date" name="date_mes" label="Date de mise en service" default=$date_defaut help="à renseigner uniquement si différente de la date d'acquisition"}}
@@ -134,24 +141,23 @@ {{:admin_footer}} -{{* activer/désactiver les champs de saisie *}}