Fehler bei Drucken und Buchen und Preisgruppen behoben, Preisgruppen Quelltext ein...

[mfinanz.git] / bin / mozilla / is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 31d017eefc919a2edde0031a09812a1fc6310da9..53230d2b4a12faca54e55d17342b0831397fe252 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -216,9 +216,6 @@ print STDERR "is.pl-prepare_invoice\n";
         qw(partnumber description unit partnotes);
       $form->{rowcount} = $i;
 
         qw(partnumber description unit partnotes);
       $form->{rowcount} = $i;
 

-#      # build up html code for prices_$i
-# print STDERR "set_pricegroup aus is.pl-prepare_invoice\n";
-#      set_pricegroup();

     }
   }
   $lxdebug->leave_sub();
     }
   }
   $lxdebug->leave_sub();


@@ -860,10 +857,12 @@ print STDERR "is.pl-form_footer\n";
 
 sub update {
   $lxdebug->enter_sub();
 
 sub update {
   $lxdebug->enter_sub();

-print STDERR "is.pl-update\n";
+

   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);

-
+  if ($form->{second_run}) {
+    $form->{print_and_post} = 0;
+  }

   &check_name(customer);
 
   &check_project;
   &check_name(customer);
 
   &check_project;


@@ -985,7 +984,7 @@ print STDERR "is.pl-update\n";
         IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new");
 
         # build up html code for prices_$i
         IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new");
 
         # build up html code for prices_$i

-        set_pricegroup();
+        &set_pricegroup($i);

       }
 
       &display_form;
       }
 
       &display_form;


@@ -1016,7 +1015,6 @@ print STDERR "is.pl-update\n";
 
 sub post {
   $lxdebug->enter_sub();
 
 sub post {
   $lxdebug->enter_sub();

-print STDERR "is.pl-post\n";

   $form->isblank("invdate",  $locale->text('Invoice Date missing!'));
   $form->isblank("customer", $locale->text('Customer missing!'));
 
   $form->isblank("invdate",  $locale->text('Invoice Date missing!'));
   $form->isblank("customer", $locale->text('Customer missing!'));
 


@@ -1025,6 +1023,9 @@ print STDERR "is.pl-post\n";
     &update;
     exit;
   }
     &update;
     exit;
   }

+  if ($form->{second_run}) {
+    $form->{print_and_post} = 0;
+  }

 
   &validate_items;
 
 
   &validate_items;
 


@@ -1085,6 +1086,7 @@ sub print_and_post {
   $print_post             = 1;
   $form->{print_and_post} = 1;
   &post();
   $print_post             = 1;
   $form->{print_and_post} = 1;
   &post();

+

   &display_form();
   $lxdebug->leave_sub();
 
   &display_form();
   $lxdebug->leave_sub();
 


@@ -1105,7 +1107,9 @@ sub preview {
 
 sub delete {
   $lxdebug->enter_sub();
 
 sub delete {
   $lxdebug->enter_sub();

-
+  if ($form->{second_run}) {
+    $form->{print_and_post} = 0;
+  }

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|