diff --git a/README.md b/README.md index 578af08..e771e69 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,15 @@ Ce module permet de gérer les écritures d'amortissements pour les immobilisati - lister les immobilisations - ajouter une nouvelle immobilisation -- lister les amortissements d'une immobilisation +- lister les amortissements d'une immobilisation : + - amortissements déjà enregistrés + - amortissements à venir +- associer une écriture d'amortissement à une immobilisation - enregistrer un nouvel amortissement -- incorporer d'anciennes immobilisations et leurs amortisements ## Installation - télécharger [l'archive zip](https://link.infini.fr/amortissement) - cliquer « Configuration » puis « Extensions » - en bas de la page, cliquer « Importer un module » - sélectionner l'archive téléchargée ci-dessus -- activer le module - +- activer le module qui est maintenant présent dans la liste des extensions inactives diff --git a/_archives.html b/_archives.html index 7619bcb..e774b6d 100644 --- a/_archives.html +++ b/_archives.html @@ -1,226 +1,120 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations sorties du bilan *}} -

- Cet onglet liste les immobilisations sorties du bilan car elles ne - sont plus utilisées dans l'association (vétusté, fin de vie, - vente...). -

+{{* Liste des immobilisations archivées *}} -{{:include file="_get_config.html" keep="module.config"}} +{{* Immobilisation archivées prises en charge *}} +{{#load type="immo" where="$$.status = 'archived'"}} + {{:assign var="lines." value="'%s'"|args:$line}} +{{/load}} +{{:assign lines=$lines|implode:","}} +{{:assign lines="("|cat:$lines|cat:")"}} +{{:assign condition="line.id IN %s"|args:$lines}} -{{if $module.table != null}} +{{#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 + 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="immo_archivee" +}} + {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} +{{/select}} - {{* lister les immobilisations *}} - {{:assign account_condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} - {{/foreach}} - {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign status_condition="($$.status = 'archived')"}} +{{* 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 filter_condition=" ("}} - {{#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=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND NOT "|cat:$filter_condition|cat:" AND "|cat:$status_condition}} +{{:assign condition="("}} +{{#foreach from=$prefix_array item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} +{{/foreach}} +{{:assign condition=$condition|cat:"0)"}} +{{:assign cond2=$condition|replace:"account.":"acc2."}} +{{:assign condition=$condition|cat:" AND "|cat:$cond2}} +{{:assign condition=$condition|cat:" AND line.debit > 0 AND NOT (trans.status & 16)"}} - {{: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_line_id, - line.label as line_label, - line.debit AS debit, - account.id as account_id, - account.code as account_code, - account.label as account_label, - info.id as immo_doc_id, - $$.label as doc_label, - $$.amount as doc_amount, - $$.date_achat as doc_date_achat, - $$.date_mes as doc_date_mes, - $$.status as status - 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 - INNER JOIN !table AS info ON $$.line = line.id - WHERE !condition - ORDER BY trans.date DESC; - !table=$module.table - !condition=$condition - assign="immo_line" +{{#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 + 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 + 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_line.date_mes" value=$doc_date_mes|or:$doc_date_achat|or:$trans_date}} - {{:assign var="immo_line.montant_immo" value=$doc_amount|or:$debit}} - - {{* chercher le doc de sortie du bilan *}} - {{:assign var="immo_line.exit_date" value=null}} - {{#load type="exit_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id=$immo_doc_id}} - {{:assign exit_line_id=$exit_line_id}} - {{#select - trans.date - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :exit_line_id; - :exit_line_id=$exit_line_id - }} - {{:assign var="immo_line.exit_date" value=$date}} - {{/select}} - {{/load}} - - {{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} - {{:assign credit_immo=null}} - {{:assign total_credits=0}} - {{#load - type="credit_link" - where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id - }} - {{if $amount == null}} - {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} - {{/select}} - {{else}} - {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} - {{/if}} - {{/load}} - {{:assign solde_immo="%d-%d"|math:$immo_line.montant_immo:$total_credits}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$immo_line.montant_immo}} - - {{* voir s'il y a une écriture de cession associée à cette immo *}} - {{#select - trans.id as cession_id, - trans.label, - line.id as line_id, - line.credit - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER JOIN !table AS cession_link ON json_extract(cession_link.document, '$.cession_line_id') = line.id - INNER JOIN !table AS immo_doc ON json_extract(cession_link.document, '$.immo_doc_id') = immo_doc.id - WHERE json_extract(immo_doc.document, '$.line') = :immo_line_id - ; - !table=$module.table - :immo_line_id = $immo_line.immo_line_id - assign="cession_line" - }} - {{:assign var="montant" from="montant_cessions.%d"|args:$account_code}} - {{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$credit}} - {{:assign total_cessions="%d+%d"|math:$total_cessions:$credit}} - {{/select}} - {{:assign var="immo_lines." value=$immo_line}} - {{/select}} - - {{if $immo_lines|count > 0}} -
- - - - - - - - - - - - - - - - {{:assign total_immo = 0}} - {{#foreach from=$immo_lines}} - {{: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 total_immo="%d+%d"|math:$total_immo:$montant_immo}} - {{:assign label_immo=$doc_label|or:$trans_label}} - {{if $label_immo|strpos:$line_label === false}} - {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} - {{/if}} - - - - - - - - - - - {{/foreach}} - - - {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - {{/if}} - {{if $total_cessions != 0}} - - - {{#foreach from=$montant_cessions|ksort key="code" item="value"}} - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - {{/if}} - -
N°Mise en serviceDate sortieLibelléMontantN° compteCompte
#{{$trans_id}}{{$date_mes|date_short}}{{$exit_date|date_short}}{{$label_immo}}{{"%f"|math:$montant_immo|money_html:false|raw}}{{$account_code}}{{$account_label}} - {{:linkbutton label="Modifier" href="exit_step1.html?immo_doc_id=%s&from=exit"|args:$immo_doc_id shape="edit"}} -
-
Total du compte {{$code}}{{$value|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html:false|raw}}
-
Cessions du compte {{$code}}{{$value|money_html:false|raw}}
Total des cessions{{$total_cessions|money_html:false|raw}}
-
+ {{if ! $trans_id|key_in:$immo_archivees}} + {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} {{/if}} -{{/if}} -{{if $immo_lines|count == 0 || $module.table == null}} -

Aucune immobilisation

-{{/if}} +{{/select}} + +
+

Immobilisations archivées

+ + {{:assign nb_immo=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}} + + + + + + + + + + + {{/foreach}} + +
N°DateLibelléMontantN° compteCompteProjet
#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money:false}}{{$account_code}}{{$account_label}}{{$project_label}} +
+ {{if $nb_immo == 0}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/_calcul_dates.html b/_calcul_dates.html index ef868de..e4dd864 100644 --- a/_calcul_dates.html +++ b/_calcul_dates.html @@ -9,4 +9,4 @@ {{:assign ts_debut=$date_debut|strtotime}} {{:assign ts_fin=$date_fin|strtotime}} -{{:assign nbjours="round(1+abs(%d-%d)/(60*60*24), 0)"|math:$ts_fin:$ts_debut}} +{{:assign nbjours="1+abs(%d-%d)/(60*60*24)"|math:$ts_fin:$ts_debut}} diff --git a/_check_account.html b/_check_account.html index ce6816e..06e1108 100644 --- a/_check_account.html +++ b/_check_account.html @@ -19,7 +19,7 @@ {{/foreach}} {{:assign condition=$condition|cat:"0)"}} -{{:assign account_code=$account|keys|value:0}} +{{:assign account_code=$account|keys|key:0}} {{#sql select="code" tables="acc_accounts" diff --git a/_common_attach.html b/_common_attach.html deleted file mode 100644 index 728ee1f..0000000 --- a/_common_attach.html +++ /dev/null @@ -1,37 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Enregistrer l'association entre une ligne d'immo et une autre ligne (amort, credit, cession, sortie) - @param immo_doc_id : id du doc associé à la ligne d'immobilisation - @param trans_id : id de l'écriture à attacher -*}} -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} - -{{* chercher les liaisons de l'écriture d'immobilisation *}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as linked_id - FROM acc_transactions_links as links - WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; - :immo_trans_id = $ligne_immo.trans_id -}} - {{:assign var="linked_transactions." value=$linked_id}} -{{/select}} - -{{* ajouter la nouvelle liaison *}} -{{:assign var="linked_transactions." value=$trans_id}} -{{* Enregistrer les liaisons *}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} - diff --git a/_common_detach.html b/_common_detach.html deleted file mode 100644 index e7b6c7a..0000000 --- a/_common_detach.html +++ /dev/null @@ -1,52 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Supprimer l'association entre une ligne d'immo et une autre ligne (amort, credit, cession, sortie) - @param immo_doc_id : id du doc associé à la ligne d'immobilisation - @param line_id : id de la ligne à détacher -*}} - -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="info_immo, ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} - -{{* chercher la deuxième écriture *}} -{{#select - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; - :line_id = $line_id -}} - {{:assign trans_id=$id_transaction}} -{{else}} - {{:error message="Écriture non trouvée"}} -{{/select}} - -{{* - chercher les liaisons de l'écriture d'immobilisation - et supprimer la liaison avec la deuxième écriture -*}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as linked_id - FROM acc_transactions_links as links - WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; - :immo_trans_id = $ligne_immo.trans_id - }} - {{if $linked_id != $trans_id}} - {{:assign var="linked_transactions." value=$linked_id}} - {{/if}} -{{/select}} - -{{* Enregistrer les liaisons *}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} diff --git a/_compare_version.tpl b/_compare_version.tpl deleted file mode 100644 index 88d8a40..0000000 --- a/_compare_version.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Comparer deux numéros de version n1.n2[.n3] - @param nv1 - @param nv2 - @result comp : -1 si nv1 < nv2, 0 si nv1 = nv2, 1 si nv1 > nv2 -*}} - -{{:assign nv1=$nv1|cat:"."}} -{{:assign nv2=$nv2|cat:"."}} -{{:assign var="tv1" value=$nv1|explode:"."}} -{{:assign var="tv2" value=$nv2|explode:"."}} - -{{:assign comp=0}} -{{:assign i=0}} -{{#foreach from=$tv1 item="e1"}} - {{:assign var="e2" from="tv2.%d"|args:$i}} - {{if $e1 < $e2}} - {{:assign comp=-1}} - {{:break}} - {{elseif $e1 > $e2}} - {{:assign comp=1}} - {{:break}} - {{/if}} - {{:assign i="%d+1"|math:$i}} -{{/foreach}} -{{* - cas où le premier tableau a moins d'éléments que le 2ème - et où les éléments présents dans les deux tableaux sont identiques - *}} -{{if $comp == 0 && $tv1|count < $tv2|count}} - {{:assign comp = -1}} -{{/if}} diff --git a/_get_amort_lines.html b/_get_amort_lines.html deleted file mode 100644 index dd115e8..0000000 --- a/_get_amort_lines.html +++ /dev/null @@ -1,44 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - lister les lignes d'amortissement liées à la ligne d'immobilisation - @param immo_doc_id : id du doc associé à l'immobilisation - @result linked_amort : lignes d'amortissement liées à la ligne d'immobilisation - @result total_amort : montant total des amortissements de l'immobilisation - @result created_amort : vrai s'il y a au moins un amortissement créé par le module dans la liste -*}} - -{{:assign total_amort=0}} -{{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id" - :immo_doc_id = $immo_doc_id|intval - assign="amort_info" -}} - {{#select - line.id as line_id, - line.credit as amount, - line.label as line_label, - trans.id as trans_id, - trans.label as trans_label, - trans.date as date, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER join acc_accounts AS account on line.id_account = account.id - WHERE line.id = :amort_line_id - ; - :amort_line_id = $amort_line_id - assign="amort_line" - }} - {{:assign var="amort_line.amount" value=$amort_info.amount|or:$amort_line.amount}} - {{if $amort_info.created}} - {{:assign var="amort_line.created" value=true}} - {{:assign var="created_amort" value=true}} - {{/if}} - {{:assign var="linked_amort.%s_%d"|args:$amort_line.date:$amort_info.id value=$amort_line}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_line.amount}} - {{/select}} -{{/load}} diff --git a/_get_codes.html b/_get_codes.html index 0373085..a780b40 100644 --- a/_get_codes.html +++ b/_get_codes.html @@ -2,13 +2,9 @@ {{* déterminer le numéro du compte passé en paramètre dans un tableau - la clé est parfois l'identifiant du compte, parfois son code... - d'où l'obligation d'extraire le code de la valeur qui a toujours - la forme : code — libellé *}} -{{:assign values=$account|values}} -{{:assign label=$values.0}} +{{:assign label=$account|values|key:0}} {{:assign pos=$label|strpos:" "}} {{:assign account_code=$label|substr:0:$pos}} {{:assign var="account_code.%s"|args:$account_code value=$label}} diff --git a/_get_config.html b/_get_config.html deleted file mode 100644 index b1a9231..0000000 --- a/_get_config.html +++ /dev/null @@ -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.prefixes == null}} - {{:assign var="module.config.prefixes" value=$config_defaut.prefixes}} -{{/if}} - -{{if $module.config.unfinished == null}} - {{:assign var="module.config.unfinished" value=$config_defaut.unfinished}} -{{/if}} - -{{* -{{if $module.config.tva == null}} - {{:assign var="module.config.tva" value=$config_defaut.tva}} -{{/if}} -*}} diff --git a/_get_credit_lines.html b/_get_credit_lines.html deleted file mode 100644 index c06adc5..0000000 --- a/_get_credit_lines.html +++ /dev/null @@ -1,36 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - chercher des écritures liées à l'immo paramètre au crédit du même compte - @param immo_doc_id : id du doc associé à l'immobilisation - @result linked_immos : liste des écritures liées - @result total_credits : montant total des écritures -*}} -{{:assign linked_immos=null}} -{{:assign total_credits=0}} -{{#load type="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$immo_doc_id|intval}} - {{#select - line.credit, - line.id as line_id, - trans.id as trans_id, - trans.label, - trans.date, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER join acc_accounts AS account on line.id_account = account.id - WHERE line.id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign credit=$credit}} - {{:assign var="linked_immos." doc=$id trans_id=$trans_id credit_line_id=$line_id label=$label amount=$credit date=$date account_id=$account_id account_code=$account_code account_label=$account_label year=$year}} - {{/select}} - {{if $amount == null}} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} - {{else}} - {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} - {{/if}} -{{/load}} diff --git a/_get_free_amort.html b/_get_free_amort.html deleted file mode 100644 index b3b142f..0000000 --- a/_get_free_amort.html +++ /dev/null @@ -1,47 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - lister les amortissement non rattachés à une immo - @param condition -*}} -{{#select - line.id as line_id, - line.id_transaction as trans_id, - line.credit as amount, - line.label as line_label, - trans.date as trans_date, - trans.label as trans_label, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_accounts AS account ON account.id = line.id_account - INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction - WHERE credit > 0 AND (NOT trans.status & 16) AND !condition - ORDER BY trans.date, trans.label; - !condition=$condition - assign="amort_line" -}} - {{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}} - {{:assign amort_amount=0}} - {{:assign keep_amort=true}} - {{#load type="amort_link" - where="$$.amort_line_id = :amort_line_id" - :amort_line_id=$amort_line.line_id|intval - assign="amort_link" - }} - {{if $amort_link.amount == null || $amort_link.amount == 0}} - {{:assign amort_amount=$amort_line.amount}} - {{:assign keep_amort=false}} - {{else}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} - {{/if}} - {{else}} - {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}} - {{/load}} - {{if $keep_amort && $amort_amount < $amort_line.amount}} - {{:assign var="amort_line.amount" value="%d-%d"|math:$amort_line.amount:$amort_amount}} - {{:assign var="free_amort_lines." value=$amort_line}} - {{/if}} -{{/select}} diff --git a/_get_immo_data.html b/_get_immo_data.html deleted file mode 100644 index 513ec0b..0000000 --- a/_get_immo_data.html +++ /dev/null @@ -1,39 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Récupérer les infos d'une immobilisation - @param immo_doc_id : id du document associé à l'immobilisation - @result info_immo : infos du document associé - @result ligne_immo : données de la base - @result message non null si une erreur s'est produite -*}} - -{{#load id=$immo_doc_id|intval assign="info_immo"}} -{{else}} - {{:assign error=true}} - {{:assign message="Immobilisation non trouvée"}} -{{/load}} - -{{if ! $error}} - {{#select - line.id as line_id, - line.debit as amount, - line.label as line_label, - line.id_project as id_project, - trans.id as trans_id, - trans.label as trans_label, - trans.date as date_achat, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS account ON line.id_account = account.id - WHERE line.id = :line_id; - :line_id = $info_immo.line - assign="ligne_immo" - }} - {{else}} - {{:assign message="Immobilisation non trouvée"}} - {{/select}} -{{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index cc0fc76..2f28b30 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -1,180 +1,178 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations en cours d'amortissement ou amorties *}} +{{* Liste des immobilisations en cours ou amorties *}} -{{:include file="_get_config.html" keep="module.config"}} - -

- {{if $type_immo == "managed"}} - Cet onglet liste les immobilisations en cours d'amortissement. - {{elseif $type_immo == "amortized"}} - Cet onglet liste les - immobilisations dont l'amortissement est terminé mais qui sont - encore utilisées dans l'association, donc encore présentes au - bilan. +

+ {{if $type_immo == "encours"}} +

Immobilisations en cours

+ {{elseif $type_immo == "amortie"}} +

Immobilisations amorties

{{/if}} -

+ {{:assign nb_immo=0}} -{{if $module.table != null}} - {{* lister les immobilisations *}} - {{:assign account_condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/foreach}} - {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}} - {{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}} + + + + + + + + + + + + + + - {{#select - trans.id as immo_trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_line_id, - line.debit AS debit, - line.label AS line_label, - account.id as account_id, - account.code as account_code, - trans.id_year as trans_id_year, - info.id as immo_doc_id, - $$.duration as duration, - $$.label as doc_label, - $$.amount as doc_amount, - $$.date_achat as doc_date_achat, - $$.date as doc_date_mes, - $$.status as status - 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 - INNER JOIN !table AS info ON $$.line = line.id - WHERE !condition - ORDER BY COALESCE(doc_date_achat, trans_date) DESC; - !table=$module.table - !condition=$condition - assign="immo_line" - }} - {{:assign montant_immo=$doc_amount|or:$debit}} - {{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} - {{#load - type="credit_link" - where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id - }} - {{if $amount == null}} - {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} - {{/select}} - {{else}} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}} - {{/if}} - {{/load}} + {{* 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=$prefix_array item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign condition=$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)"}} - {{if $montant_immo == 0}} - {{* Immobilisation soldée *}} - {{:continue}} - {{else}} - {{:assign var="immo_line.montant_immo" value=$montant_immo}} - {{/if}} + {{#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, + 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 + INNER JOIN acc_accounts AS account ON line.id_account = account.id + INNER JOIN acc_years AS years ON trans.id_year = years.id + WHERE !condition + ORDER BY trans.date DESC; + !condition=$condition + }} + {{: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}} - {{* montant des amortissements liés à l'immobilisation *}} - {{:include file="./_get_amort_lines.html" immo_doc_id=$immo_doc_id keep="total_amort"}} - {{:assign amort_amount=$total_amort}} - - {{* classement par onglet *}} - {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} - {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} - {{:assign var="immo_line.amort_amount" value=$amort_amount}} - - {{:assign var="immo_lines." value=$immo_line}} - {{/select}} - - {{if $immo_lines|count > 0}} -
N°DateLibelléMontantDuréeN° compteCompte
- - - - - - - - - - - - - - - - {{:assign total_immo = 0}} - {{#foreach from=$immo_lines}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} - {{:assign immo_date = $doc_date_achat|or:$trans_date}} - {{:assign label_immo=$doc_label|or:$trans_label}} - {{if $label_immo|strpos:$line_label === false}} - {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} - {{/if}} - - {{: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}} - - - - - - - - - - - - - - {{/foreach}} - - - - {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - + {{* 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}} + {{else}} + {{:assign amortissable="nsp"}} + {{:assign status="unknown"}} + {{/load}} + {{if $status == "ignored"}} + {{:continue}} {{/if}} - -
N°DateLibelléMontantDuréeAmortissementsValeur netteN° compte
#{{$immo_trans_id}}{{$immo_date|date_short}}{{$label_immo}}{{$montant_immo|money_html:false|raw}}{{if $duration != null}}{{$duration}}{{/if}}{{$amort_amount|money_html:false|raw}}{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}}{{$account_code}} - {{:linkbutton - label="Détails" - href="amortization.html?immo_doc_id=%s&type_immo=%s"|args:$immo_doc_id:$type_immo shape="eye" - }} -
-
Total du compte {{$code}}{{$value|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
+ + {{* 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 + 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; + :line_id = $immo_id|intval + }} + {{:assign ignore=true}} + {{:assign status="archived"}} + {{/select}} + {{if $status == "archived"}} + {{:continue}} + {{/if}} + + {{* voir s'il existe des écritures d'amortissement associées *}} + {{#select + sum(l_amort.credit) as amort_amount, + CASE links.id_related = t_immo.id + WHEN true THEN links.id_transaction + WHEN false THEN links.id_related + END as amort_trans_id + FROM acc_transactions_lines as l_immo + INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction + INNER JOIN acc_transactions_links as links + ON ( + t_immo.id = links.id_transaction + OR + t_immo.id = links.id_related + ) + INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction + INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id + WHERE + l_immo.id = :line_id + AND + l_amort.credit <> 0 + AND + account.code LIKE '28%'; + :line_id = $immo_id|intval + }} + {{if $amort_amount == null}} + {{:assign exist_amort=false}} + {{:assign amort_amount=0}} + {{else}} + {{:assign amort_amount=$amort_amount}} + {{:assign exist_amort=true}} + {{/if}} + {{/select}} + + + {{* 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}} + + #{{$trans_id}} + {{$trans_date|date_short}} + {{$trans_label}} + {{"%f"|math:$debit|money}} + {{if $duration != null}}{{$duration}}{{/if}} + {{$account_code}} + {{$account_label}} + + {{if ! $exist_amort}} + {{:linkbutton + label="Paramètres" + 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&amort=1&op=new&type_immo=%s"|args:$immo_id:$type_immo + shape="settings" + target="_dialog" + }} + {{/if}} + {{:linkbutton + label="Amortissements" + href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo + shape="table" + }} + + + {{/select}} + + + {{if $nb_immo == 0}} +

Aucune immobilisation

{{/if}} -{{/if}} -{{if $immo_lines|count == 0 || $module.table == null}} -

Aucune immobilisation

-{{/if}} +
diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 0dca07d..4444ac8 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -1,175 +1,172 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations non gérées ou non entièrement affectées *}} +{{* Liste des immobilisations non amortissables ou non (encore) gérées *}} -{{:include file="_get_config.html" keep="module.config"}} -

- Cet onglet liste les immobilisations créées en dehors du module et - pas encore prises en charge par le module ou les écritures de la - balance d'ouverture initiale dont le montant n'est pas encore - totalement affecté -

+
+

Autres immobilisations

+ {{:assign nb_immo=0}} -{{:assign saved_hides=$module.config.hides}} -{{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - -{{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_other}} -{{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} - {{else}} - {{:assign unhide=1}} - {{/if}} - {{:assign var="user_hides.unhide_other" value=$unhide"}} - {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} - {{:save key="config" hides=$saved_hides}} -{{/if}} -{{if $unhide}} - {{:assign checked="checked"}} -{{/if}} - -{{* vérifier l'existence de la table du module *}} -{{if $module.table != null}} - {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} - {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} - {{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored' OR $$.status == 'amortized')"}} -{{else}} - {{:assign columns=""}} - {{:assign table_join=""}} - {{:assign doc_condition="1"}} -{{/if}} - -{{* - lister les immobilisations non prises en charge par le module - ou dont le montant n'a pas été totalement affecté -*}} -{{:assign account_condition="("}} -{{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign account_condition=$account_condition|cat:"0)"}} -{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$doc_condition}} - -{{:assign nb_ignored=0}} -{{#select - trans.id as immo_trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_line_id, - line.debit AS debit, - line.label AS line_label, - account.id as account_id, - account.code as account_code, - account.label as account_label, - !columns - 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 - INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_years AS years ON trans.id_year = years.id - !table_join - WHERE !condition - GROUP BY immo_line_id - ORDER BY trans.date; - !columns=$columns - !table_join=$table_join - !table=$module.table - !condition=$condition - assign="immo_line" -}} - {{if $immo_line.status == 'managed'}} - {{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}} - {{:continue}} - {{/if}} - {{/if}} - - {{if $immo_line.status == 'ignored'}} - {{:assign nb_ignored="%d+1"|math:$nb_ignored}} - {{/if}} - - {{if $unhide == null && $immo_line.status == "ignored"}} - {{:continue}} - {{/if}} - - {{* vérifier si le libellé aurait pu être filtré *}} - {{#foreach from=$module.config.filters item="filter"}} - {{if $trans_label|strpos:$filter !== false}} - {{:assign var="immo_line.status" value="ignored"}} - {{:assign nb_ignored="%d+1"|math:$nb_ignored}} - {{/if}} - {{/foreach}} - - {{if $unhide == null && $immo_line.status == "ignored"}} - {{:continue}} - {{/if}} - {{:assign var="immo_lines." value=$immo_line}} -{{/select}} - -{{if $nb_ignored > 0}} -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} -
-
-{{/if}} - -{{if $immo_lines|count > 0}} +
- - + + - - - {{#foreach from=$immo_lines item="line"}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.immo_trans_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.trans_id_year}} - {{:assign reste="%d-%d"|math:$line.debit:$line.amount}} - - - + + {{* 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=$prefix_array item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign condition=$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)"}} + + {{#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, + 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 + INNER JOIN acc_accounts AS account ON line.id_account = account.id + INNER JOIN acc_years AS years ON trans.id_year = years.id + WHERE !condition + ORDER BY trans.date DESC; + !condition=$condition + }} + {{: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}} + + {{* voir si l'immo est prise en charge *}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{:assign status=$status}} + {{else}} + {{:assign status="unknown"}} + {{/load}} + {{if $status != "unknown"}} + {{:continue}} + {{/if}} + + {{* voir s'il existe des écritures d'amortissement associées *}} + {{#select + sum(l_amort.credit) as amort_amount, + CASE links.id_related = t_immo.id + WHEN true THEN links.id_transaction + WHEN false THEN links.id_related + END as amort_trans_id + FROM acc_transactions_lines as l_immo + INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction + INNER JOIN acc_transactions_links as links + ON ( + t_immo.id = links.id_transaction + OR + t_immo.id = links.id_related + ) + INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction + INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id + WHERE + l_immo.id = :line_id + AND + l_amort.credit <> 0 + AND + account.code LIKE '28%'; + :line_id = $immo_id|intval + }} + {{if $status == "unknown" && $amort_amount != null}} + {{:assign ignore=true}} + {{else}} + {{:assign ignore=false}} + {{/if}} + {{/select}} + + {{if $ignore}} + {{:continue}} + {{/if}} + {{:assign nb_immo="%d+1"|math:$nb_immo}} + + + + - - - - - - + + + + - {{/foreach}} + {{/select}} + + {{:assign var="actions.amortize" value="Marquer l'immobilisation amortie"}} + {{:assign var="actions.ignore" value="Ignorer l'écriture"}} + + + + + + + +
N°Ligne + + + N° Date Libellé MontantAffectéReste N° compte Compte
#{{$line.immo_trans_id}}{{$line.immo_line_id}}
+ {{:input type="checkbox" name="check[%s]"|args:$immo_id value=$immo_id default=0}} + + + #{{$trans_id}} {{$trans_date|date_short}}{{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}}{{"%f"|math:$line.debit|money_html:false|raw}}{{"%f"|math:$line.amount|money_html:false|raw}}{{"%f"|math:$reste|money_html:false|raw}}{{$line.account_code}}{{$line.account_label}}{{$trans_label}}{{"%f"|math:$debit|money:false}}{{$account_code}}{{$account_label}} + {{if $status == "unknown"}} + {{:linkbutton + label="Paramètres" + 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&amort=0&op=modif&type_immo=autre"|args:$immo_id + shape="settings" + target="_dialog" + }} + {{/if}} {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s"|args:$immo_line_id - shape="settings" - target="_dialog" + label="Amortissements" + href="amortization.html?immo_id=%s&type_immo=autre"|args:$immo_id + shape="table" }}
+ + + Pour les écritures cochées : +{{* + + + {csrf_field key="projects_action"} +*}} + + {{:input type="select" name="actions" options=$actions default_empty="— Choisir une action à effectuer —"}} +
-{{else}} -

Aucune immobilisation

-{{/if}} - - +
+ {{if $nb_immo == 0}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/_nav.html b/_nav.html index 1fa9bf7..f5c6b94 100644 --- a/_nav.html +++ b/_nav.html @@ -1,40 +1,36 @@ {{* -*- brindille -*- *}} diff --git a/_remove_orphan_docs.tpl b/_remove_orphan_docs.tpl deleted file mode 100644 index 2514171..0000000 --- a/_remove_orphan_docs.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{{* -*- brindille -*- *}} - -{{if $module.table}} - {{* supprimer les documents sans écriture associée *}} - {{:assign var="docs." type="amort_link" field="amort_line_id"}} - {{:assign var="docs." type="credit_link" field="credit_line_id"}} - {{:assign var="docs." type="cession_link" field="cession_line_id"}} - {{:assign var="docs." type="exit_link" field="exit_line_id"}} - {{:assign var="docs." type="immo" field="line"}} - - {{#foreach from=$docs}} - - {{:assign join_field="$$."|cat:$field}} - {{:assign type_name=$type|quote_sql}} - {{:assign type_cond="$$.type"|cat:" = "|cat:$type_name}} - - {{* vérifier existence écriture associée au doc *}} - {{#select - info.id as info_id, - $$.immo_doc_id as immo_doc_id, - line.id as line_id - FROM !table AS info - LEFT JOIN acc_transactions_lines as line ON !join_field = line.id - WHERE !type_cond - ; - !table=$module.table - !type_cond = $type_cond - !join_field = $join_field - assign="line" - }} - {{if $line.line_id == null}} - {{:delete id=$line.info_id}} - {{/if}} - - {{* vérifier existence doc immo *}} - {{if $type != "immo"}} - {{#load id=$immo_doc_id assign="immo_doc"}} - {{else}} - {{:delete id=$line.info_id}} - {{/load}} - {{/if}} - {{/select}} - - {{/foreach}} -{{/if}} diff --git a/_unfinished.html b/_unfinished.html deleted file mode 100644 index 33eadde..0000000 --- a/_unfinished.html +++ /dev/null @@ -1,250 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* Liste des immobilisations en cours de constitution *}} - -

- Cet onglet liste les immobilisations en cours de - constitution ; vous pouvez les sélectionner pour créer une - immobilisation amortissable (exemple : achat de matériaux pour - la construction d'un bâtiment destiné à être amorti) -

- -{{:include file="_get_config.html" keep="module.config"}} -{{:assign saved_hides=$module.config.hides}} -{{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - -{{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_unfinished}} -{{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} - {{else}} - {{:assign unhide=1}} - {{/if}} - {{:assign var="user_hides.unhide_unfinished" value=$unhide"}} - {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} - {{:save key="config" hides=$saved_hides}} -{{/if}} -{{if $unhide}} - {{:assign checked="checked"}} -{{/if}} - -{{* lister les immobilisations en cours de constitution *}} -{{:assign first_code=null}} -{{:assign accounts_condition="("}} -{{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{if $first_code == null}} - {{:assign first_code=$code}} - {{/if}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign accounts_condition=$accounts_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign accounts_condition=$accounts_condition|cat:"0)"}} -{{:assign condition=$accounts_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} - -{{:assign filter_condition=" 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 nb_ignored=0}} -{{#select - trans.id as trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_line_id, - account.id as account_id, - account.code as account_code, - account.label as account_label, - sum(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 - INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_years AS years ON trans.id_year = years.id - WHERE !condition - GROUP BY trans.id - ORDER BY trans.date DESC; - !condition=$condition - assign="immo_line" -}} - {{* voir si l'écriture a été marquée ignorée *}} - {{:assign var="immo_line.ignore" value=false}} - {{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_line_id|intval}} - {{:assign var="immo_line.ignore" value=true}} - {{/load}} - {{if $immo_line.ignore}} - {{:assign nb_ignored="%d + 1"|math:$nb_ignored}} - {{/if}} - {{if $immo_line.ignore && $unhide == null}} - {{:continue}} - {{/if}} - - {{* - TODO cas où : - - il y a (au moins) une écriture d'avoir - *}} - - {{* voir s'il existe une écriture qui solde l'immobilisation (voir ci-dessus) *}} - {{#select - count(*) AS count - 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 - WHERE line.credit = :amount AND code = :account_code - ; - :amount = $debit - :account_code = $account_code - }} - {{:assign count=$count}} - {{/select}} - - {{* S'il y a plus d'une écriture de même montant on ne peut pas décider *}} - {{if $count == 1}} - {{:continue}} - {{/if}} - - {{:assign var="immo_lines." value=$immo_line}} -{{/select}} - -
- {{if $immo_lines|count > 0}} -
- Transférer une ou plusieurs lignes vers une immobilisation amortissable -

- Cocher les lignes concernées -

-
- Montants sélectionnés - - - - - -
-
-
-

- {{:linkbutton - label="Transférer" - href="transfer.html?trans=" - shape="right" - id="transfer" - }} -

-
-
- {{/if}} - {{if $nb_ignored !== 0}} -
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} -
- {{/if}} -
- -{{if $immo_lines|count > 0}} -
- - - - - - - - - - - - - - - - {{:assign total_immo = 0}} - {{#foreach from=$immo_lines}} - {{: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 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}} - - - - - - - - - - - - {{/foreach}} - - - - {{if $total_immo != 0}} - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - {{/if}} - -
N°DateLibelléMontantN° compteCompte
{{:input type="checkbox" name="selected[]" value=$trans_id}}#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{$account_label}} - {{:linkbutton - label="Modifier" - href="ignore.html?immo_line_id=%s"|args:$immo_line_id - shape="edit" - target="_dialog" - }} -
Total du compte {{$code}}{{$value|money_html|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
-
-{{else}} -

Aucune écriture d'immobilisation trouvée dans la comptabilité (compte {{$first_code}} et sous-comptes)

-{{/if}} - - - diff --git a/_upgrade_to031.tpl b/_upgrade_to031.tpl deleted file mode 100644 index 1efe934..0000000 --- a/_upgrade_to031.tpl +++ /dev/null @@ -1,99 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Mettre à niveau vers v0.31 - - créer un doc de liaison pour chaque amortissement lié à une immobilisation - mais uniquement pour les immo déjà gérées, sinon l'upgrade - vers 0.33 ne fonctionnera pas car on pourrait se retrouver avec - des liaisons immo <-> amort sans doc associé à l'immo donc la - transformation de link vers amort_link ne pourra se faire - - - id ligne d'immobilisation - - id ligne d'amortissement - - id écriture d'amortissement -*}} - -{{* lister les immobilisations *}} -{{:include file="_get_config.html" keep="module.config"}} - -{{:assign account_condition="("}} -{{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign account_condition=$account_condition|cat:"0)"}} - -{{: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=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}} - -{{#select - line.id as immo_line_id - 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 - WHERE !condition - ORDER BY trans.date DESC; - !condition=$condition -}} - {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}} - {{:assign status=$status}} - {{else}} - {{:assign status="unknown"}} - {{/load}} - - {{* ne pas faire la liaison si pas de doc *}} - {{if $status == "ignored" || $status == "unknown"}} - {{:continue}} - {{/if}} - - {{* lister les écritures d'amortissement liées *}} - {{:assign amort_lines=null}} - {{#select - CASE links.id_related = t_immo.id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as amort_trans_id, - l_amort.id AS amort_line_id - FROM acc_transactions_lines as l_immo - INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction - INNER JOIN acc_transactions_links as links - ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) - INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction - INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND l_amort.credit <> 0 AND account.code LIKE '28%'; - :line_id = $immo_line_id|intval - assign="amort_lines." - }} - {{/select}} - - {{#foreach from=$amort_lines item="line"}} - {{* chercher un doc associé *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id - AND $$.amort_line_id = :amort_line_id - AND $$.amort_trans_id = :amort_trans_id" - :immo_line_id = $immo_line_id - :amort_line_id = $line.amort_line_id - :amort_trans_id = $line.amort_trans_id - assign="link" - }} - {{else}} - {{* pas de doc => le créer *}} - {{:save - key=""|uuid - type="link" - immo_line_id=$immo_line_id - amort_line_id=$line.amort_line_id - amort_trans_id=$line.amort_trans_id - }} - {{/load}} - {{/foreach}} -{{/select}} diff --git a/_upgrade_to033.tpl b/_upgrade_to033.tpl deleted file mode 100644 index b1104a7..0000000 --- a/_upgrade_to033.tpl +++ /dev/null @@ -1,64 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Mettre à niveau vers v0.33, pour gérer les écritures du bilan d'ouverture - où le montant d'une ligne d'immo ou d'une ligne d'amort peut être - réparti entre plusieurs immo et plusieurs amort - - - modifier le doc d'immo - - date => date_mes (date mise en service) - - - modifier le doc de liaison d'amortissement - - id ligne d'immobilisation => id doc immobilisation - - id ligne d'amortissement - - id écriture d'amortissement - - ajouter montant amortissement -*}} - -{{* doc immo *}} -{{#load type="immo" assign="elem"}} - {{if $elem.date != null}} - {{:assign var="elem.date_mes" value=$elem.date}} - {{:assign var="docs." value=$elem}} - {{:delete id=$elem.id}} - {{/if}} -{{/load}} - -{{* créer les nouveaux documents *}} -{{#foreach from=$docs item="doc"}} - {{:save - key=""|uuid - type=$doc.type - line=$doc.line - duration=$doc.duration - label=$doc.label - amount=$doc.amount - date_achat=$doc.date_achat - date_mes=$doc.date_mes - status=$doc.status - }} -{{/foreach}} - -{{* lister les liaisons actuelles ligne amort => ligne immo *}} -{{#load type="link" assign="link"}} - {{#load type="immo" where="$$.line = :immo_line_id" :immo_line_id=$link.immo_line_id assign="immo"}} - {{:assign link_doc=null}} - {{:assign var="link_doc.immo_doc_id" value=$immo.id}} - {{:assign var="link_doc.amort_line_id" value=$link.amort_line_id}} - {{:assign var="link_docs." value=$link_doc}} - {{else}} - {{* liaison orpheline : ignorer *}} - {{/load}} - {{:delete id=$link.id}} -{{/load}} - -{{* créer les nouvelles liaisons *}} -{{#foreach from=$link_docs item="link"}} - {{:save - key=""|uuid - type="amort_link" - immo_doc_id=$link.immo_doc_id - amort_line_id=$link.amort_line_id - amount=null - }} -{{/foreach}} diff --git a/add_account.html b/add_account.html index 76aded1..c5b471a 100644 --- a/add_account.html +++ b/add_account.html @@ -1,5 +1,5 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Ajout immobilisation" current="module_amortization"}} +{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/add_asset.html b/add_asset.html index 6473370..666df24 100644 --- a/add_asset.html +++ b/add_asset.html @@ -1,7 +1,8 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Ajout immobilisation" current="module_amortization"}} -{{:include file="_get_config.html" keep="module.config"}} +{{: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}} @@ -13,8 +14,6 @@ {{if $ts_debut <= $now && $now <= $ts_fin}} {{:assign selected_year=$id}} {{/if}} -{{else}} - {{:error message="Aucun exercice ouvert"}} {{/years}} {{* Traiter l'envoi du formulaire *}} @@ -35,6 +34,23 @@ {{:error message="La date saisie n'est pas dans l'exercice choisi !"}} {{/if}} + {{if ! $_POST.amortir}} + {{* ne pas amortir *}} + {{:assign duration=0}} + {{:assign date_debut=$_POST.date_achat|parse_date}} + {{:assign status="ignored"}} + {{else}} + {{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}} + {{:assign date_debut=$_POST.date_mes|or:$_POST.date_achat|parse_date}} + {{if $date_debut|strtotime < $_POST.date_achat|parse_date|strtotime}} + {{:assign dd=$date_debut|date_short}} + {{:assign da=$_POST.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}} + {{:assign duration=$_POST.duree|intval}} + {{:assign status="managed"}} + {{/if}} + {{* déterminer le numéro des comptes au cas où la clé serait un identifiant *}} {{:include file="_get_codes.html" @@ -48,30 +64,12 @@ keep="account_code" }} {{:assign credit_account=$account_code}} - {{:assign debit_account_code=$debit_account|keys|value:0}} - {{:assign credit_account_code=$credit_account|keys|value:0}} {{* vérifier : - que le compte d'immo débute par un préfixe correct (20, 21, ...) - est présent dans le PC de l'exercice correspondant à la date *}} - {{#foreach from=$module.config.prefixes item="code"}} - {{:assign var="prefix_array." value=$code}} - {{/foreach}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{:assign var="prefix_array." value=$code}} - {{* déterminer si le compte d'immo est un compte d'immo en cours *}} - {{if $debit_account_code|strpos:$code === 0}} - {{:assign status="unfinished"}} - {{/if}} - {{/foreach}} - {{:include file="_check_account.html" account=$debit_account @@ -82,24 +80,7 @@ {{if $account_ok == null}} {{:assign compte=$debit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}} - {{/if}} - - {{if $status != "unfinished"}} - {{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}} - {{:assign date_debut=$_POST.date_mes|or:$_POST.date_achat|parse_date}} - {{if $date_debut|strtotime < $_POST.date_achat|parse_date|strtotime}} - {{:assign dd=$date_debut|date_short}} - {{:assign da=$_POST.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}} - {{:assign duration=$_POST.duree|intval}} - {{:assign status="managed"}} - {{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}} - {{:assign date_mes=null}} - {{else}} - {{:assign date_mes=$_POST.date_mes|parse_date}} - {{/if}} + {{:error message="Le compte « %s » n'est pas un compte d'immobilisation ou n'est pas dans le plan comptable de l'exercice choisi"|args:$compte}} {{/if}} {{* enregistrer l'écriture *}} @@ -112,68 +93,57 @@ date=$_POST.date_achat label=$_POST.designation amount=$_POST.montant - debit=$debit_account_code - credit=$credit_account_code + debit=$debit_account|keys|key:0 + credit=$credit_account|keys|key:0 id_project=$_POST.id_project }} - {{if $status != "unfinished"}} - {{* vérifier s'il y a déjà un document avec le même numéro de ligne *}} - {{:assign var="immo_line_id" value=$result.lines.1.id}} - {{#load where="$$.line = :line_id" :line_id=$immo_line_id}} - {{:assign key=$key}} - {{else}} - {{:assign key=""|uuid}} - {{/load}} - {{* enregistrer les infos de l'immobilisation *}} - {{:save - key=$key - validate_schema="asset.schema.json" - type="immo" - line=$immo_line_id - duration=$duration - date_mes=$date_mes - status=$status - created=true - }} - {{/if}} - - {{if $status == "unfinished"}} - {{:assign type_immo="unfinished"}} - {{elseif $status == "managed"}} - {{:assign type_immo="managed"}} + {{* vérifier s'il y a déjà un document avec le même numéro de ligne *}} + {{:assign var="immo_id" value=$result.lines.1.id}} + {{#load where="$$.line = :line_id" :line_id=$immo_id}} + {{:assign key=$key}} {{else}} - {{:assign type_immo="other"}} + {{:assign key=""|uuid}} + {{/load}} + + {{* enregistrer les infos de l'immobilisation *}} + {{:save + key=$key + validate_schema="schema.json" + type="immo" + line=$immo_id + duration=$duration + date=$date_debut + status=$status + }} + {{if $_POST.amortir}} + {{:assign type_immo="encours"}} + {{else}} + {{:assign type_immo="autre"}} {{/if}} {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}} - {{/form}} +{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} - {{:linkbutton href="index.html" label="Retour" shape="left"}} + {{:include file="_nav.html" current="index"}} {{/if}} {{:form_errors}} {{* 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=$module.config.prefixes item="code"}} +{{#foreach from=$prefix_array item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} -{{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} -{{:assign var="pattern_array." value="%s*"|args:$code}} -{{/foreach}} -{{:assign var="patterns" value=$pattern_array|implode:"|"}} +{{:assign patterns=$pattern_array|implode:"|"}}