Revision e9f2c481
Von Cem Aydin vor 17 Tagen hinzugefügt
- ID e9f2c481c0c8436489b9b99007fbc58907cee8ae
- Vorgänger 77497c26
| SL/Controller/SimpleSystemSetting.pm | ||
|---|---|---|
| 32 | 32 |
list_attributes => [ |
| 33 | 33 |
{ method => 'name', title => t8('Name'), },
|
| 34 | 34 |
{ method => 'iban', title => t8('IBAN'), },
|
| 35 |
{ method => 'qr_iban', title => t8('QR-IBAN'), },
|
|
| 35 | 36 |
{ method => 'bank', title => t8('Bank'), },
|
| 36 | 37 |
{ method => 'bank_code', title => t8('Bank code'), },
|
| 37 | 38 |
{ method => 'bank_account_id', title => t8('Bank Account Id Number (Swiss)'), },
|
| SL/IS.pm | ||
|---|---|---|
| 628 | 628 |
|
| 629 | 629 |
# set variables for swiss QR bill, if feature enabled |
| 630 | 630 |
# handling errors gracefully (don't die if undef) |
| 631 |
my $create_qrbill_invoices = $::instance_conf->get_create_qrbill_invoices; |
|
| 631 | 632 |
if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') {
|
| 632 | 633 |
my ($qr_account, $error) = get_qrbill_account(); |
| 633 |
$form->{qrbill_iban} = $qr_account->{iban};
|
|
| 634 |
|
|
| 635 |
# case 1: QR-Reference number and QR-IBAN |
|
| 636 |
# case 2: without reference number and regular IBAN |
|
| 637 |
if ($create_qrbill_invoices == 1) {
|
|
| 638 |
$form->{qrbill_iban} = $qr_account->{qr_iban};
|
|
| 639 |
} elsif ($create_qrbill_invoices == 2) {
|
|
| 640 |
$form->{qrbill_iban} = $qr_account->{iban};
|
|
| 641 |
} |
|
| 634 | 642 |
|
| 635 | 643 |
my $biller_country = $::instance_conf->get_address_country() || 'CH'; |
| 636 | 644 |
my $biller_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($biller_country); |
| templates/design40_webpages/simple_system_setting/_bank_account_form.html | ||
|---|---|---|
| 18 | 18 |
<th>[% LxERP.t8('IBAN') %]</th>
|
| 19 | 19 |
<td>[% L.input_tag("object.iban", SELF.object.iban, class='wi-wider', "data-validate"="required", "data-title"=LxERP.t8("IBAN")) %]</td>
|
| 20 | 20 |
</tr> |
| 21 |
<tr> |
|
| 22 |
<th>[% LxERP.t8('QR-IBAN (Swiss)') %]</th>
|
|
| 23 |
<td>[% L.input_tag("object.qr_iban", SELF.object.qr_iban, class='wi-wider') %]</td>
|
|
| 24 |
</tr> |
|
| 21 | 25 |
<tr> |
| 22 | 26 |
<th>[% LxERP.t8('Bank') %]</th>
|
| 23 | 27 |
<td>[% L.input_tag("object.bank", SELF.object.bank, class='wi-wider') %]</td>
|
| templates/webpages/simple_system_setting/_bank_account_form.html | ||
|---|---|---|
| 11 | 11 |
<th align="right">[% LxERP.t8('IBAN') %]</th>
|
| 12 | 12 |
<td>[%- L.input_tag("object.iban", SELF.object.iban, style=style, "data-validate"="required", "data-title"=LxERP.t8("IBAN")) %]</td>
|
| 13 | 13 |
</tr> |
| 14 |
<tr> |
|
| 15 |
<th align="right">[% LxERP.t8('QR-IBAN (Swiss)') %]</th>
|
|
| 16 |
<td>[% L.input_tag("object.qr_iban", SELF.object.qr_iban, style=style) %]</td>
|
|
| 17 |
</tr> |
|
| 14 | 18 |
<tr> |
| 15 | 19 |
<th align="right">[% LxERP.t8('Bank') %]</th>
|
| 16 | 20 |
<td>[%- L.input_tag("object.bank", SELF.object.bank, style=style) %]</td>
|
Auch abrufbar als: Unified diff
Bankkonto Informationen Spalte für QR-IBAN hinzufügen (Schweiz)
Bisher haben wir für die QR-IBAN eine zusätzliche Zeile bei den
Bankkonten erfasst. Die QR-IBAN wird aber jeweils als zusätzliche IBAN
für ein existierendes Bankkonto vergeben.
Daher sollte diese stattdessen als zusätzliche Spalte erfasst werden.
Dies ermöglicht dann auch das Buchen auf das entsprechende Konto.