diff --git a/transfer.html b/transfer.html index 6a491b1..ec9b1db 100644 --- a/transfer.html +++ b/transfer.html @@ -36,7 +36,7 @@ {{:assign trans_list=$trans_list|implode:","}} {{:assign trans_list="("|cat:$trans_list|cat:")"}} {{:assign condition=$condition|cat:" AND trans.id IN "|cat:$trans_list}} -{{:assign condition=$condition|cat:" AND NOT (trans.status & 16)"}} +{{*:assign condition=$condition|cat:" AND NOT (trans.status & 16)"*}} {{#select trans.id as trans_id, @@ -45,6 +45,7 @@ SUM(line.debit) AS line_debit, account.code AS account_code, account.label AS account_label, + line.label as line_label, line.id_project as project_id FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id @@ -56,6 +57,7 @@ }} {{:assign var="transactions.%s"|args:$trans_id amount=$line_debit + line_label=$line_label date=$trans_date code=$account_code label=$account_label @@ -255,17 +257,17 @@ {{:input - type="list" - name="credit_accounts[]" - required=true - readonly=true - target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code:$selected_year - default=$current_account + type="list" + name="credit_accounts[]" + required=true + readonly=true + target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code:$selected_year + default=$current_account }} {{:input name="credit_lines[]" type="text" class="money" size="8" default=$amount|money}} {{:input name="debit_lines[]" type="text" class="money" size="8" disabled=true}} - {{:input type="text" name="line_labels[]" size="40"}} + {{:input type="text" name="line_labels[]" size="40" default=$line_label}} {{if $projects != null}} {{:input type="select" name="id_project" options=$projects default_empty="— Aucun —"}}