diff --git a/_archives.html b/_archives.html index 671ceb4..e774b6d 100644 --- a/_archives.html +++ b/_archives.html @@ -1,36 +1,92 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations sorties du bilan *}} -

- Cette page liste les immobilisations sorties du bilan -

+{{* Liste des immobilisations archivées *}} + +{{* 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}} + +{{#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}} {{* Immobilisation avec une écriture de sortie de bilan *}} -{{: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}} -{{* lister les immobilisations *}} -{{:assign account_condition="("}} -{{#foreach from=$module.config.prefixes item="code"}} +{{:assign condition="("}} +{{#foreach from=$prefix_array item="code"}} {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} + {{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} -{{:assign account_condition=$account_condition|cat:"0)"}} +{{: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 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 + 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" + }} + {{if ! $trans_id|key_in:$immo_archivees}} + {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} + {{/if}} +{{/select}}
+

Immobilisations archivées

+ + {{:assign nb_immo=0}} - - + @@ -40,185 +96,23 @@ - - {{: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}} - {{else}} - {{:assign amortissable="nsp"}} - {{:assign status="unknown"}} - {{/load}} - {{if $status == "ignored"}} - {{:continue}} - {{/if}} - - {{* chercher des écritures liées à l'immo courante au crédit du même compte - et déduire leur montant de celui de l'immo - *}} - {{:assign solde_immo=$montant_immo}} - {{:assign credit_immo=null}} - {{#select - CASE links.id_related = :immo_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - INNER JOIN acc_transactions AS trans2 ON trans2.id = other_id - WHERE trans.id = :immo_id AND line.credit > 0 AND acc.code = :account - ORDER BY trans2.date, trans2.id - ; - :immo_id=$trans_id - :account=$account_code - assign="credit_immo." - }} - {{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}} - {{/select}} - - {{if $solde_immo == 0}} - {{:assign status="archived"}} - {{/if}} - - {{if $status != "archived"}} - {{:continue}} - {{/if}} - - {{:assign nb=$credit_immo|count}} - {{:assign nb="%d-1"|math:$nb}} - {{:assign var="last_credit" from="credit_immo.%d"|args:$nb}} - {{:assign montant_immo=$last_credit.credit}} - - {{: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, - line.debit - 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 (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 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}} - - + - {{/select}} + {{/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 sortieDate Libellé Montant N° compte
#{{$trans_id}} {{$trans_date|date_short}}{{$exit_date|date_short}} {{$trans_label}}{{"%f"|math:$montant_immo|money_html:false|raw}}{{"%f"|math:$debit|money:false}} {{$account_code}} {{$account_label}} {{$project_label}}
-
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 $nb_immo == 0}}

Aucune immobilisation

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/_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/_immobilisations.html b/_immobilisations.html index f26b23f..2f28b30 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -3,59 +3,49 @@ {{* Liste des immobilisations en cours ou amorties *}}
- -

- {{if $type_immo == "managed"}} - Cette page liste les immobilisations en cours d'amortissement - {{elseif $type_immo == "amortized"}} - Cette page liste les immobilisations dont l'amortissement est terminé - {{/if}} -

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

Immobilisations en cours

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

Immobilisations amorties

+ {{/if}} + {{:assign nb_immo=0}} - + - - + {{* lister les immobilisations *}} - {{:include file="_get_config.html" keep="module.config"}} - - {{:assign account_condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} + {{: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 account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} + {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} - {{:assign account_condition=$account_condition|cat:"0)"}} + {{:assign condition=$condition|cat:"0)"}} + {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} - {{: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}} - {{:assign nb_immo=0}} - {{:assign total_immo = 0}} {{#select - trans.id as immo_trans_id, + trans.id as trans_id, trans.label as trans_label, trans.date as trans_date, - line.id as immo_line_id, - line.debit AS debit, + 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 @@ -65,13 +55,12 @@ ORDER BY trans.date DESC; !condition=$condition }} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}} + {{: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_line_id|intval}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{:assign duration=$duration}} {{:assign status=$status}} {{else}} @@ -82,144 +71,106 @@ {{:continue}} {{/if}} - {{* chercher des écritures liées à l'immo courante au crédit du même compte - et déduire leur montant de celui de l'immo - *}} + {{* voir s'il existe une écriture qui solde l'immobilisation *}} + {{:assign ignore=false}} {{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account; - :immo_trans_id=$immo_trans_id - :account=$account_code + 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 montant_immo="%d-%d"|math:$montant_immo:$credit}} - {{/select}} - {{if $montant_immo == 0}} + {{:assign ignore=true}} {{:assign status="archived"}} - {{/if}} + {{/select}} {{if $status == "archived"}} {{:continue}} {{/if}} {{* voir s'il existe des écritures d'amortissement associées *}} - {{:assign amort_lines=null}} {{#select - (l_amort.credit) as amount, + 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, - l_amort.id AS amort_line_id + 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) + 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." + 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}} - {{:assign amort_amount=0}} - {{#foreach from=$amort_lines item="elem"}} - {{* voir s'il existe un doc associé *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" - :immo_line_id = $immo_line_id - :amort_trans_id = $elem.amort_trans_id - assign="link" - }} - {{if $link.amort_line_id == $elem.amort_line_id}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}} - {{/if}} - {{else}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}} - {{/load}} - {{/foreach}} - - {{if $amort_amount == 0}} - {{:assign exist_amort=false}} - {{else}} - {{:assign exist_amort=true}} - {{:assign amort_amount=$amort_amount}} - {{/if}} {{* classement par onglet *}} - {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} - {{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}} + {{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 == "amortized" && $amort_amount < $montant_immo && $status != "amortized"}}{{:continue}}{{/if}} - + {{if $type_immo == "amortie" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} {{: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}} - + - + - - + {{/select}} - - {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - - {{/if}} -
N°N° Date Libellé Montant DuréeAmortissementsValeur nette N° compteCompte
#{{$immo_trans_id}}#{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}}{{$montant_immo|money_html:false|raw}}{{"%f"|math:$debit|money}} {{if $duration != null}}{{$duration}}{{/if}}{{$amort_amount|money_html:false|raw}}{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}} {{$account_code}}{{$account_label}} - {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo - shape="settings" - target="_dialog" - }} + {{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_line_id:$type_immo + href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo shape="table" }}
-
Total du compte {{$code}}{{$value|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
{{if $nb_immo == 0}}

Aucune immobilisation

diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 6ebb556..4444ac8 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -3,40 +3,17 @@ {{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
+

Autres immobilisations

+ {{:assign nb_immo=0}} -

- Cette page liste les écritures pas (encore) prises en charge par le module et sans écriture d'amortissement associée. -

- - {{: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_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}} - -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures marquées ignorées" }} -
-
- +
+ @@ -49,27 +26,17 @@ {{* 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=$module.config.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}} {{:assign condition=$condition|cat:"0)"}} {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} - {{if $unhide == null}} - {{*:assign condition=$condition|cat:" 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}} - {{/if}} - - {{:assign nb_immo=0}} {{#select trans.id as trans_id, trans.label as trans_label, @@ -97,21 +64,8 @@ {{else}} {{:assign status="unknown"}} {{/load}} - - {{if $unhide == null}} - {{if $status != "unknown"}} - {{:continue}} - {{/if}} - {{else}} - {{if $status != "ignored" && $status != "unknown"}} - {{:continue}} - {{/if}} - {{* vérifier si le libellé aurait pu être filtré *}} - {{#foreach from=$module.config.filters item="filter"}} - {{if $filter|strpos:$trans_label !== false}} - {{:assign status="ignored"}} - {{/if}} - {{/foreach}} + {{if $status != "unknown"}} + {{:continue}} {{/if}} {{* voir s'il existe des écritures d'amortissement associées *}} @@ -139,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}} @@ -151,43 +105,68 @@ {{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} - + + - + {{/select}} + + {{:assign var="actions.amortize" value="Marquer l'immobilisation amortie"}} + {{:assign var="actions.ignore" value="Ignorer l'écriture"}} + + + + + + + +
+ + + N° Date Libellé
+ {{:input type="checkbox" name="check[%s]"|args:$immo_id value=$immo_id default=0}} + + + #{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{"%f"|math:$debit|money:false}} {{$account_code}} {{$account_label}} - {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id - shape="settings" - target="_dialog" - }} + {{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="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" }}
+ + + Pour les écritures cochées : +{{* + + + {csrf_field key="projects_action"} +*}} + + {{:input type="select" name="actions" options=$actions default_empty="— Choisir une action à effectuer —"}} +
+
{{if $nb_immo == 0}}

Aucune immobilisation

{{/if}}
- - diff --git a/_nav.html b/_nav.html index a7894b5..f5c6b94 100644 --- a/_nav.html +++ b/_nav.html @@ -1,45 +1,36 @@ {{* -*- brindille -*- *}} diff --git a/_unfinished.html b/_unfinished.html deleted file mode 100644 index b639914..0000000 --- a/_unfinished.html +++ /dev/null @@ -1,226 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* Liste des immobilisations en cours de constitution *}} - -
- -

- Cette page liste les immobilisations en cours de constitution, donc non amortissables -

- - {{: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}} - -
-
- Transférer une ou plusieurs lignes vers une immobilisation amortissable -

- Cocher les lignes concernées ; les montants seront additionnés par numéro de compte -

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

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

-
-
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures marquées ignorées" }} -
-
- - - - - - - - - - - - - - - - - {{* lister les immobilisations en cours de constitution *}} - - {{:assign accounts_condition="("}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/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_immo=0}} - {{:assign total_immo = 0}} - {{#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, - 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 - }} - {{* voir si l'écriture a été marquée ignorée *}} - {{:assign ignore=false}} - {{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_id|intval}} - {{:assign ignore=true}} - {{/load}} - {{if $ignore && $unhide == null}} - {{:continue}} - {{/if}} - - {{* voir s'il existe une écriture qui solde l'immobilisation *}} - {{#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 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}} - - - - - - - - - - - - {{/select}} - - - {{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_id=%s"|args:$immo_id - shape="edit" - target="_dialog" - }} -
Total du compte {{$code}}{{$value|money_html|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
- {{if $nb_immo == 0}} -

Aucune immobilisation

- {{/if}} -
- - - 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 9648331..666df24 100644 --- a/add_asset.html +++ b/add_asset.html @@ -1,6 +1,8 @@ {{* -*- brindille -*- *}} -{{: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}} @@ -12,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 *}} @@ -34,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" @@ -53,18 +70,6 @@ - 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}} - {{/foreach}} - {{:include file="_check_account.html" account=$debit_account @@ -75,39 +80,7 @@ {{if $account_ok == null}} {{:assign compte=$debit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}} - {{/if}} - - {{:assign debit_account=$debit_account|keys|value:0}} - {{:assign credit_account=$credit_account|keys|value:0}} - - {{* déterminer si le compte d'immo est un compte d'immo en cours *}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{if $debit_account|strpos:$code === 0}} - {{:assign status="unfinished"}} - {{/if}} - {{/foreach}} - - {{if $status != "unfinished" && ! $_POST.amortir}} - {{* ne pas amortir *}} - {{:assign duration=0}} - {{:assign date_debut=$_POST.date_achat|parse_date}} - {{:assign status="ignored"}} - {{elseif $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"}} + {{: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 *}} @@ -120,44 +93,38 @@ date=$_POST.date_achat label=$_POST.designation amount=$_POST.montant - debit=$debit_account - credit=$credit_account + 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_id" value=$result.lines.1.id}} - {{#load where="$$.line = :line_id" :line_id=$immo_id}} - {{:assign key=$key}} - {{else}} - {{: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}} - - {{if $status == "unfinished"}} - {{:assign type_immo="unfinished"}} - {{elseif $_POST.amortir}} - {{: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_amortization"}} +{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index"}} @@ -167,22 +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=$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:"|"}} @@ -402,11 +386,11 @@ {{:input type="list" name="comp_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"68*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"68*":$_GET.year default=$comp_account }} - {{$amort_comp|money_currency_html:false|raw}} + {{$amort_comp|money_currency:false}} @@ -414,12 +398,12 @@ {{:input type="list" name="amort_comp_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} - {{$amort_comp|money_currency_html:false|raw}} + {{$amort_comp|money_currency:false}} @@ -446,11 +430,11 @@ {{:input type="list" name="except_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"687*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"687*":$_GET.year default=$except_account }} - {{$amort_except|money_currency_html:false|raw}} + {{$amort_except|money_currency:false}} @@ -458,12 +442,12 @@ {{:input type="list" name="amort_except_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} - {{$amort_except|money_currency_html:false|raw}} + {{$amort_except|money_currency:false}} @@ -484,7 +468,7 @@ {{:input type="list" name="amort_sortie_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} @@ -493,7 +477,7 @@ {{else}} {{:assign montant="%f+%f"|math:$_GET.amort_amount:$amort_comp}} {{/if}} - {{$montant|money_currency_html:false|raw}} + {{$montant|money_currency:false}} {{if $montant_cession > 0 && $valeur_nette > 0}} @@ -502,25 +486,25 @@ {{:input type="list" name="vnc_account" - target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$vnc_code:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$vnc_code:$_GET.year default=$vnc_account }} - {{$valeur_nette|money_currency_html:false|raw}} + {{$valeur_nette|money_currency:false}} {{/if}} - + {{* style="pointer-events: none; opacity: 0.6;">*}} {{:input type="list" name="immo_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:$patterns:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:$patterns:$_GET.year default=$immo_account }} - {{$ligne_immo.montant|money_currency_html:false|raw}} + {{$ligne_immo.montant|money_currency:false}} @@ -541,11 +525,11 @@ {{:input type="list" name="creance_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"462*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"462*":$_GET.year default=$creance_account }} - {{$montant_cession|money_currency_html:false|raw}} + {{$montant_cession|money_currency:false}} @@ -553,12 +537,12 @@ {{:input type="list" name="cession_account" - target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$cession_code:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$cession_code:$_GET.year default=$cession_account }} - {{$montant_cession|money_currency_html:false|raw}} + {{$montant_cession|money_currency:false}} @@ -569,5 +553,4 @@ {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}

-{{:form_errors}} {{:admin_footer}}