Bei Eingangs-, Ausgangs-, Kreditoren- und Debitorenrechnungen unterhalb der Zahlungse...

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index f69793b47f1122bece5c247bf794270ecce3b180..24c9f594371a2035b2d4c5d18980cd42f5f50ea8 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -672,6 +672,7 @@ $jsscript
     ? $locale->text('Tax Included')
     : $locale->text('Tax');
 
     ? $locale->text('Tax Included')
     : $locale->text('Tax');
 

+  $form->{invtotal_unformatted} = $form->{invtotal};

   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
   $APselected =
   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
   $APselected =


@@ -741,7 +742,9 @@ $jsscript
         </tr>
 ";
 
         </tr>
 ";
 

-  my @triggers = ();
+  my @triggers  = ();
+  my $totalpaid = 0;
+

   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
     print "
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
     print "


@@ -755,6 +758,8 @@ $jsscript
                            '-labels' => \%AP_paid_labels,
                            '-default' => $form->{"AP_paid_$i"}));
 
                            '-labels' => \%AP_paid_labels,
                            '-default' => $form->{"AP_paid_$i"}));
 

+    $totalpaid += $form->{"paid_$i"};
+

     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =
     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =


@@ -805,7 +810,23 @@ $jsscript
 ";
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 ";
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }

-  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+
+  my $paid_missing = $form->{invtotal_unformatted} - $totalpaid;
+
+  print qq|
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Total') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Missing amount') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+        </tr>
+| . $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .

     qq|
     <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
 
     qq|
     <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 8a01c195902e21265897b2c70d622632de5355d3..f3b319e2952dd4bba82f94e87839acbba4cd49d7 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -685,6 +685,7 @@ $jsscript
     $project = "";
   }
 
     $project = "";
   }
 

+  $form->{invtotal_unformatted} = $form->{invtotal};

   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
   $ARselected =
   $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
 
   $ARselected =


@@ -756,7 +757,9 @@ $jsscript
         </tr>
 ";
 
         </tr>
 ";
 

-  my @triggers = ();
+  my @triggers  = ();
+  my $totalpaid = 0;
+

   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
     print "
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
     print "


@@ -770,6 +773,8 @@ $jsscript
                            '-labels' => \%AR_paid_labels,
                            '-default' => $form->{"AR_paid_$i"}));
 
                            '-labels' => \%AR_paid_labels,
                            '-default' => $form->{"AR_paid_$i"}));
 

+    $totalpaid += $form->{"paid_$i"};
+

     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =
     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =


@@ -822,7 +827,22 @@ $jsscript
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 

-  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+  my $paid_missing = $form->{invtotal_unformatted} - $totalpaid;
+
+  print qq|
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Total') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Missing amount') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+        </tr>
+| . $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .

     qq|
 <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
 
     qq|
 <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
 

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 55a80faa2f64229554d84290ad2a9d895e1cfb1d..158a4e46c8e1fd43f836a2074c5b338cb8672dea 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -730,7 +730,9 @@ sub form_footer {
        </tr>
 |;
 
        </tr>
 |;
 

-  my @triggers = ();
+  my @triggers  = ();
+  my $totalpaid = 0;
+

   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 


@@ -742,6 +744,8 @@ sub form_footer {
     $form->{"selectAP_paid_$i"} =~
       s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/;
 
     $form->{"selectAP_paid_$i"} =~
       s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/;
 

+    $totalpaid += $form->{"paid_$i"};
+

     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =
     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} =


@@ -785,7 +789,22 @@ sub form_footer {
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 

+  my $paid_missing = $form->{oldinvtotal} - $totalpaid;
+

   print qq|
   print qq|

+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Total') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td align="center">| . $locale->text('Missing amount') . qq|</td>
+          <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+        </tr>
+

            <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
            <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
            <input type=hidden name=selectAP_paid value="$form->{selectAP_paid}">
            <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
            <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
            <input type=hidden name=selectAP_paid value="$form->{selectAP_paid}">

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b8eb074796eafdd9a55e86e03cc6c79e01fd42a9..78ee3d3162cafad6a5ab5ef9add67d9986019f04 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -1011,7 +1011,8 @@ if ($form->{type} eq "credit_note") {
         </tr>
 ";
 
         </tr>
 ";
 

-  my @triggers = ();
+  my @triggers  = ();
+  my $totalpaid = 0;

 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {


@@ -1062,6 +1063,23 @@ if ($form->{type} eq "credit_note") {
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 
     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 

+  my $paid_missing = $form->{oldinvtotal} - $totalpaid;
+
+  print qq|
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">| . $locale->text('Total') . qq|</td>
+      <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">| . $locale->text('Missing amount') . qq|</td>
+      <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+    </tr>
+|;
+

   map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
   print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
     </table>
   map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
   print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
     </table>

diff --git a/locale/de/all b/locale/de/all
index 6eb2f3acc4af8aab699ad92696192e0ee06fe66e..8ac7c575f9e7445a161c60cbbee78b41b18764b3 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -688,6 +688,7 @@ aktualisieren wollen?',
   'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',
   'Missing Preferences: Outputroutine disabled' => 'Die Ausgabefunktionen sind wegen unzureichender Voreinstellungen deaktiviert!',
   'Missing Tax Authoritys Preferences' => 'Fehlende Angaben zum Finanzamt!',
   'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',
   'Missing Preferences: Outputroutine disabled' => 'Die Ausgabefunktionen sind wegen unzureichender Voreinstellungen deaktiviert!',
   'Missing Tax Authoritys Preferences' => 'Fehlende Angaben zum Finanzamt!',

+  'Missing amount'              => 'Fehlbetrag',

   'Mitarbeiter'                 => 'Mitarbeiter',
   'Mobile1'                     => 'Mobile 1',
   'Mobile2'                     => 'Mobile 2',
   'Mitarbeiter'                 => 'Mitarbeiter',
   'Mobile1'                     => 'Mobile 1',
   'Mobile2'                     => 'Mobile 2',

diff --git a/locale/de/ap b/locale/de/ap
index db0b8ffac5cbefd88a4c88555d845ce6840aafa0..c892b5f5574aac3db344ed0479bd2c1a5bec1e9a 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -85,6 +85,7 @@ $self->{texts} = {
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',

+  'Missing amount'              => 'Fehlbetrag',

   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',

diff --git a/locale/de/ar b/locale/de/ar
index 2b8752fde403c9dcd992dd87f993eca70e3bad15..eb79d7199984a2a3c6e3c5f68b5ab138fbddd2c1 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -90,6 +90,7 @@ $self->{texts} = {
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',

+  'Missing amount'              => 'Fehlbetrag',

   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',

diff --git a/locale/de/ir b/locale/de/ir
index 15f8b0763139e17926255fbc9b822c1cf0a0d96b..98834e51c5269d844caadfe9d124a70fc6d06e4b 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -101,6 +101,7 @@ $self->{texts} = {
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',

+  'Missing amount'              => 'Fehlbetrag',

   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',

diff --git a/locale/de/is b/locale/de/is
index eec54550123779ed60b4a2cf3e35307aab55279e..9bc49e2df450f3ffbce59fcc0fdbfd49264c83b6 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -118,6 +118,7 @@ $self->{texts} = {
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Memo'                        => 'Memo',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',

+  'Missing amount'              => 'Fehlbetrag',

   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',