diff --git a/_archives.html b/_archives.html index b53260c..92e10af 100644 --- a/_archives.html +++ b/_archives.html @@ -65,13 +65,12 @@ {{* 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 + :exit_line_id=$line_id }} {{:assign var="immo_line.exit_date" value=$date}} {{/select}} @@ -86,7 +85,7 @@ }} {{if $amount == null}} {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; - :credit_line_id=$credit_line_id + :credit_line_id=$line_id }} {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} {{/select}} @@ -106,7 +105,7 @@ 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 cession_link ON json_extract(cession_link.document, '$.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 ; @@ -148,7 +147,7 @@ {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} {{/if}}
Mise à jour vers version {{$tag}} terminée
{{/if}} +{{* version 0.42 *}} +{{:assign tag="0.42"}} + +{{:include file="_compare_version.tpl" nv1=$module_version nv2=$tag keep="comp"}} +{{:assign module_comp=$comp}} +{{:include file="_compare_version.tpl" nv1=$module.config.version nv2=$tag keep="comp"}} +{{:assign config_comp=$comp}} + +{{if $module_comp >= 0 && $config_comp < 0}} +{{* $module_version >= '0.42' && $module.config.version < '0.42' *}} + + {{:include file="_upgrade_to042.tpl"}} +Mise à jour vers version {{$tag}} terminée
+{{/if}} + {{* enregistrer le nouveau numéro de version dans la config du module *}} {{:include file="_compare_version.tpl" nv1=$module_version nv2=$module.config.version keep="comp"}} {{if $comp > 0}} diff --git a/_upgrade_to042.tpl b/_upgrade_to042.tpl new file mode 100644 index 0000000..95fef92 --- /dev/null +++ b/_upgrade_to042.tpl @@ -0,0 +1,38 @@ +{{* -*- brindille -*- *}} + +{{* remplacer xxx_line_id par line_id pour simplifier et mutualiser le code *}} + +{{:assign var="link_types." type="amort"}} +{{:assign var="link_types." type="credit"}} +{{:assign var="link_types." type="cession"}} +{{:assign var="link_types." type="exit"}} + +{{* lister les liens actuels *}} +{{#foreach from=$link_types}} + {{:assign link_type=$type|cat:"_link"}} + {{:assign line_id=$type|cat:"_line_id"}} + {{#load type=$link_type assign="link"}} + {{:assign new_link=null}} + {{:assign var="new_link.key" value=$link.key}} + {{:assign var="new_link.type" value=$link.type}} + {{:assign var="new_link.immo_doc_id" value=$link.immo_doc_id}} + {{:assign var="new_link.line_id" from="link.%s"|args:$line_id}} + {{:assign var="new_link.amount" value=$link.amount}} + {{:assign var="new_link.created" value=$link.created}} + {{* mémoriser les infos des docs *}} + {{:assign var="new_links." value=$new_link}} + {{/load}} + {{:delete type=$link_type}} +{{/foreach}} + +{{* créer les nouveaux documents de liaisons *}} +{{#foreach from=$new_links item="link"}} + {{:save + key=$link.key + type=$link.type + immo_doc_id=$link.immo_doc_id + line_id=$link.line_id + amount=$link.amount + created=$link.created + }} +{{/foreach}} diff --git a/add_infos.html b/add_infos.html index 9a45878..d2a4874 100644 --- a/add_infos.html +++ b/add_infos.html @@ -178,7 +178,7 @@