Mahnsystem - mehr Variablen exportieren

Ausserdem strict fixes.

diff --git a/SL/DN.pm b/SL/DN.pm
index bd4b509..a325766 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -457,7 +457,7 @@ sub get_invoices {
     push(@values, $form->{minamount});
   }
 
-  $query =
+  my $query =
     qq|SELECT id
        FROM dunning_config
        WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
@@ -512,7 +512,7 @@ sub get_invoices {
 
   $form->{DUNNINGS} = [];
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     next if ($ref->{pastdue} < $ref->{terms});
 
     $ref->{interest} = $form->round_amount($ref->{interest}, 2);
@@ -537,7 +537,7 @@ sub get_dunning {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  $where = qq| WHERE (da.trans_id = a.id)|;
+  my $where = qq| WHERE (da.trans_id = a.id)|;
 
   my @values;
 
@@ -663,9 +663,10 @@ sub melt_pdfs {
     $form->error($main::locale->text('Could not spawn the printer command.')) unless $out;
 
   } else {
+    my $dunning_filename = $form->get_formname_translation('dunning');
     $out = IO::File->new('>-');
     $out->print(qq|Content-Type: Application/PDF\n| .
-                qq|Content-Disposition: attachment; filename="dunning_${dunning_id}.pdf"\n\n|);
+                qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|);
   }
 
   while (my $line = <$in>) {
@@ -712,7 +713,7 @@ sub print_dunning {
 
   my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id);
   my $first = 1;
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     if ($first) {
       $form->{TEMPLATE_ARRAYS} = {};
       map({ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} = []; } keys(%{$ref}));
@@ -737,7 +738,7 @@ sub print_dunning {
        LEFT JOIN contacts co ON (ar.cp_id = co.cp_id)
        WHERE (d.dunning_id = ?)
        LIMIT 1|;
-  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query =
@@ -832,7 +833,7 @@ sub print_invoice_for_fees {
        FROM ar
        LEFT JOIN customer c ON (ar.customer_id = c.id)
        WHERE ar.id = ?|;
-  $ref = selectfirst_hashref_query($form, $dbh, $query, $ar_id);
+  my $ref = selectfirst_hashref_query($form, $dbh, $query, $ar_id);
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $query = qq|SELECT * FROM employee WHERE login = ?|;

diff --git a/SL/Form.pm b/SL/Form.pm
index e7ee2b2..74de738 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1395,6 +1395,7 @@ sub get_formname_translation {
     storno_packing_list     => $main::locale->text('Storno Packing List'),
     sales_delivery_order    => $main::locale->text('Delivery Order'),
     purchase_delivery_order => $main::locale->text('Delivery Order'),
+    dunning                 => $main::locale->text('Dunning'),
   );
 
   $main::lxdebug->leave_sub();

diff --git a/locale/de/acctranscorrections b/locale/de/acctranscorrections
index 8f1cd23..e1df3ce 100644 (file)
--- a/locale/de/acctranscorrections
+++ b/locale/de/acctranscorrections
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/admin b/locale/de/admin
index f465fb6..e7f4825 100644 (file)
--- a/locale/de/admin
+++ b/locale/de/admin
@@ -75,6 +75,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit User'                   => 'Benutzerdaten bearbeiten',
   'Edit group membership'       => 'Gruppenmitgliedschaften bearbeiten',

diff --git a/locale/de/am b/locale/de/am
index 4411dd6..5ef6e81 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -147,6 +147,7 @@ $self->{texts} = {
   'Description missing!'        => 'Beschreibung fehlt.',
   'Directory'                   => 'Verzeichnis',
   'Discount'                    => 'Rabatt',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit'                        => 'Bearbeiten',
   'Edit Account'                => 'Kontodaten bearbeiten',

diff --git a/locale/de/amcvar b/locale/de/amcvar
index c83bc5b..dc92a0c 100644 (file)
--- a/locale/de/amcvar
+++ b/locale/de/amcvar
@@ -57,6 +57,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit custom variable'        => 'Benutzerdefinierte Variable bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',

diff --git a/locale/de/amtemplates b/locale/de/amtemplates
index 4e641b4..31e5a2a 100644 (file)
--- a/locale/de/amtemplates
+++ b/locale/de/amtemplates
@@ -59,6 +59,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit templates'              => 'Vorlage bearbeiten',
   'Edit the stylesheet'         => 'Stilvorlage bearbeiten',

diff --git a/locale/de/arap b/locale/de/arap
index f11bc5c..d11c19e 100644 (file)
--- a/locale/de/arap
+++ b/locale/de/arap
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/bp b/locale/de/bp
index 43d5c31..d6dd571 100644 (file)
--- a/locale/de/bp
+++ b/locale/de/bp
@@ -64,6 +64,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/ca b/locale/de/ca
index aa49c95..6263c83 100644 (file)
--- a/locale/de/ca
+++ b/locale/de/ca
@@ -74,6 +74,7 @@ $self->{texts} = {
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'EB-Wert'                     => 'EB-Wert',
   'ELSE'                        => 'Zusatz',
   'EUR'                         => 'E/Ü-Rechnung',

diff --git a/locale/de/common b/locale/de/common
index 7964ae7..2912109 100644 (file)
--- a/locale/de/common
+++ b/locale/de/common
@@ -56,6 +56,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/cp b/locale/de/cp
index a62e3be..253737e 100644 (file)
--- a/locale/de/cp
+++ b/locale/de/cp
@@ -72,6 +72,7 @@ $self->{texts} = {
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
   'Due'                         => 'Fällig',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/datev b/locale/de/datev
index 2ec3340..05d6a4a 100644 (file)
--- a/locale/de/datev
+++ b/locale/de/datev
@@ -68,6 +68,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/drafts b/locale/de/drafts
index 89362d1..368019c 100644 (file)
--- a/locale/de/drafts
+++ b/locale/de/drafts
@@ -58,6 +58,7 @@ $self->{texts} = {
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
   'Draft saved.'                => 'Entwurf gespeichert.',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/generictranslations b/locale/de/generictranslations
index e28593b..4a8720a 100644 (file)
--- a/locale/de/generictranslations
+++ b/locale/de/generictranslations
@@ -51,6 +51,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit greetings'              => 'Anreden bearbeiten',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/licenses b/locale/de/licenses
index 67d798a..0f390e4 100644 (file)
--- a/locale/de/licenses
+++ b/locale/de/licenses
@@ -65,6 +65,7 @@ $self->{texts} = {
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/pe b/locale/de/pe
index 39be3c5..87f9f83 100644 (file)
--- a/locale/de/pe
+++ b/locale/de/pe
@@ -62,6 +62,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit Group'                  => 'Warengruppe editieren',
   'Edit Pricegroup'             => 'Preisgruppe bearbeiten',

diff --git a/locale/de/projects b/locale/de/projects
index a7dcc26..377188c 100644 (file)
--- a/locale/de/projects
+++ b/locale/de/projects
@@ -62,6 +62,7 @@ $self->{texts} = {
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit Project'                => 'Projekt bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',

diff --git a/locale/de/rc b/locale/de/rc
index e342f37..25e7ac0 100644 (file)
--- a/locale/de/rc
+++ b/locale/de/rc
@@ -65,6 +65,7 @@ $self->{texts} = {
   'Difference'                  => 'Differenz',
   'Directory'                   => 'Verzeichnis',
   'Done'                        => 'Fertig',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',

diff --git a/locale/de/reportgenerator b/locale/de/reportgenerator
index 11eceb9..abe4405 100644 (file)
--- a/locale/de/reportgenerator
+++ b/locale/de/reportgenerator
@@ -53,6 +53,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
   'File'                        => 'Datei',

diff --git a/locale/de/rp b/locale/de/rp
index e0f3e3a..ca5aa90 100644 (file)
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -95,6 +95,7 @@ $self->{texts} = {
   'Description'                 => 'Beschreibung',
   'Directory'                   => 'Verzeichnis',
   'Due'                         => 'Fällig',
+  'Dunning'                     => 'Mahnung',
   'E-mail'                      => 'eMail',
   'E-mail Statement to'         => 'Fälligkeitsabrechnung als eMail an',
   'ELSE'                        => 'Zusatz',

diff --git a/locale/de/ustva b/locale/de/ustva
index 03a25ef..944c5b2 100644 (file)
--- a/locale/de/ustva
+++ b/locale/de/ustva
@@ -74,6 +74,7 @@ $self->{texts} = {
   'Delivery Order'              => 'Lieferschein',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
+  'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'ELSTER Export (Taxbird)'     => 'ELSTER-Export nach Taxbird',
   'ELSTER Export (Winston)'     => 'ELSTER Export nach Winston',