Bankkonten einen Namen geben

Damit kann man seinen Bankkonten einfache Namen geben, wie z.B.
"Tagegeld", damit man bei der Auswahl nicht immer genau auf die
Kontonummer achten muß.

Bei der Bankkontenauswahl in Dropdowns ist die Beschriftung jetzt im
Format:
Name - Kontonummer, BLZ, Bank

Der nächste Schritt wäre wahrscheinlich IBAN statt Kontonummer und BLZ
zu benutzen.

diff --git a/SL/BankAccount.pm b/SL/BankAccount.pm
index f17ec1ede293d0812caa52c85ae1ed56fa783856..3178b2a312741ca9a3ba230a21ea42d762c739f9 100644 (file)
--- a/SL/BankAccount.pm
+++ b/SL/BankAccount.pm
@@ -23,9 +23,9 @@ sub save {
 
   my $query =
     qq|UPDATE bank_accounts
 
   my $query =
     qq|UPDATE bank_accounts

-       SET account_number = ?, bank_code = ?, bank = ?, iban = ?, bic = ?, chart_id = ?
+       SET name= ?, account_number = ?, bank_code = ?, bank = ?, iban = ?, bic = ?, chart_id = ?

        WHERE id = ?|;
        WHERE id = ?|;

-  my @values = (@params{qw(account_number bank_code bank iban bic)}, conv_i($params{chart_id}), conv_i($params{id}));
+  my @values = (@params{qw(name account_number bank_code bank iban bic)}, conv_i($params{chart_id}), conv_i($params{id}));

 
   do_query($form, $dbh, $query, @values);
 
 
   do_query($form, $dbh, $query, @values);
 


@@ -91,6 +91,7 @@ sub list {
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
   my %sort_columns = (
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
   my %sort_columns = (

+    'name'              => [ 'ba.name', ],

     'account_number'    => [ 'ba.account_number', ],
     'bank_code'         => [ 'ba.bank_code', 'ba.account_number', ],
     'bank'              => [ 'ba.bank',      'ba.account_number', ],
     'account_number'    => [ 'ba.account_number', ],
     'bank_code'         => [ 'ba.bank_code', 'ba.account_number', ],
     'bank'              => [ 'ba.bank',      'ba.account_number', ],


@@ -103,7 +104,7 @@ sub list {
   my %sort_spec = create_sort_spec('defs' => \%sort_columns, 'default' => 'bank', 'column' => $params{sortorder}, 'dir' => $params{sortdir});
 
   my $query =
   my %sort_spec = create_sort_spec('defs' => \%sort_columns, 'default' => 'bank', 'column' => $params{sortorder}, 'dir' => $params{sortdir});
 
   my $query =

-    qq|SELECT ba.id, ba.account_number, ba.bank_code, ba.bank, ba.iban, ba.bic, ba.chart_id,
+    qq|SELECT ba.id, ba.name, ba.account_number, ba.bank_code, ba.bank, ba.iban, ba.bic, ba.chart_id,

          c.accno AS chart_accno, c.description AS chart_description
        FROM bank_accounts ba
        LEFT JOIN chart c ON (ba.chart_id = c.id)
          c.accno AS chart_accno, c.description AS chart_description
        FROM bank_accounts ba
        LEFT JOIN chart c ON (ba.chart_id = c.id)

diff --git a/SL/DB/MetaSetup/BankAccount.pm b/SL/DB/MetaSetup/BankAccount.pm
index d8be5aacf22aa24d0d051d42c90b279582ae3d7c..8057f44ac8e949c737fb0361299508d68ff8c2f4 100644 (file)
--- a/SL/DB/MetaSetup/BankAccount.pm
+++ b/SL/DB/MetaSetup/BankAccount.pm
@@ -16,6 +16,7 @@ __PACKAGE__->meta->columns(
   chart_id       => { type => 'integer', not_null => 1 },
   iban           => { type => 'varchar', length => 100 },
   id             => { type => 'integer', not_null => 1, sequence => 'id' },
   chart_id       => { type => 'integer', not_null => 1 },
   iban           => { type => 'varchar', length => 100 },
   id             => { type => 'integer', not_null => 1, sequence => 'id' },

+  name           => { type => 'text' },

 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);

diff --git a/bin/mozilla/bankaccounts.pl b/bin/mozilla/bankaccounts.pl
index a11fb6bb6bc5e56f6269d4f27a182cf897dd6055..941e40768404d365db673810c5bd4d0a489a8b84 100644 (file)
--- a/bin/mozilla/bankaccounts.pl
+++ b/bin/mozilla/bankaccounts.pl
@@ -73,9 +73,9 @@ sub bank_account_save {
 
   my $account = $form->{account} && (ref $form->{account} eq 'HASH') ? $form->{account} : { };
 
 
   my $account = $form->{account} && (ref $form->{account} eq 'HASH') ? $form->{account} : { };
 

-  if (any { !$account->{$_} } qw(account_number bank_code iban bic)) {
+  if (any { !$account->{$_} } qw(name account_number bank_code iban bic)) {

     bank_account_display_form('account' => $account,
     bank_account_display_form('account' => $account,

-                              'error'   => $locale->text('You have to fill in at least an account number, the bank code, the IBAN and the BIC.'));
+                              'error'   => $locale->text('You have to fill in at least a name, an account number, the bank code, the IBAN and the BIC.'));

 
     $main::lxdebug->leave_sub();
     return;
 
     $main::lxdebug->leave_sub();
     return;


@@ -115,6 +115,7 @@ sub bank_account_list {
   my $href           = build_std_url('action=bank_account_list');
 
   my %column_defs = (
   my $href           = build_std_url('action=bank_account_list');
 
   my %column_defs = (

+    'name'           => { 'text' => $locale->text('Name'), },

     'account_number' => { 'text' => $locale->text('Account number'), },
     'bank_code'      => { 'text' => $locale->text('Bank code'), },
     'bank'           => { 'text' => $locale->text('Bank'), },
     'account_number' => { 'text' => $locale->text('Account number'), },
     'bank_code'      => { 'text' => $locale->text('Bank code'), },
     'bank'           => { 'text' => $locale->text('Bank'), },


@@ -122,7 +123,7 @@ sub bank_account_list {
     'iban'           => { 'text' => $locale->text('IBAN'), },
   );
 
     'iban'           => { 'text' => $locale->text('IBAN'), },
   );
 

-  my @columns = qw(account_number bank bank_code bic iban);
+  my @columns = qw(name account_number bank bank_code bic iban);

 
   foreach my $name (@columns) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
 
   foreach my $name (@columns) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};

diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl
index 6fb9907d2e58ba13793f64ffd6f35258a8869f5f..94e062050bf700beecc8525e99c9200474e0c317 100755 (executable)
--- a/bin/mozilla/sepa.pl
+++ b/bin/mozilla/sepa.pl
@@ -47,7 +47,7 @@ sub bank_transfer_add {
   # from us automatically and we don't have to send money manually.
   $_->{checked} = ($vc eq 'customer' ? $_->{direct_debit} : !$_->{direct_debit}) for @{ $invoices };
 
   # from us automatically and we don't have to send money manually.
   $_->{checked} = ($vc eq 'customer' ? $_->{direct_debit} : !$_->{direct_debit}) for @{ $invoices };
 

-  my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) };
+  my $bank_account_label_sub = sub { $locale->text('#1 - Account number #2, bank code #3, #4', $_[0]->{name}, $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank} ) };

 
   my $translation_list = GenericTranslations->list(translation_type => 'sepa_remittance_info_pfx');
   my %translations     = map { ( ($_->{language_id} || 'default') => $_->{translation} ) } @{ $translation_list };
 
   my $translation_list = GenericTranslations->list(translation_type => 'sepa_remittance_info_pfx');
   my %translations     = map { ( ($_->{language_id} || 'default') => $_->{translation} ) } @{ $translation_list };


@@ -130,7 +130,7 @@ sub bank_transfer_create {
                                                    'id' => \@vc_ids);
     my @vc_bank_info           = sort { lc $a->{name} cmp lc $b->{name} } values %{ $vc_bank_info };
 
                                                    'id' => \@vc_ids);
     my @vc_bank_info           = sort { lc $a->{name} cmp lc $b->{name} } values %{ $vc_bank_info };
 

-    my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) };
+    my $bank_account_label_sub = sub { $locale->text('#1 - Account number #2, bank code #3, #4', $_[0]->{name}, $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank} ) };

 
     $form->header();
     print $form->parse_html_template('sepa/bank_transfer_create',
 
     $form->header();
     print $form->parse_html_template('sepa/bank_transfer_create',

diff --git a/locale/de/all b/locale/de/all
index d1e2c0220212976eca9b9b2678403150430a44ee..c3274c7525c48f251bda4089e83488b6369ac8b9 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -15,6 +15,7 @@ $self->{texts} = {
   ' Part Number missing!'       => ' Artikelnummer fehlt!',
   ' missing!'                   => ' fehlt!',
   '#1 (custom variable)'        => '#1 (benutzerdefinierte Variable)',
   ' Part Number missing!'       => ' Artikelnummer fehlt!',
   ' missing!'                   => ' fehlt!',
   '#1 (custom variable)'        => '#1 (benutzerdefinierte Variable)',

+  '#1 - Account number #2, bank code #3, #4' => '#1 - Kontonummber #2, BLZ #3, #4',

   '#1 MD'                       => '#1 PT',
   '#1 h'                        => '#1 h',
   '#1 of #2 importable objects were imported.' => '#1 von #2 importierbaren Objekten wurden importiert.',
   '#1 MD'                       => '#1 PT',
   '#1 h'                        => '#1 h',
   '#1 of #2 importable objects were imported.' => '#1 von #2 importierbaren Objekten wurden importiert.',


@@ -111,7 +112,6 @@ $self->{texts} = {
   'Account for fees'            => 'Konto für Gebühren',
   'Account for interest'        => 'Konto für Zinsen',
   'Account number'              => 'Kontonummer',
   'Account for fees'            => 'Konto für Gebühren',
   'Account for interest'        => 'Konto für Zinsen',
   'Account number'              => 'Kontonummer',

-  'Account number #1, bank code #2, #3' => 'Kontonummer #1, BLZ #2, #3',

   'Account number not unique!'  => 'Kontonummer bereits vorhanden!',
   'Account saved!'              => 'Konto gespeichert!',
   'Accounting Group deleted!'   => 'Buchungsgruppe gelöscht!',
   'Account number not unique!'  => 'Kontonummer bereits vorhanden!',
   'Account saved!'              => 'Konto gespeichert!',
   'Accounting Group deleted!'   => 'Buchungsgruppe gelöscht!',


@@ -2822,7 +2822,7 @@ $self->{texts} = {
   'You have to define a unit as a multiple of a smaller unit.' => 'Sie müssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben.',
   'You have to enter a company name in the client configuration.' => 'Sie müssen in der Mandantenkonfiguration einen Firmennamen angeben.',
   'You have to enter the SEPA creditor ID in the client configuration.' => 'Sie müssen in der Mandantenkonfiguration eine SEPA-Kreditoren-Identifikation angeben.',
   'You have to define a unit as a multiple of a smaller unit.' => 'Sie müssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben.',
   'You have to enter a company name in the client configuration.' => 'Sie müssen in der Mandantenkonfiguration einen Firmennamen angeben.',
   'You have to enter the SEPA creditor ID in the client configuration.' => 'Sie müssen in der Mandantenkonfiguration eine SEPA-Kreditoren-Identifikation angeben.',

-  'You have to fill in at least an account number, the bank code, the IBAN and the BIC.' => 'Sie müssen zumindest die Kontonummer, die Bankleitzahl, die IBAN und den BIC angeben.',
+  'You have to fill in at least a name, an account number, the bank code, the IBAN and the BIC.' => 'Sie müssen zumindest einen Namen, die Kontonummer, die Bankleitzahl, die IBAN und den BIC angeben.',

   'You have to grant users access to one or more clients.' => 'Benutzern muss dann Zugriff auf einzelne Mandanten gewährt werden.',
   'You have to specify a department.' => 'Sie müssen eine Abteilung wählen.',
   'You have to specify an execution date for each antry.' => 'Sie müssen für jeden zu buchenden Eintrag ein Ausführungsdatum angeben.',
   'You have to grant users access to one or more clients.' => 'Benutzern muss dann Zugriff auf einzelne Mandanten gewährt werden.',
   'You have to specify a department.' => 'Sie müssen eine Abteilung wählen.',
   'You have to specify an execution date for each antry.' => 'Sie müssen für jeden zu buchenden Eintrag ein Ausführungsdatum angeben.',

diff --git a/sql/Pg-upgrade2/bank_accounts_add_name.sql b/sql/Pg-upgrade2/bank_accounts_add_name.sql
new file mode 100644 (file)
index 0000000..9c6c192
--- /dev/null
+++ b/sql/Pg-upgrade2/bank_accounts_add_name.sql
@@ -0,0 +1,5 @@
+-- @tag: bank_accounts_add_name
+-- @description: Bankkonten bekommen nun einen Namen
+-- @depends: release_3_1_0 bank_accounts
+
+ALTER TABLE bank_accounts ADD COLUMN name text;

diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
index ef4febeb9b2c8d5f29cc291baeab4d30802692f7..5b3aeb942b406045891f161522a45aaf740fa5f1 100644 (file)
--- a/templates/webpages/bankaccounts/bank_account_display_form.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form.html
@@ -11,6 +11,11 @@
 
   <p>
    <table>
 
   <p>
    <table>

+    <tr>
+     <td align="right">[% 'Name' | $T8 %]</td>
+     <td><input name="account.name" size="20" maxlength="100" value="[% HTML.escape(account.name) %]"></td>
+    </tr>
+

     <tr>
      <td align="right">[% 'Account number' | $T8 %]</td>
      <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
     <tr>
      <td align="right">[% 'Account number' | $T8 %]</td>
      <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>