X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=6beb17c80aa640a4d7c31f152bd9f53ef2536c58;hb=8f1fb2d695599019da043422cc3314b2a3f4fede;hp=b632b389fdd77e4b2267586759120ca85cca060b;hpb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b632b389f..6beb17c80 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -42,16 +42,25 @@ require "bin/mozilla/invoice_io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/drafts.pl";
 
+use strict;
+
+my $edit;
+my $payment;
+my $print_post;
+
 1;
 
 # end of main
 
 sub add {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
-  return $lxdebug->leave_sub() if (load_draft_maybe());
+  return $main::lxdebug->leave_sub() if (load_draft_maybe());
 
   if ($form->{type} eq "credit_note") {
     $form->{title} = $locale->text('Add Credit Note');
@@ -67,33 +76,28 @@ sub add {
 
   $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
 
-  $form{jsscript} = "date";
+  $form->{jsscript} = "date";
 
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
-  {
-    $form->error("Access Denied");
-  }
   &invoice_links;
   &prepare_invoice;
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   # show history button
   $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
   #/show hhistory button
 
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
-  {
-    $form->error("Access Denied");
-  }
   $edit = 1;
+  my ($language_id, $printer_id);
   if ($form->{print_and_post}) {
     $form->{action}   = "print";
     $form->{resubmit} = 1;
@@ -109,19 +113,22 @@ sub edit {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub invoice_links {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   $form->{vc} = 'customer';
 
   # create links
-  $form->{webdav}   = $webdav;
-  $form->{lizenzen} = $lizenzen;
+  $form->{webdav}   = $main::webdav;
+  $form->{lizenzen} = $main::lizenzen;
 
   $form->create_links("AR", \%myconfig, "customer");
 
@@ -132,27 +139,32 @@ sub invoice_links {
     }
   }
 
+  my $payment_id;
   if ($form->{payment_id}) {
     $payment_id = $form->{payment_id};
   }
+  my $language_id;
   if ($form->{language_id}) {
     $language_id = $form->{language_id};
   }
+  my $taxzone_id;
   if ($form->{taxzone_id}) {
     $taxzone_id = $form->{taxzone_id};
   }
+  my $id;
   if ($form->{id}) {
     $id = $form->{id};
   }
+  my $shipto_id;
   if ($form->{shipto_id}) {
     $shipto_id = $form->{shipto_id};
   }
 
-  $cp_id = $form->{cp_id};
+  my $cp_id = $form->{cp_id};
   IS->get_customer(\%myconfig, \%$form);
 
   #quote all_customer Bug 133
-  foreach $ref (@{ $form->{all_customer} }) {
+  foreach my $ref (@{ $form->{all_customer} }) {
     $ref->{name} = $form->quote($ref->{name});
   }
   if ($id) {
@@ -184,23 +196,24 @@ sub invoice_links {
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}</option>\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
   # forex
   $form->{forex} = $form->{exchangerate};
-  $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
+  my $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
 
-  foreach $key (keys %{ $form->{AR_links} }) {
-    foreach $ref (@{ $form->{AR_links}{$key} }) {
+  foreach my $key (keys %{ $form->{AR_links} }) {
+    foreach my $ref (@{ $form->{AR_links}{$key} }) {
       $form->{"select$key"} .=
 "<option>$ref->{accno}--$ref->{description}</option>\n";
     }
 
     if ($key eq "AR_paid") {
-      for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
+      next unless $form->{acc_trans}{$key};
+      for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
         $form->{"AR_paid_$i"} =
           "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
 
@@ -230,13 +243,16 @@ sub invoice_links {
     ($form->datetonum($form->{invdate}, \%myconfig) <=
      $form->datetonum($form->{closedto}, \%myconfig));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub prepare_invoice {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
@@ -248,47 +264,44 @@ sub prepare_invoice {
 
   if ($form->{id}) {
 
-    map { $form->{$_} =~ s/\"/&quot;/g }
-      qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
-
-    #     # get pricegroups for parts
-    #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-
     my $i = 0;
 
-    foreach $ref (@{ $form->{invoice_details} }) {
+    foreach my $ref (@{ $form->{invoice_details} }) {
       $i++;
 
       map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
-      $form->{"discount_$i"} =
-        $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
-      ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
-      $dec           = length $dec;
-      $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      $form->{"sellprice_$i"} =
-        $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
-                             $decimalplaces);
+      $form->{"discount_$i"}   = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
+      my ($dec)                = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+      $dec                     = length $dec;
+      my $decimalplaces        = ($dec > 2) ? $dec : 2;
 
-      (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
-      $dec_qty = length $dec_qty;
+      $form->{"sellprice_$i"}  = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+      (my $dec_qty)            = ($form->{"qty_$i"} =~ /\.(\d+)/);
+      $dec_qty                 = length $dec_qty;
 
-      $form->{"qty_$i"} =
-        $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
+      $form->{"qty_$i"}        = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
 
-      map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-        qw(partnumber description unit partnotes);
-      $form->{rowcount} = $i;
+      $form->{rowcount}        = $i;
 
     }
+
+    # get pricegroups for parts
+    IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+    set_pricegroup($_) for 1 .. $form->{rowcount};
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub form_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
   $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
@@ -306,7 +319,7 @@ sub form_header {
   $form->{radier}          = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
 
   $payment = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{payment_terms} }) {
+  foreach my $item (@{ $form->{payment_terms} }) {
     if ($form->{payment_id} eq $item->{id}) {
       $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
     } else {
@@ -337,7 +350,7 @@ sub form_header {
   my @values = (undef);
   foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
     push(@values, $item->{"cp_id"});
-    $labels{$item->{"cp_id"}} = $item->{"cp_name"} .  ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+    $labels{$item->{"cp_id"}} = join(',', $item->{"cp_name"}, $item->{"cp_givenname"}) .  ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
   }
   my $contact;
   if (scalar @values > 1) {
@@ -383,7 +396,7 @@ sub form_header {
               : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
                              '-onChange' => 'document.getElementById(\'update_button\').click();',
                              '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
-        <input type="button" value="?" onclick="show_vc_details('customer')">
+        <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')">
       </td>|;
 
   %labels = ();
@@ -439,7 +452,7 @@ sub form_header {
     $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
   }
 
-  $salesman =
+  my $salesman =
     qq|<tr> <th align="right">| . $locale->text('Salesman') . qq|</th>
          <td>| . NTI($cgi->popup_menu('-name' => 'salesman_id', '-values' => \@values, '-labels' => \%labels,
                                       '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id})) . qq|
@@ -453,6 +466,7 @@ sub form_header {
     $labels{$item->{"id"}} = $item->{"description"};
   }
 
+  my $taxzone;
   if (!$form->{"id"}) {
     $taxzone = qq|
     <tr>
@@ -474,18 +488,18 @@ sub form_header {
   }
 
   # set option selected
-  foreach $item (qw(AR customer currency department employee)) {
+  foreach my $item (qw(AR customer currency department employee)) {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
-  $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0;
+  my $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0;
 
   $form->{exchangerate}    = $form->format_amount(\%myconfig, $form->{exchangerate});
   $form->{creditlimit}     = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
   $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
 
-  $exchangerate = "";
+  my $exchangerate = "";
   if ($form->{currency} ne $form->{defaultcurrency}) {
     if ($form->{forex}) {
       $exchangerate .= qq|<th align="right">| . $locale->text('Exchangerate') . qq|</th>
@@ -497,7 +511,7 @@ sub form_header {
   }
   $exchangerate .= qq|\n<input type="hidden" name="forex" value="$form->{forex}">\n|;
 
-  $department = qq|
+  my $department = qq|
               <tr>
 	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
 		<td colspan="3"><select name="department" style="width: 250px">$form->{selectdepartment}</select>
@@ -506,8 +520,9 @@ sub form_header {
 	      </tr>
 | if $form->{selectdepartment};
 
-  $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+  my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
 
+  my $business;
   if ($form->{business}) {
     $business = qq|
 	      <tr>
@@ -519,6 +534,7 @@ sub form_header {
 |;
   }
 
+  my $dunning;
   if ($form->{max_dunning_level}) {
     $dunning = qq|
       <tr>
@@ -537,11 +553,12 @@ sub form_header {
 
   # use JavaScript Calendar or not
   $form->{jsscript} = 1;
-  $jsscript = "";
+  my $jsscript = "";
+  my ($button1, $button2, $button3);
   if ($form->{type} eq "credit_note") {
     $button1 = qq|
-      <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+      <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>|;
 
     #write Trigger
@@ -551,36 +568,36 @@ sub form_header {
                           "trigger1");
   } else {
     $button1 = qq|
-      <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+      <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>
       |;
     $button2 = qq|
       <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="duedate" id="trigger2" value="|
+       <input type="button" name="duedate_button" id="trigger2" value="|
       . $locale->text('button') . qq|"></td>
     |;
     $button3 = qq|
       <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="deliverydate" id="trigger3" value="|
+       <input type="button" name="deliverydate_button" id="trigger3" value="|
       . $locale->text('button') . qq|"></td>
     |;
 
     #write Trigger
     $jsscript =
       Form->write_trigger(\%myconfig,     "3",
-                          "invdate",      "BL", "trigger1", 
+                          "invdate",      "BL", "trigger1",
                           "duedate",      "BL", "trigger2",
                           "deliverydate", "BL", "trigger3");
   }
 
-  $credittext = $locale->text('Credit Limit exceeded!!!');
+  my $credittext = $locale->text('Credit Limit exceeded!!!');
 
   my $follow_up_vc         =  $form->{customer};
-  $follow_up_vc            =~ s/--.*?//;
+  $follow_up_vc            =~ s/--\d*\s*$//;
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
 
-  $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
+  my $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
           : ($form->{resubmit})                                ? qq|document.invoice.submit()|
           : ($creditwarning)                                   ? qq|alert('$credittext')|
           :                                                      "focus()";
@@ -613,10 +630,11 @@ sub form_header {
   $form->hide_form(qw(id action type media format queued printed emailed title vc discount
                       creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
                       max_dunning_level dunning_amount
-                      shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax 
-                      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts),
+                      shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
+                      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
+                      convert_from_do_ids convert_from_oe_ids),
                       map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
-   
+
   print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
 
   print qq|
@@ -626,7 +644,7 @@ sub form_header {
 <input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
-<input type="hidden" name="lizenzen" value="$lizenzen">
+<input type="hidden" name="lizenzen" value="$main::lizenzen">
 
 <div class="listtop" width="100%">$form->{title}</div>
 
@@ -636,10 +654,10 @@ sub form_header {
       <table>
         <tr>
           $customers
-          <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
-          <input type="hidden" name="customer_id" value="$form->{customer_id}">
-          <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
-          <input type="hidden" name="selectcustomer" value="$form->{selectcustomer}">
+          <input type="hidden" name="customer_klass" value="| . H($form->{customer_klass}) . qq|">
+          <input type="hidden" name="customer_id" value="| . H($form->{customer_id}) . qq|">
+          <input type="hidden" name="oldcustomer" value="| . H($form->{oldcustomer}) . qq|">
+          <input type="hidden" name="selectcustomer" value="| . H($form->{selectcustomer}) . qq|">
         </tr>
         $contact
         $shipto
@@ -666,10 +684,13 @@ sub form_header {
 		<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
 		<td colspan="3"> | .
 		$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
-	  qq|</tr>
+      	  qq|	</td>
+	      </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
-		<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
+		<td colspan="3"> | .
+		$cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) .
+	  qq|	</td>
 	      </tr>
               <tr>
                 <th align="right">| . $locale->text('Transaction description') . qq|</th>
@@ -702,10 +723,14 @@ print qq|	    </table>
 	      $employees
         $salesman
 |;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
 if ($form->{type} eq "credit_note") {
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
-		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+      qq|	</td>
 	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
@@ -714,7 +739,9 @@ print qq|     <tr>
 } else {
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
-		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+      qq|	</td>
 	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Invoice Date') . qq|</th>
@@ -724,6 +751,12 @@ print qq|     <tr>
 		<th align="right">| . $locale->text('Due Date') . qq|</th>
                 $button2
 	      </tr>
+	      <tr>
+		<th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
+		<td> |.
+	        $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
+      qq|	</td>
+	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Delivery Date') . qq|</th>
                 $button3
@@ -731,7 +764,9 @@ print qq|     <tr>
 }
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
-		<td><input name="ordnumber" size="11" value="$form->{ordnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
+      qq|	</td>
 	      </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
@@ -740,7 +775,9 @@ print qq|     <tr>
         </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
-		<td><input name="quonumber" size="11" value="$form->{quonumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
+      qq|	</td>
 	      </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
@@ -749,7 +786,9 @@ print qq|     <tr>
         </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
-		<td><input name="cusordnumber" size="11" value="$form->{cusordnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
+      qq|	</td>
 	      </tr>
 	      <tr>
           <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
@@ -764,21 +803,27 @@ print qq|     <tr>
   <tr>
     <td>
     </td>
-  </tr> 
+  </tr>
   $jsscript
 |;
-  print qq|<input type="hidden" name="webdav" value="$webdav">|;
+  print qq|<input type="hidden" name="webdav" value="$main::webdav">|;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub form_footer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('invoice_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+  my $cgi      = $main::cgi;
+
+  $main::auth->assert('invoice_edit');
 
   $form->{invtotal} = $form->{invsubtotal};
 
+  my ($rows, $introws);
   if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
     $rows = 2;
   }
@@ -786,23 +831,24 @@ sub form_footer {
     $introws = 2;
   }
   $rows = ($rows > $introws) ? $rows : $introws;
-  $notes =
+  my $notes =
     qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
-  $intnotes =
+  my $intnotes =
     qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
 
   $form->{taxincluded} = ($form->{taxincluded} ? "checked" : "");
 
-  $taxincluded = "";
+  my $taxincluded = "";
   if ($form->{taxaccounts}) {
     $taxincluded = qq|
 	        <input name="taxincluded" class="checkbox" type="checkbox" $form->{taxincluded}> <b>|
       . $locale->text('Tax Included') . qq|</b><br><br>|;
   }
 
+  my ($tax, $subtotal);
   if (!$form->{taxincluded}) {
 
-    foreach $item (split / /, $form->{taxaccounts}) {
+    foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
         $form->{"${item}_total"} =
           $form->round_amount(
@@ -835,7 +881,7 @@ sub form_footer {
   }
 
   if ($form->{taxincluded}) {
-    foreach $item (split / /, $form->{taxaccounts}) {
+    foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
         $form->{"${item}_total"} =
           $form->round_amount(
@@ -901,7 +947,7 @@ sub form_footer {
 	      <tr valign="top">
 		<td>$notes</td>
 		<td>$intnotes</td>
-                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
+                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
                 </select></td>
 	      </tr>
         $follow_ups_block
@@ -937,7 +983,8 @@ sub form_footer {
     </td>
   </tr>
 |;
-  if ($webdav) {
+  my $webdav_list;
+  if ($main::webdav) {
     $webdav_list = qq|
   <tr>
     <td><hr size="3" noshade></td>
@@ -949,7 +996,7 @@ sub form_footer {
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
 |;
-    foreach $file (@{ $form->{WEBDAV} }) {
+    foreach my $file (@{ $form->{WEBDAV} }) {
       $webdav_list .= qq|
       <tr>
         <td align="left">$file->{name}</td>
@@ -986,12 +1033,14 @@ if ($form->{type} eq "credit_note") {
 |;
 }
 
+  my @column_index;
   if ($form->{currency} eq $form->{defaultcurrency}) {
     @column_index = qw(datepaid source memo paid AR_paid);
   } else {
     @column_index = qw(datepaid source memo paid exchangerate AR_paid);
   }
 
+  my %column_data;
   $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
   $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
   $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
@@ -1011,7 +1060,7 @@ if ($form->{type} eq "credit_note") {
   my $totalpaid = 0;
 
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
 
     print "
         <tr>\n";
@@ -1032,7 +1081,7 @@ if ($form->{type} eq "credit_note") {
     if ($form->{"exchangerate_$i"} == 0) {
       $form->{"exchangerate_$i"} = "";
     }
-    $exchangerate = qq|&nbsp;|;
+    my $exchangerate = qq|&nbsp;|;
     if ($form->{currency} ne $form->{defaultcurrency}) {
       if ($form->{"forex_$i"}) {
         $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
@@ -1099,11 +1148,11 @@ if ($form->{type} eq "credit_note") {
 </table>
 |;
 
-  $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
-  $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+  my $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
+  my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
-    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
 
     print qq|
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
@@ -1177,10 +1226,10 @@ if ($form->{type} eq "credit_note") {
   	  . qq|"> |;
   }
   # /button for saving history
-  
-  # mark_as_paid button 
-  if($form->{id} ne "") {  
-    print qq|<input type="submit" class="submit" name="action" value="| 
+
+  # mark_as_paid button
+  if($form->{id} ne "") {
+    print qq|<input type="submit" class="submit" name="action" value="|
           . $locale->text('mark as paid') . qq|">|;
   }
   # /mark_as_paid button
@@ -1192,6 +1241,7 @@ if ($form->{type} eq "credit_note") {
 $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
 . qq|
 </form>
 
@@ -1200,48 +1250,54 @@ $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
  </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub mark_as_paid {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('invoice_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  &mark_as_paid_common(\%myconfig,"ar");  
+  $main::auth->assert('invoice_edit');
 
-  $lxdebug->leave_sub();
+  &mark_as_paid_common(\%myconfig,"ar");
+
+  $main::lxdebug->leave_sub();
 }
 
 sub update {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   my ($recursive_call) = shift;
 
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
 
   $form->{print_and_post} = 0         if $form->{second_run};
-  $taxincluded            = "checked" if $form->{taxincluded};
+  my $taxincluded            = "checked" if $form->{taxincluded};
   $form->{update} = 1;
 
-  &check_name(customer);
+  &check_name("customer");
 
   $form->{taxincluded} ||= $taxincluded;
 
-  $form->{exchangerate} = $exchangerate if
-    $form->{forex} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
 
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     next unless $form->{"paid_$i"};
     map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
-    $form->{"exchangerate_$i"} = $exchangerate if
-      $form->{"forex_$i"} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+    $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+    $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
   }
 
-  $i            = $form->{rowcount};
-  $exchangerate = $form->{exchangerate} || 1;
+  my $i            = $form->{rowcount};
+  my $exchangerate = $form->{exchangerate} || 1;
 
   # if last row empty, check the form otherwise retrieve new item
   if (   ($form->{"partnumber_$i"} eq "")
@@ -1255,9 +1311,9 @@ sub update {
 
     IS->retrieve_item(\%myconfig, \%$form);
 
-    $rows = scalar @{ $form->{item_list} };
+    my $rows = scalar @{ $form->{item_list} };
 
-    $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
+    $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
 
     if ($rows) {
       $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
@@ -1269,18 +1325,18 @@ sub update {
 
       } else {
 
-        $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
+        my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
         map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
         map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
-        
+
         $form->{payment_id}    = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
         $form->{"discount_$i"} = 0                             if $form->{"not_discountable_$i"};
 
         $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
 
         ($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/;
-        $decimalplaces = max 2, length $1;
+        my $decimalplaces = max 2, length $1;
 
         if ($sellprice) {
           $form->{"sellprice_$i"} = $sellprice;
@@ -1292,7 +1348,7 @@ sub update {
 
         $form->{"listprice_$i"} /= $exchangerate;
 
-        $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100);
+        my $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100);
         map { $form->{"${_}_base"} = 0 }                                 split / /, $form->{taxaccounts};
         map { $form->{"${_}_base"} += $amount }                          split / /, $form->{"taxaccounts_$i"};
         map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded};
@@ -1303,10 +1359,10 @@ sub update {
 
         $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 
-        if ($lizenzen) {
+        if ($main::lizenzen) {
           if ($form->{"inventory_accno_$i"} ne "") {
             $form->{"lizenzen_$i"} = qq|<option></option>|;
-            foreach $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
+            foreach my $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) {
               $form->{"lizenzen_$i"} .= qq|<option value="$item->{"id"}">$item->{"licensenumber"}</option>|;
             }
             $form->{"lizenzen_$i"} .= qq|<option value=-1>Neue Lizenz</option>|;
@@ -1340,23 +1396,29 @@ sub update {
       }
     }
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub post_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
+
+  our $invdate;
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"}) {
-      $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+      my $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
 
       $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
 
       $form->error($locale->text('Cannot post payment for a closed period!'))
-        if ($datepaid <= $closedto);
+        if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
 
       if ($form->{currency} ne $form->{defaultcurrency}) {
         $form->{"exchangerate_$i"} = $form->{exchangerate}
@@ -1375,23 +1437,29 @@ sub post_payment {
     $form->error($locale->text('Cannot post payment!'));
 
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub post {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
   $form->isblank("invdate",  $locale->text('Invoice Date missing!'));
   $form->isblank("customer", $locale->text('Customer missing!'));
+  $form->error($locale->text('Cannot post invoice for a closed period!'))
+        if ($form->date_closed($form->{"invdate"}, \%myconfig));
 
   $form->{invnumber} =~ s/^\s*//g;
   $form->{invnumber} =~ s/\s*$//g;
 
   # if oldcustomer ne customer redo form
-  if (&check_name(customer)) {
+  if (&check_name('customer')) {
     &update;
     exit;
   }
@@ -1401,8 +1469,8 @@ sub post {
 
   &validate_items;
 
-  $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-  $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
+  my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+  my $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
 
   $form->error($locale->text('Cannot post invoice for a closed period!'))
     if ($invdate <= $closedto);
@@ -1410,14 +1478,14 @@ sub post {
   $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
     if ($form->{currency} ne $form->{defaultcurrency});
 
-  for $i (1 .. $form->{paidaccounts}) {
+  for my $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
-      $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+      my $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
 
       $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
 
       $form->error($locale->text('Cannot post payment for a closed period!'))
-        if ($datepaid <= $closedto);
+        if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
 
       if ($form->{currency} ne $form->{defaultcurrency}) {
         $form->{"exchangerate_$i"} = $form->{exchangerate}
@@ -1461,28 +1529,33 @@ sub post {
   $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
     unless $print_post;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub print_and_post {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
-  $old_form               = new Form;
+  my $old_form               = new Form;
   $print_post             = 1;
   $form->{print_and_post} = 1;
   &post();
 
   &edit();
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub use_as_template {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
   $form->{paidaccounts} = 1;
@@ -1490,13 +1563,17 @@ sub use_as_template {
   $form->{invdate} = $form->current_date(\%myconfig);
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub storno {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('invoice_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('invoice_edit');
 
   if ($form->{storno}) {
     $form->error($locale->text('Cannot storno storno invoice!'));
@@ -1523,27 +1600,32 @@ sub storno {
   $form->{rowcount}++;
 
   post();
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub preview {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   $form->{preview} = 1;
-  $old_form = new Form;
+  my $old_form = new Form;
   for (keys %$form) { $old_form->{$_} = $form->{$_} }
 
   &print_form($old_form);
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
 }
 
 sub delete {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('invoice_edit');
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('invoice_edit');
 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
@@ -1559,7 +1641,7 @@ sub delete {
   # delete action variable
   map { delete $form->{$_} } qw(action header);
 
-  foreach $key (keys %$form) {
+  foreach my $key (keys %$form) {
     next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
     $form->{$key} =~ s/\"/&quot;/g;
     print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
@@ -1579,13 +1661,17 @@ sub delete {
 </form>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub credit_note {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
   $form->{duedate} =
@@ -1598,8 +1684,8 @@ sub credit_note {
 
   $form->{title}  = $locale->text('Add Credit Note');
   $form->{script} = 'is.pl';
-  $script         = "is";
-  $buysell        = 'buy';
+  our $script         = "is";
+  our $buysell        = 'buy';
 
 
   # bo creates the id, reset it
@@ -1609,24 +1695,17 @@ sub credit_note {
   $form->{type} = "credit_note";
 
 
-  map { $form->{"select$_"} = "" } ($form->{vc}, currency);
+  map { $form->{"select$_"} = "" } ($form->{vc}, 'currency');
 
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(creditlimit creditremaining);
 
-  $currency = $form->{currency};
+  my $currency = $form->{currency};
   &invoice_links;
 
   $form->{currency}     = $currency;
-  $form->{exchangerate} = "";
-  $form->{forex}        = "";
-  $form->{exchangerate} = $exchangerate
-    if (
-        $form->{forex} = (
-                    $exchangerate =
-                      $form->check_exchangerate(
-                      \%myconfig, $form->{currency}, $form->{invdate}, $buysell
-                      )));
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell);
+  $form->{exchangerate} = $form->{forex} || '';
 
   $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
 
@@ -1635,15 +1714,19 @@ sub credit_note {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub yes {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('invoice_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
+  $main::auth->assert('invoice_edit');
+
+  if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) {
     # saving the history
   	if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
@@ -1655,13 +1738,15 @@ sub yes {
   }
   $form->error($locale->text('Cannot delete invoice!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub e_mail {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
-  $auth->assert('invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   if (!$form->{id}) {
     $print_post = 1;
@@ -1675,5 +1760,5 @@ sub e_mail {
 
   edit_e_mail();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }