Revision 99a94401
Von Cem Aydin vor mehr als 2 Jahren hinzugefügt
| SL/DB/BankTransaction.pm | ||
|---|---|---|
| 82 | 82 |
wrong_sign => -4, |
| 83 | 83 |
sepa_export_item => 5, |
| 84 | 84 |
batch_sepa_transaction => 20, |
| 85 |
qr_reference => 20, |
|
| 85 | 86 |
); |
| 86 | 87 |
|
| 87 | 88 |
my ($agreement,$rule_matches); |
| ... | ... | |
| 91 | 92 |
$rule_matches .= 'batch_sepa_transaction(' . $points{'batch_sepa_transaction'} . ') ';
|
| 92 | 93 |
} |
| 93 | 94 |
|
| 95 |
# check swiss qr reference if feature enabled |
|
| 96 |
if ($::instance_conf->get_create_qrbill_invoices == 1) {
|
|
| 97 |
if ($self->{qr_reference} && $invoice->{qr_reference} &&
|
|
| 98 |
$self->{qr_reference} eq $invoice->{qr_reference}) {
|
|
| 99 |
|
|
| 100 |
$agreement += $points{qr_reference};
|
|
| 101 |
$rule_matches .= 'qr_reference(' . $points{'qr_reference'} . ') ';
|
|
| 102 |
} |
|
| 103 |
} |
|
| 104 |
|
|
| 94 | 105 |
# compare banking arrangements |
| 95 | 106 |
my ($iban, $bank_code, $account_number); |
| 96 | 107 |
$bank_code = $invoice->customer->bank_code if $invoice->is_sales; |
| css/kivitendo/main.css | ||
|---|---|---|
| 553 | 553 |
background-color: #006400; |
| 554 | 554 |
color: #FFFFFF; |
| 555 | 555 |
} |
| 556 |
#bank_transactions_proposals span.qr_reference_highlight {
|
|
| 557 |
background-color: #006400; |
|
| 558 |
color: #FFFFFF; |
|
| 559 |
} |
|
| 556 | 560 |
|
| 557 | 561 |
/* actionbar styling */ |
| 558 | 562 |
div.layout-actionbar {
|
| css/lx-office-erp/main.css | ||
|---|---|---|
| 549 | 549 |
#bank_transactions_proposals span.invoice_number_highlight {
|
| 550 | 550 |
background-color: #006400; |
| 551 | 551 |
color: #FFFFFF; |
| 552 |
|
|
| 552 |
} |
|
| 553 |
#bank_transactions_proposals span.qr_reference_highlight {
|
|
| 554 |
background-color: #006400; |
|
| 555 |
color: #FFFFFF; |
|
| 553 | 556 |
} |
| 554 | 557 |
|
| 555 | 558 |
/* actionbar styling */ |
| templates/webpages/bank_transactions/tabs/automatic.html | ||
|---|---|---|
| 18 | 18 |
<th>[% 'Amount' | $T8 %]</th> |
| 19 | 19 |
<th>[% 'Skonto' | $T8 %]</th> |
| 20 | 20 |
<th>[% 'Purpose/Reference' | $T8 %]</th> |
| 21 |
[% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %] |
|
| 22 |
<th>[% 'QR reference' | $T8 %]</th> |
|
| 23 |
[% END %] |
|
| 21 | 24 |
<th>[% 'Customer/Vendor/Remote name' | $T8 %]</th> |
| 22 | 25 |
<th>[% LxERP.t8("Source") %]</th>
|
| 23 | 26 |
<th>[% LxERP.t8("Memo") %]</th>
|
| ... | ... | |
| 55 | 58 |
purpose ; |
| 56 | 59 |
END %] |
| 57 | 60 |
</td> |
| 61 |
[% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %] |
|
| 62 |
<td> |
|
| 63 |
[% SET qr_reference = HTML.escape(proposal.qr_reference) |
|
| 64 |
qr_reference_found = ''; |
|
| 65 |
FOREACH proposed_invoice = proposal.proposals; |
|
| 66 |
IF qr_reference.match(proposed_invoice.qr_reference); |
|
| 67 |
SET qr_reference_found = proposed_invoice.qr_reference; |
|
| 68 |
END; |
|
| 69 |
END; |
|
| 70 |
|
|
| 71 |
IF qr_reference_found; |
|
| 72 |
qr_reference.replace(qr_reference_found, '<span class="qr_reference_highlight">' _ qr_reference_found _ '</span>'); |
|
| 73 |
ELSE; |
|
| 74 |
purpose; |
|
| 75 |
END %] |
|
| 76 |
</td> |
|
| 77 |
[% END %] |
|
| 58 | 78 |
<td>[% HTML.escape(proposal.remote_name) %]</td> |
| 59 | 79 |
<td></td> |
| 60 | 80 |
<td></td> |
| ... | ... | |
| 72 | 92 |
<td>[% proposed_invoice.skonto_type | $T8 %] |
| 73 | 93 |
[% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", proposed_invoice.skonto_type) %]</td>
|
| 74 | 94 |
<td[% IF proposed_invoice.invnumber == invnumber_found %] class="invoice_number_highlight"[% END %]>[% proposed_invoice.link %]</td> |
| 95 |
[% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %] |
|
| 96 |
<td> |
|
| 97 |
[% IF proposed_invoice.qr_reference == proposal.qr_reference %] |
|
| 98 |
<span class="qr_reference_highlight">[% HTML.escape(proposed_invoice.qr_reference) %]</span> |
|
| 99 |
[% ELSE %] |
|
| 100 |
[% HTML.escape(proposed_invoice.qr_reference) %] |
|
| 101 |
[% END %] |
|
| 102 |
</td> |
|
| 103 |
[% END %] |
|
| 75 | 104 |
<td>[% HTML.escape(proposed_invoice.customer.name) %][% HTML.escape(proposed_invoice.vendor.name) %]</td> |
| 76 | 105 |
<td>[% L.input_tag("sources." _ proposal.id _ "[]", "", size=20) %]</td>
|
| 77 | 106 |
<td>[% L.input_tag("memos." _ proposal.id _ "[]", "", size=20) %]</td>
|
Auch abrufbar als: Unified diff
Swiss QR-Bill: Beim Filter für Bankbuchungen bzw. Kontenabgleich QR-Referenz berücksichtigen