X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=9b6da27c60bf5c538ee6ffdbf6ca0f4ccdf40ee0;hb=5e59cc54dd5e2d69f71828541795a29ed51a96f0;hp=a043e07bb655b4bbb147502769149a3a7ecf48c6;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index a043e07bb..9b6da27c6 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -31,32 +31,45 @@
 #
 #======================================================================
 
-
 use SL::IS;
 use SL::PE;
+use Data::Dumper;
 
 require "$form->{path}/io.pl";
 require "$form->{path}/arap.pl";
-
+require "bin/mozilla/drafts.pl";
 
 1;
-# end of main
-
 
+# end of main
 
 sub add {
   $lxdebug->enter_sub();
 
-  $form->{title} = $locale->text('Add Sales Invoice');
+  return $lxdebug->leave_sub() if (load_draft_maybe());
+
+  if ($form->{type} eq "credit_note") {
+    $form->{title} = $locale->text('Add Credit Note');
+
+    if ($form->{storno}) {
+      $form->{title} = $locale->text('Add Storno Credit Note');
+    }
+  } else {
+    $form->{title} = $locale->text('Add Sales Invoice');
+
+  }
+
 
-  $form->{callback} = "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}" unless $form->{callback};
+  $form->{callback} =
+    "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}"
+    unless $form->{callback};
 
   $form{jsscript} = "date";
-  
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") {
-    $form->error("Access Denied")
-  } 
-  
+
+  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
+  {
+    $form->error("Access Denied");
+  }
   &invoice_links;
   &prepare_invoice;
   &display_form;
@@ -64,31 +77,43 @@ sub add {
   $lxdebug->leave_sub();
 }
 
-
 sub edit {
   $lxdebug->enter_sub();
 
-  $form->{title} = $locale->text('Edit Sales Invoice');
-  
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") {
-    $form->error("Access Denied")
-  } 
+  # 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;
+  if ($form->{print_and_post}) {
+    $form->{action}   = "print";
+    $form->{resubmit} = 1;
+    $language_id = $form->{language_id};
+    $printer_id = $form->{printer_id};
+  }
   &invoice_links;
   &prepare_invoice;
+  if ($form->{print_and_post}) {
+    $form->{language_id} = $language_id;
+    $form->{printer_id} = $printer_id;
+  }
+
   &display_form;
 
   $lxdebug->leave_sub();
 }
 
-
 sub invoice_links {
   $lxdebug->enter_sub();
 
   $form->{vc} = 'customer';
 
   # create links
-  $form->{webdav} = $webdav;
+  $form->{webdav}   = $webdav;
   $form->{lizenzen} = $lizenzen;
 
   $form->create_links("AR", \%myconfig, "customer");
@@ -98,14 +123,51 @@ sub invoice_links {
       $form->{customer_id} = $form->{all_customer}->[0]->{id};
     }
   }
+
+  if ($form->{payment_id}) {
+    $payment_id = $form->{payment_id};
+  }
+  if ($form->{language_id}) {
+    $language_id = $form->{language_id};
+  }
+  if ($form->{taxzone_id}) {
+    $taxzone_id = $form->{taxzone_id};
+  }
+  if ($form->{id}) {
+    $id = $form->{id};
+  }
+  if ($form->{shipto_id}) {
+    $shipto_id = $form->{shipto_id};
+  }
+
   $cp_id = $form->{cp_id};
   IS->get_customer(\%myconfig, \%$form);
-    
+
+  #quote all_customer Bug 133
+  foreach $ref (@{ $form->{all_customer} }) {
+    $ref->{name} = $form->quote($ref->{name});
+  }
+  if ($id) {
+    $form->{id} = $id;
+  }
   IS->retrieve_invoice(\%myconfig, \%$form);
   $form->{cp_id} = $cp_id;
 
+  if ($payment_id) {
+    $form->{payment_id} = $payment_id;
+  }
+  if ($language_id) {
+    $form->{language_id} = $language_id;
+  }
+  if ($taxzone_id) {
+    $form->{taxzone_id} = $taxzone_id;
+  }
+  if ($shipto_id) {
+    $form->{shipto_id} = $shipto_id;
+  }
+
   # currencies
-  @curr = split /:/, $form->{currencies};
+  @curr = split(/:/, $form->{currencies});
   chomp $curr[0];
   $form->{defaultcurrency} = $curr[0];
 
@@ -113,30 +175,36 @@ sub invoice_links {
 
   $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
 
-  if ($form->{all_customer}) {
+  if (@{ $form->{all_customer} }) {
     $form->{customer} = "$form->{customer}--$form->{customer_id}";
-    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" } (@{ $form->{all_customer} });
+    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
+      (@{ $form->{all_customer} });
   }
-  
+
   # departments
   if ($form->{all_departments}) {
     $form->{selectdepartment} = "<option>\n";
-    $form->{department} = "$form->{department}--$form->{department_id}";
+    $form->{department}       = "$form->{department}--$form->{department_id}";
 
-    map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+    map {
+      $form->{selectdepartment} .=
+        "<option>$_->{description}--$_->{id}\n"
+    } (@{ $form->{all_departments} });
   }
-  
+
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
+
   # sales staff
   if ($form->{all_employees}) {
     $form->{selectemployee} = "";
-    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" } (@{ $form->{all_employees} });
+    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
+      (@{ $form->{all_employees} });
   }
-  
+
   # forex
   $form->{forex} = $form->{exchangerate};
   $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
-  
+
   foreach $key (keys %{ $form->{AR_links} }) {
     foreach $ref (@{ $form->{AR_links}{$key} }) {
       $form->{"select$key"} .= "<option>$ref->{accno}--$ref->{description}\n";
@@ -144,175 +212,391 @@ sub invoice_links {
 
     if ($key eq "AR_paid") {
       for $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}";
-	# reverse paid
-	$form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i-1]->{amount} * -1;
-	$form->{"datepaid_$i"} = $form->{acc_trans}{$key}->[$i-1]->{transdate};
-	$form->{"forex_$i"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i-1]->{exchangerate};
-	$form->{"source_$i"} = $form->{acc_trans}{$key}->[$i-1]->{source};
-	$form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i-1]->{memo};
-	
-	$form->{paidaccounts} = $i;
+        $form->{"AR_paid_$i"} =
+          "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+
+        # reverse paid
+        $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+        $form->{"datepaid_$i"} =
+          $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+        $form->{"forex_$i"} = $form->{"exchangerate_$i"} =
+          $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+        $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
+        $form->{"memo_$i"}   = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+
+        $form->{paidaccounts} = $i;
       }
     } else {
-      $form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
+      $form->{$key} =
+        "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
     }
-    
+
   }
 
   $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
 
   $form->{AR} = $form->{AR_1} unless $form->{id};
-  
-  $form->{locked} = ($form->datetonum($form->{invdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig));
 
+  $form->{locked} =
+    ($form->datetonum($form->{invdate}, \%myconfig) <=
+     $form->datetonum($form->{closedto}, \%myconfig));
 
   $lxdebug->leave_sub();
 }
 
-
 sub prepare_invoice {
   $lxdebug->enter_sub();
 
-  $form->{type} = "invoice";
-  $form->{formname} = "invoice";
-  $form->{format} = "html";
-  $form->{media} = "screen";
+  if ($form->{type} eq "credit_note") {
+    $form->{type}     = "credit_note";
+    $form->{formname} = "credit_note";
+  } else {
+    $form->{type}     = "invoice";
+    $form->{formname} = "invoice";
+  }
 
   if ($form->{id}) {
 
-    map { $form->{$_} =~ s/\"/&quot;/g } qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
+    map { $form->{$_} =~ s/\"/&quot;/g }
+      qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
+
+    #     # get pricegroups for parts
+    #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
-    foreach $ref (@{ $form->{invoice_details} } ) {
+    my $i = 0;
+
+    foreach $ref (@{ $form->{invoice_details} }) {
       $i++;
-      map { $form->{"${_}_$i"} = $ref->{$_} } keys %{ $ref };
-      $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
 
+      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;
+      $dec           = length $dec;
       $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
-      $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+      $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);
 
-      map { $form->{"${_}_$i"} =~ s/\"/&quot;/g } qw(partnumber description unit partnotes);
+      map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
+        qw(partnumber description unit partnotes);
       $form->{rowcount} = $i;
+
     }
   }
   $lxdebug->leave_sub();
 }
 
-
-
 sub form_header {
   $lxdebug->enter_sub();
 
+  if ($edit) {
+
+    if ($form->{type} eq "credit_note") {
+      $form->{title} = $locale->text('Edit Credit Note');
+    
+      if ($form->{storno}) {
+        $form->{title} = $locale->text('Edit Storno Credit Note');
+      }
+    } else {
+      $form->{title} = $locale->text('Edit Sales Invoice');
+    
+      if ($form->{storno}) {
+        $form->{title} = $locale->text('Edit Storno Invoice');
+      }
+    }
+  }
+
+  $form->{radier} =
+    ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+
+  $payment = qq|<option value=""></option>|;
+  foreach $item (@{ $form->{payment_terms} }) {
+    if ($form->{payment_id} eq $item->{id}) {
+      $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
+    } else {
+      $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
+    }
+  }
+
+  my $set_duedate_url =
+    "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate";
+
+  my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url );
+  push(@ { $form->{AJAX} }, $pjx);
+
+  if (@{ $form->{TAXZONE} }) {
+    $form->{selecttaxzone} = "";
+    foreach $item (@{ $form->{TAXZONE} }) {
+      if ($item->{id} == $form->{taxzone_id}) {
+        $form->{selecttaxzone} .=
+          "<option value=$item->{id} selected>" . H($item->{description}) .
+          "</option>";
+      } else {
+        $form->{selecttaxzone} .=
+          "<option value=$item->{id}>" . H($item->{description}) . "</option>";
+      }
+
+    }
+  } else {
+    $form->{selecttaxzone} =~ s/ selected//g;
+    if ($form->{taxzone_id} ne "") {
+      $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
+    }
+  }
+
+  $taxzone = qq|
+	      <tr>
+		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
+		<td><select name=taxzone_id>$form->{selecttaxzone}</select></td>
+		<input type=hidden name=selecttaxzone value="$form->{selecttaxzone}">
+	      </tr>|;
+
+  my @old_project_ids = ($form->{"globalproject_id"});
+  map({ push(@old_project_ids, $form->{"project_id_$_"})
+          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+  $form->get_lists("contacts" => "ALL_CONTACTS",
+                   "shipto" => "ALL_SHIPTO",
+                   "projects" => { "key" => "ALL_PROJECTS",
+                                   "all" => 0,
+                                   "old_id" => \@old_project_ids });
+
+  my (%labels, @values);
+  foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
+    push(@values, $item->{"cp_id"});
+    $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
+      ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+  }
+  my $contact =
+    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+  %labels = ();
+  @values = ("");
+  foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
+    push(@values, $item->{"shipto_id"});
+    $labels{$item->{"shipto_id"}} =
+      $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+  }
+
+  my $shipto = qq|
+		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
+		<td>| .
+    NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+    . qq|</td>|;
+
+  %labels = ();
+  @values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+  my $globalprojectnumber =
+    NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
+                         '-labels' => \%labels,
+                         '-default' => $form->{"globalproject_id"}));
+
   # set option selected
-  foreach $item (qw(AR customer currency department employee contact)) {
+  foreach $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}/;
+    $form->{"select$item"} =~
+      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
-  
-  #build contacts
-  if ($form->{all_contacts}) {
-  
-        $form->{selectcontact} = "";
-        foreach $item  (@{$form->{all_contacts}}) {
-          if ($form->{cp_id} == $item->{cp_id})
-          {
-            $form->{selectcontact} .= "<option selected>$item->{cp_name}--$item->{cp_id}";
-          }
-          else
-          {
-             $form->{selectcontact} .= "<option>$item->{cp_name}--$item->{cp_id}";
-          }
-      }
-   }  
-   #else {$form->{all_contacts} = 0;}
 
-  $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
+  #quote customer Bug 133
+  $form->{selectcustomer} = $form->quote($form->{selectcustomer});
+  
+  if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
+    $creditwarning = 1;
+  } else {
+    $creditwarning = 0;
+  }
 
-  $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
-  $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "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 = "";
   if ($form->{currency} ne $form->{defaultcurrency}) {
     if ($form->{forex}) {
-      $exchangerate .= qq|<th align=right>|.$locale->text('Exchangerate').qq|</th><td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>|;
+      $exchangerate .=
+          qq|<th align=right>|
+        . $locale->text('Exchangerate')
+        . qq|</th><td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>|;
     } else {
-      $exchangerate .= qq|<th align=right>|.$locale->text('Exchangerate').qq|</th><td><input name=exchangerate size=10 value=$form->{exchangerate}></td>|;
+      $exchangerate .=
+          qq|<th align=right>|
+        . $locale->text('Exchangerate')
+        . qq|</th><td><input name=exchangerate size=10 value=$form->{exchangerate}></td>|;
     }
   }
   $exchangerate .= qq|
 <input type=hidden name=forex value=$form->{forex}>
 |;
-  
-  $customer = ($form->{selectcustomer}) ? qq|<select name=customer>$form->{selectcustomer}</select>\n<input type=hidden name="selectcustomer" value="$form->{selectcustomer}">| : qq|<input name=customer value="$form->{customer}" size=35>|;
 
-  #sk
-  $contact = ($form->{selectcontact}) ? qq|<select name=contact>$form->{selectcontact}</select>\n<input type=hidden name="selectcontact" value="$form->{selectcontact}">| : qq|<input name=contact value="$form->{contact}" size=35>|;
-  
+  $customer =
+    ($form->{selectcustomer})
+    ? qq|<select name=customer>$form->{selectcustomer}</select>\n<input type=hidden name="selectcustomer" value="$form->{selectcustomer}">|
+    : qq|<input name=customer value="$form->{customer}" size=35>|;
+
   $department = qq|
               <tr>
-	        <th align="right" nowrap>|.$locale->text('Department').qq|</th>
+	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
 		<td colspan=3><select name=department>$form->{selectdepartment}</select>
 		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
 		</td>
 	      </tr>
 | if $form->{selectdepartment};
 
-
   $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
 
-
   if ($form->{business}) {
     $business = qq|
 	      <tr>
-		<th align=right>|.$locale->text('Business').qq|</th>
+		<th align=right>| . $locale->text('Business') . qq|</th>
 		<td>$form->{business}</td>
-		<th align=right>|.$locale->text('Trade Discount').qq|</th>
-		<td>|.$form->format_amount(\%myconfig, $form->{tradediscount} * 100).qq| %</td>
+		<th align=right>| . $locale->text('Trade Discount') . qq|</th>
+		<td>|
+      . $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
+      . qq| %</td>
 	      </tr>
 |;
   }
 
+  if ($form->{max_dunning_level}) {
+    $dunning = qq|
+	      <tr>
+                <td colspan=4>
+                <table>
+                  <tr>
+		<th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
+		<td><b>$form->{max_dunning_level}</b></td>
+		<th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
+		<td><b>|
+      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+      . qq|</b></td>
+	      </tr>
+              </table>
+             </td>
+            </tr>
+|;
+  }
+
   $form->{fokus} = "invoice.customer";
-  
+
   # use JavaScript Calendar or not
   $form->{jsscript} = $jscalendar;
   $jsscript = "";
-  if ($form->{jsscript}) 
-  {
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
-       <td><input type=button name=invdate 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}></td>
-       <td width="4"><input type=button name=duedate id="trigger2" value=|.$locale->text('button').qq|></td></td>
-     |;
-
-     #write Trigger
-     $jsscript = Form->write_trigger(\%myconfig, "2","invdate","BL","trigger1","duedate","BL","trigger2");
-   }
-   else
-   {
+  if ($form->{type} eq "credit_note") {
+    if ($form->{jsscript}) {
+  
+      # with JavaScript Calendar
+      $button1 = qq|
+        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
+        <td><input type=button name=invdate id="trigger1" value=|
+        . $locale->text('button') . qq|></td>
+        |;
+  
+      #write Trigger
+      $jsscript =
+        Form->write_trigger(\%myconfig,     "1",
+                            "invdate",      "BL",
+                            "trigger1");
+    } else {
+  
       # without JavaScript Calendar
-      $button1 = qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
-      $button2 = qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
+      $button1 =
+        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
+      $button2 =
+        qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
     }
+  } else {
+    if ($form->{jsscript}) {
   
-  $form->header;
+      # with JavaScript Calendar
+      $button1 = qq|
+        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
+        <td><input type=button name=invdate 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}></td>
+        <td width="4"><input type=button name=duedate id="trigger2" value=|
+        . $locale->text('button') . qq|></td></td>
+      |;
+      $button3 = qq|
+        <td width="13"><input name=deliverydate id=deliverydate size=11 title="$myconfig{dateformat}" value=$form->{deliverydate}></td>
+        <td width="4"><input type=button name=deliverydate id="trigger3" value=|
+        . $locale->text('button') . qq|></td></td>
+      |;
   
+      #write Trigger
+      $jsscript =
+        Form->write_trigger(\%myconfig,     "3",
+                            "invdate",      "BL",
+                            "trigger1",     "duedate",
+                            "BL",           "trigger2",
+                            "deliverydate", "BL",
+                            "trigger3");
+    } else {
+  
+      # without JavaScript Calendar
+      $button1 =
+        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
+      $button2 =
+        qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
+    }
+  }
+  if ($form->{resubmit} && ($form->{format} eq "html")) {
+    $onload =
+      qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
+  } elsif ($form->{resubmit}) {
+    $onload = qq|document.invoice.submit()|;
+  } else {
+    $onload = "fokus()";
+  }
+
+  $credittext = $locale->text('Credit Limit exceeded!!!');
+  if ($creditwarning) {
+    $onload = qq|alert('$credittext')|;
+  }
+
+  $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
+
+  $jsscript .=
+    $form->write_trigger(\%myconfig, 2,
+                         "orddate", "BL", "trigger_orddate",
+                         "quodate", "BL", "trigger_quodate");
+  # show history button js
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show history button js
+  $form->header;
+
   print qq|
-<body onLoad="fokus()">
+<body onLoad="$onload">
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+<script type="text/javascript" src="js/vendor_selection.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
 
 <form method=post name="invoice" action=$form->{script}>
 
 
 <input type=hidden name=id value=$form->{id}>
+<input type=hidden name=action value=$form->{action}>
 
 <input type=hidden name=type value=$form->{type}>
 <input type=hidden name=media value=$form->{media}>
@@ -337,6 +621,10 @@ sub form_header {
 
 <input type=hidden name=shipped value=$form->{shipped}>
 <input type=hidden name=lizenzen value=$lizenzen>
+<input type=hidden name=storno value=$form->{storno}>
+<input type=hidden name=storno_id value=$form->{storno_id}>
+
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
 
 <table width=100%>
   <tr class=listtop>
@@ -350,11 +638,13 @@ sub form_header {
 	  <td>
 	    <table>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Customer').qq|</th>
+		<th align=right nowrap>| . $locale->text('Customer') . qq|</th>
 		<td colspan=3>$customer</td>
+    <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}">
-                <th align=richt nowrap>|.$locale->text('Contact Person').qq|</th>
+                <th align=richt nowrap>|
+    . $locale->text('Contact Person') . qq|</th>
                 <td colspan=3>$contact</td>
 	      </tr>
 	      <tr>
@@ -362,24 +652,27 @@ sub form_header {
 		<td colspan=3>
 		  <table>
 		    <tr>
-		      <th nowrap>|.$locale->text('Credit Limit').qq|</th>
+		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
 		      <td>$form->{creditlimit}</td>
 		      <td width=20%></td>
-		      <th nowrap>|.$locale->text('Remaining').qq|</th>
+		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
 		      <td class="plus$n">$form->{creditremaining}</td>
 		    </tr>
 		  </table>
 		</td>
+                $shipto
 	      </tr>
 	      $business
+              $dunning
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Record in').qq|</th>
-		<td colspan=3><select name=AR>$form->{selectAR}</select></td>
+		<th align=right nowrap>| . $locale->text('Record in') . qq|</th>
+		<td colspan=3><select name=AR style="width:280px;">$form->{selectAR}</select></td>
 		<input type=hidden name=selectAR value="$form->{selectAR}">
 	      </tr>
+              $taxzone
 	      $department
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Currency').qq|</th>
+		<th align=right nowrap>| . $locale->text('Currency') . qq|</th>
 		<td><select name=currency>$form->{selectcurrency}</select></td>
 		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
 		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
@@ -388,47 +681,96 @@ sub form_header {
 		$exchangerate
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Shipping Point').qq|</th>
+		<th align=right nowrap>| . $locale->text('Shipping Point') . qq|</th>
 		<td colspan=3><input name=shippingpoint size=35 value="$form->{shippingpoint}"></td>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Ship via').qq|</th>
+		<th align=right nowrap>| . $locale->text('Ship via') . qq|</th>
 		<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
-	      </tr>
-	    </table>
+	      </tr>|;
+#               <tr>
+#                 <td colspan=4>
+#                   <table>
+#                     <tr>
+#                       <td colspan=2>
+#                         <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">| . $locale->text('Choose Customer') . qq|</button>
+#                       </td>
+#                       <td colspan=2><input type=hidden name=delivery_customer_id value="$form->{delivery_customer_id}">
+#                       <input size=45 id=delivery_customer_string name=delivery_customer_string value="$form->{delivery_customer_string}"></td>
+#                     </tr>
+#                     <tr>
+#                       <td colspan=2>
+#                         <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">| . $locale->text('Choose Vendor') . qq|</button>
+#                       </td>
+#                       <td colspan=2><input type=hidden name=delivery_vendor_id value="$form->{delivery_vendor_id}">
+#                       <input size=45 id=delivery_vendor_string name=delivery_vendor_string value="$form->{delivery_vendor_string}"></td>
+#                     </tr>
+#                   </table>
+#                 </td>
+#               </tr>
+print qq|	    </table>
 	  </td>
 	  <td align=right>
 	    <table>
 	      <tr>
-	        <th align=right nowrap>|.$locale->text('Salesperson').qq|</th>
+	        <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
 		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
 		<input type=hidden name=selectemployee value="$form->{selectemployee}">
                 <td></td>
+	      </tr>|;
+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>
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Invoice Number').qq|</th>
+		<th align=right>| . $locale->text('Credit Note Date') . qq|</th>
+                $button1
+	      </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>
 	      </tr>
 	      <tr>
-		<th align=right>|.$locale->text('Invoice Date').qq|</th>
+		<th align=right>| . $locale->text('Invoice Date') . qq|</th>
                 $button1
 	      </tr>
 	      <tr>
-		<th align=right>|.$locale->text('Due Date').qq|</th>
+		<th align=right>| . $locale->text('Due Date') . qq|</th>
                 $button2
 	      </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Order Number').qq|</th>
+		<th align=right>| . $locale->text('Delivery Date') . qq|</th>
+                $button3
+	      </tr>|;
+}
+print qq|     <tr>
+		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
 		<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
 	      </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
+          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|"></td>
+          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+        </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Quotation Number').qq|</th>
+		<th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
 		<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
 	      </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
+          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
+          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+        </tr>
 	      <tr>
-		<th align=right nowrap>|.$locale->text('Customer Order Number').qq|</th>
+		<th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
 		<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
 	      </tr>
+	      <tr>
+          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+          <td>$globalprojectnumber</td>
+	      </tr>
 	    </table>
           </td>
 	</tr>
@@ -441,7 +783,7 @@ sub form_header {
   </tr>
 
 $jsscript
-  
+
 <!-- shipto are in hidden variables -->
 
 <input type=hidden name=shiptoname value="$form->{shiptoname}">
@@ -474,8 +816,6 @@ $jsscript
   $lxdebug->leave_sub();
 }
 
-
-
 sub form_footer {
   $lxdebug->enter_sub();
 
@@ -488,57 +828,76 @@ sub form_footer {
     $introws = 2;
   }
   $rows = ($rows > $introws) ? $rows : $introws;
-  $notes = qq|<textarea name=notes rows=$rows cols=26 wrap=soft>$form->{notes}</textarea>|;
-  $intnotes = qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|;
+  $notes =
+    qq|<textarea name=notes rows=$rows cols=26 wrap=soft>$form->{notes}</textarea>|;
+  $intnotes =
+    qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|;
 
   $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
 
   $taxincluded = "";
   if ($form->{taxaccounts}) {
     $taxincluded = qq|
-	        <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|.$locale->text('Tax Included').qq|</b><br><br>|;
+	        <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
+      . $locale->text('Tax Included') . qq|</b><br><br>|;
   }
 
   if (!$form->{taxincluded}) {
 
     foreach $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
-	$form->{"${item}_total"} = $form->round_amount($form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
-	$form->{invtotal} += $form->{"${item}_total"};
-	$form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
-	$tax .= qq|
+        $form->{"${item}_total"} =
+          $form->round_amount(
+                             $form->{"${item}_base"} * $form->{"${item}_rate"},
+                             2);
+        $form->{invtotal} += $form->{"${item}_total"};
+        $form->{"${item}_total"} =
+          $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
+
+        $tax .= qq|
 	      <tr>
-		<th align=right>$form->{"${item}_description"}</th>
+                <th align=right>$form->{"${item}_description"}&nbsp;|
+                                    . $form->{"${item}_rate"} * 100 .qq|%</th>
 		<td align=right>$form->{"${item}_total"}</td>
 	      </tr>
 |;
       }
     }
 
-    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
+    $form->{invsubtotal} =
+      $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
 
     $subtotal = qq|
 	      <tr>
-		<th align=right>|.$locale->text('Subtotal').qq|</th>
+		<th align=right>| . $locale->text('Subtotal') . qq|</th>
 		<td align=right>$form->{invsubtotal}</td>
 	      </tr>
 |;
 
   }
-  
-  if ($form->{taxincluded}) {
-   	foreach $item (split / /, $form->{taxaccounts}) {
-     		 if ($form->{"${item}_base"}) {
-			$form->{"${item}_total"} = $form->round_amount(($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})) , 2);
-			$form->{"${item}_netto"} = $form->round_amount(($form->{"${item}_base"}-$form->{"${item}_total"}), 2);
-			$form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-			$form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
-
 
-	$tax .= qq|
+  if ($form->{taxincluded}) {
+    foreach $item (split / /, $form->{taxaccounts}) {
+      if ($form->{"${item}_base"}) {
+        $form->{"${item}_total"} =
+          $form->round_amount(
+                           ($form->{"${item}_base"} * $form->{"${item}_rate"} /
+                              (1 + $form->{"${item}_rate"})
+                           ),
+                           2);
+        $form->{"${item}_netto"} =
+          $form->round_amount(
+                          ($form->{"${item}_base"} - $form->{"${item}_total"}),
+                          2);
+        $form->{"${item}_total"} =
+          $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
+        $form->{"${item}_netto"} =
+          $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
+
+        $tax .= qq|
 	      <tr>
-		<th align=right>Enthaltene $form->{"${item}_description"}</th>
+		<th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
 		<td align=right>$form->{"${item}_total"}</td>
 	      </tr>
 	      <tr>
@@ -548,13 +907,12 @@ sub form_footer {
 |;
       }
     }
-	
-     
+
   }
-  
 
   $form->{oldinvtotal} = $form->{invtotal};
-  $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
+  $form->{invtotal}    =
+    $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
 
   print qq|
   <tr>
@@ -564,12 +922,15 @@ sub form_footer {
 	  <td>
 	    <table>
 	      <tr>
-		<th align=left>|.$locale->text('Notes').qq|</th>
-		<th align=left>|.$locale->text('Internal Notes').qq|</th>
+		<th align=left>| . $locale->text('Notes') . qq|</th>
+		<th align=left>| . $locale->text('Internal Notes') . qq|</th>
+                <th align=right>| . $locale->text('Payment Terms') . qq|</th>
 	      </tr>
 	      <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
+                </select></td>
 	      </tr>
 	    </table>
 	  </td>
@@ -579,7 +940,7 @@ sub form_footer {
 	      $subtotal
 	      $tax
 	      <tr>
-		<th align=right>|.$locale->text('Total').qq|</th>
+		<th align=right>| . $locale->text('Total') . qq|</th>
 		<td align=right>$form->{invtotal}</td>
 	      </tr>
 	    </table>
@@ -590,41 +951,53 @@ sub form_footer {
   </tr>
 |;
   if ($webdav) {
-  	$webdav_list = qq|
+    $webdav_list = qq|
   <tr>
     <td><hr size=3 noshade></td>
   </tr>
-  <tr>   
+  <tr>
     <th class=listtop align=left>Dokumente im Webdav-Repository</th>
   </tr>
     <table width=100%>
       <td align=left width=30%><b>Dateiname</b></td>
       <td align=left width=70%><b>Webdavlink</b></td>
 |;
-    foreach $file (keys %{ $form->{WEBDAV}}) {
-        $webdav_list .= qq|
-      <tr>	
+    foreach $file (keys %{ $form->{WEBDAV} }) {
+      $webdav_list .= qq|
+      <tr>
         <td align=left>$file</td>
         <td align=left><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
       </tr>
 |;
-	}
-	$webdav_list .= qq|
+    }
+    $webdav_list .= qq|
     </table>
   </tr>
 |;
 
-print $webdav_list;   
-}
-print qq|
+    print $webdav_list;
+  }
+if ($form->{type} eq "credit_note") {
+  print qq|
+  <tr>
+    <td>
+      <table width=100%>
+	<tr class=listheading>
+	  <th colspan=6 class=listheading>|
+    . $locale->text('Payments') . qq|</th>
+	</tr>
+|;
+} else {
+  print qq|
   <tr>
     <td>
       <table width=100%>
 	<tr class=listheading>
-	  <th colspan=6 class=listheading>|.$locale->text('Incoming Payments')
-	  .qq|</th>
+	  <th colspan=6 class=listheading>|
+    . $locale->text('Incoming Payments') . qq|</th>
 	</tr>
 |;
+}
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     @column_index = qw(datepaid source memo paid AR_paid);
@@ -632,12 +1005,12 @@ print qq|
     @column_index = qw(datepaid source memo paid exchangerate AR_paid);
   }
 
-  $column_data{datepaid} = "<th>".$locale->text('Date')."</th>";
-  $column_data{paid} = "<th>".$locale->text('Amount')."</th>";
-  $column_data{exchangerate} = "<th>".$locale->text('Exch')."</th>";
-  $column_data{AR_paid} = "<th>".$locale->text('Account')."</th>";
-  $column_data{source} = "<th>".$locale->text('Source')."</th>";
-  $column_data{memo} = "<th>".$locale->text('Memo')."</th>";
+  $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
+  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
+  $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
+  $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
+  $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
+  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
 
   print "
 	<tr>
@@ -647,6 +1020,8 @@ print qq|
         </tr>
 ";
 
+  my @triggers = ();
+
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 
@@ -654,44 +1029,58 @@ print qq|
         <tr>\n";
 
     $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
-    $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+    $form->{"selectAR_paid_$i"} =~
+      s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
 
     # format amounts
     $totalpaid += $form->{"paid_$i"};
-    $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+    if ($form->{"paid_$i"}) {
+      $form->{"paid_$i"} =
+        $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+    }
+    $form->{"exchangerate_$i"} =
+      $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
 
     $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"}|;
+        $exchangerate =
+          qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
       } else {
-	$exchangerate = qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
+        $exchangerate =
+          qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
       }
     }
-  
+
     $exchangerate .= qq|
 <input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
 |;
 
-    $column_data{"paid_$i"} = qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
+    $column_data{"paid_$i"} =
+      qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
     $column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
-    $column_data{"AR_paid_$i"} = qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
-    $column_data{"datepaid_$i"} = qq|<td align=center><input name="datepaid_$i"  size=11 title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}></td>|;
-     $column_data{"source_$i"} = qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
-    $column_data{"memo_$i"} = qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+    $column_data{"AR_paid_$i"}      =
+      qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+    $column_data{"datepaid_$i"} =
+      qq|<td align=center><input id="datepaid_$i" name="datepaid_$i"  size=11 title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}>
+         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
+    $column_data{"source_$i"} =
+      qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
+    $column_data{"memo_$i"} =
+      qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
 
     map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
     print "
         </tr>\n";
+    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
-  
+
   print qq|
 <input type=hidden name=paidaccounts value=$form->{paidaccounts}>
 <input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
 <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
 <input type=hidden name=oldtotalpaid value=$totalpaid>
-      </table>
+    </table>
     </td>
   </tr>
   <tr>
@@ -700,67 +1089,98 @@ print qq|
   <tr>
     <td>
 |;
-  
- 
-  &print_options;
 
+  &print_options;
 
- 
   print qq|
     </td>
   </tr>
 </table>
 |;
 
-
-  $invdate = $form->datetonum($form->{invdate}, \%myconfig);
+  $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
     print qq|
-    <input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
-    <input class=submit type=submit name=action value="|.$locale->text('Ship to').qq|">
-    <input class=submit type=submit name=action value="|.$locale->text('Print').qq|">
-    <input class=submit type=submit name=action value="|.$locale->text('E-mail').qq|">
+    <input class=submit type=submit accesskey="u" name=action id=update_button value="|
+      . $locale->text('Update') . qq|">
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Ship to') . qq|">
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Print') . qq|">
+    <input class=submit type=submit name=action value="|
+      . $locale->text('E-mail') . qq|"> |;
+    print qq|<input class=submit type=submit name=action value="|
+      . $locale->text('Storno') . qq|"> | unless ($form->{storno});
+    print qq|<input class=submit type=submit name=action value="|
+      . $locale->text('Post Payment') . qq|">
 |;
-
-    if (!$form->{revtrans}) {
-      if (!$form->{locked}) {
-	print qq|
-	<input class=submit type=submit name=action value="|.$locale->text('Post').qq|">
-	<input class=submit type=submit name=action value="|.$locale->text('Delete').qq|">
+    print qq|<input class=submit type=submit name=action value="|
+      . $locale->text('Use As Template') . qq|">
 |;
-      }
-    }
+  if ($form->{id} && !($form->{type} eq "credit_note")) {
+    print qq|
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Credit Note') . qq|">
+|;
+  }
+    if ($form->{radier}) {
+    print qq|
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Delete') . qq|">
+|;
+  }
+
 
     if ($invdate > $closedto) {
       print qq|
-      <input class=submit type=submit name=action value="|.$locale->text('Post as new').qq|">
-      <input class=submit type=submit name=action value="|.$locale->text('Order').qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('Order') . qq|">
 |;
     }
 
   } else {
     if ($invdate > $closedto) {
-      print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
-      <input class=submit type=submit name=action value="|.$locale->text('Ship to').qq|">
-      <input class=submit type=submit name=action value="|.$locale->text('Print').qq|">
-      <input class=submit type=submit name=action value="|.$locale->text('E-mail').qq|">
-      <input class=submit type=submit name=action value="|.$locale->text('Post').qq|">|;
+      print qq|<input class=submit type=submit name=action id=update_button value="|
+        . $locale->text('Update') . qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('Ship to') . qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('Preview') . qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('E-mail') . qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('Print and Post') . qq|">
+      <input class=submit type=submit name=action value="|
+        . $locale->text('Post') . qq|"> | .
+        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+                         '-class' => 'submit'));
     }
   }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+  # button for saving history
+  if($form->{id} ne "") {
+    print qq|
+  	  <input type="button" class="submit" onclick="set_history_window(|
+  	  . Q($form->{id})
+  	  . qq|);" name="history" id="history" value="|
+  	  . $locale->text('history')
+  	  . qq|">|;
   }
-    
-  print qq|
+  # /button for saving history
+
+
+  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+    qq|
 
 <input type=hidden name=rowcount value=$form->{rowcount}>
 
 <input name=callback type=hidden value="$form->{callback}">
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
@@ -775,31 +1195,51 @@ print qq|
   $lxdebug->leave_sub();
 }
 
-
 sub update {
   $lxdebug->enter_sub();
 
-  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);
+  $form->{update} = 1;
 
-  &check_project;
+  &check_name(customer);
 
-  $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy')));
+  $form->{exchangerate} = $exchangerate
+    if (
+        $form->{forex} = (
+                       $exchangerate =
+                         $form->check_exchangerate(
+                         \%myconfig, $form->{currency}, $form->{invdate}, 'buy'
+                         )));
 
   for $i (1 .. $form->{paidaccounts}) {
     if ($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')));
+      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'
+                   )));
     }
   }
 
-  $i = $form->{rowcount};
+  $i            = $form->{rowcount};
   $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
 
   # if last row empty, check the form otherwise retrieve new item
-  if (($form->{"partnumber_$i"} eq "") && ($form->{"description_$i"} eq "") && ($form->{"partsgroup_$i"} eq "")) {
+  if (   ($form->{"partnumber_$i"} eq "")
+      && ($form->{"description_$i"} eq "")
+      && ($form->{"partsgroup_$i"}  eq "")) {
 
     $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
     &check_form;
@@ -810,81 +1250,108 @@ sub update {
 
     $rows = scalar @{ $form->{item_list} };
 
-    $form->{"discount_$i"}	= $form->format_amount(\%myconfig, $form->{discount} * 100);
+    $form->{"discount_$i"} =
+      $form->format_amount(\%myconfig, $form->{discount} * 100);
 
     if ($rows) {
-      $form->{"qty_$i"}		= ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
+      $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
 
       if ($rows > 1) {
 
-	&select_item;
-	exit;
+        &select_item;
+        exit;
 
       } else {
 
-        $sellprice = $form->format_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->{"discount_$i"} = $form->{discount} * 100;
-
-	$s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
-	($dec) = ($s =~ /\.(\d+)/);
-	$dec = length $dec;
-	$decimalplaces = ($dec > 2) ? $dec : 2;
-
-	if ($sellprice) {
-	  $form->{"sellprice_$i"} = $sellprice;
-	} else {
-	  # if there is an exchange rate adjust sellprice
-	  $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
-	  $form->{"sellprice_$i"} /= $exchangerate;
-	}
-
-	$form->{"listprice_$i"} /= $exchangerate;
-
-        $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};
+        $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] };
+        if ($form->{"part_payment_id_$i"} ne "") {
+          $form->{payment_id} = $form->{"part_payment_id_$i"};
+        }
+
+        if ($form->{"not_discountable_$i"}) {
+          $form->{"discount_$i"} = 0;
+        }
+
+        $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
+        ($dec) = ($s =~ /\.(\d+)/);
+        $dec           = length $dec;
+        $decimalplaces = ($dec > 2) ? $dec : 2;
+
+        if ($sellprice) {
+          $form->{"sellprice_$i"} = $sellprice;
+        } else {
+
+          # if there is an exchange rate adjust sellprice
+          $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
+          $form->{"sellprice_$i"} /= $exchangerate;
+        }
+
+        $form->{"listprice_$i"} /= $exchangerate;
+
+        $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};
 
         $form->{creditremaining} -= $amount;
 
+        map {
+          $form->{"${_}_$i"} =
+            $form->format_amount(\%myconfig, $form->{"${_}_$i"},
+                                 $decimalplaces)
+        } qw(sellprice listprice);
+
+        $form->{"qty_$i"} =
+          $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+        if ($lizenzen) {
+          if ($form->{"inventory_accno_$i"} ne "") {
+            $form->{"lizenzen_$i"} = qq|<option></option>|;
+            foreach $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>|;
+          }
+        }
 
-	map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice);
-
-	$form->{"qty_$i"} =  $form->format_amount(\%myconfig, $form->{"qty_$i"});
-	
-	if ($lizenzen) {
-                if ($form->{"inventory_accno_$i"} ne "") {
-                  $form->{"lizenzen_$i"} = qq|<option></option>|;
-                  foreach $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>|;
-               }
-	}
-		
+        # get pricegroups for parts
+        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
+        # build up html code for prices_$i
+        &set_pricegroup($i);
       }
 
       &display_form;
 
     } else {
+
       # ok, so this is a new part
       # ask if it is a part or service item
 
-      if ($form->{"partsgroup_$i"} && ($form->{"partsnumber_$i"} eq "") && ($form->{"description_$i"} eq "")) {
-	$form->{rowcount}--;
-	$form->{"discount_$i"} = "";
-	&display_form;
-      } else {
+      if (   $form->{"partsgroup_$i"}
+          && ($form->{"partsnumber_$i"} eq "")
+          && ($form->{"description_$i"} eq "")) {
+        $form->{rowcount}--;
+        $form->{"discount_$i"} = "";
+        &display_form;
+          } else {
 
-	$form->{"id_$i"}          = 0;
-	$form->{"unit_$i"}        = $locale->text('ea');
+        $form->{"id_$i"}   = 0;
+        $form->{"unit_$i"} = $locale->text('ea');
 
-	&new_item;
+        &new_item;
 
       }
     }
@@ -892,12 +1359,40 @@ sub update {
   $lxdebug->leave_sub();
 }
 
+sub post_payment {
+  $lxdebug->enter_sub();
+  for $i (1 .. $form->{paidaccounts}) {
+    if ($form->{"paid_$i"}) {
+      $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->{currency} ne $form->{defaultcurrency}) {
+        $form->{"exchangerate_$i"} = $form->{exchangerate}
+          if ($invdate == $datepaid);
+        $form->isblank("exchangerate_$i",
+                       $locale->text('Exchangerate for payment missing!'));
+      }
+    }
+  }
+
+  ($form->{AR})      = split /--/, $form->{AR};
+  ($form->{AR_paid}) = split /--/, $form->{AR_paid};
+  relink_accounts();
+  $form->redirect($locale->text(' Payment posted!'))
+      if (IS->post_payment(\%myconfig, \%$form));
+    $form->error($locale->text('Cannot post payment!'));
+
+
+  $lxdebug->leave_sub();
+}
 
 sub post {
   $lxdebug->enter_sub();
-
-  $form->isblank("invdate", $locale->text('Invoice Date missing!'));
+  $form->isblank("invdate",  $locale->text('Invoice Date missing!'));
   $form->isblank("customer", $locale->text('Customer missing!'));
 
   # if oldcustomer ne customer redo form
@@ -905,53 +1400,151 @@ sub post {
     &update;
     exit;
   }
-  
+  if ($form->{second_run}) {
+    $form->{print_and_post} = 0;
+  }
+
   &validate_items;
 
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-  $invdate = $form->datetonum($form->{invdate}, \%myconfig);
-  
-  $form->error($locale->text('Cannot post invoice for a closed period!')) if ($invdate <= $closedto);
+  $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
+
+  $form->error($locale->text('Cannot post invoice for a closed period!'))
+    if ($invdate <= $closedto);
+
+  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
+    if ($form->{currency} ne $form->{defaultcurrency});
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency});
-  
   for $i (1 .. $form->{paidaccounts}) {
-    if ($form->{"paid_$i"}) {
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
       $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);
+
+      $form->error($locale->text('Cannot post payment for a closed period!'))
+        if ($datepaid <= $closedto);
 
       if ($form->{currency} ne $form->{defaultcurrency}) {
-	$form->{"exchangerate_$i"} = $form->{exchangerate} if ($invdate == $datepaid);
-	$form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
+        $form->{"exchangerate_$i"} = $form->{exchangerate}
+          if ($invdate == $datepaid);
+        $form->isblank("exchangerate_$i",
+                       $locale->text('Exchangerate for payment missing!'));
       }
     }
   }
 
-      
-  ($form->{AR}) = split /--/, $form->{AR};
+  ($form->{AR})      = split /--/, $form->{AR};
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
-  
+
   $form->{label} = $locale->text('Invoice');
 
   $form->{id} = 0 if $form->{postasnew};
-  
-  $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber") unless $form->{invnumber};
- 
-  $form->redirect($form->{label}." $form->{invnumber} ".$locale->text('posted!')) if (IS->post_invoice(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot post invoice!'));
+
+  # get new invnumber in sequence if no invnumber is given or if posasnew was requested
+  if (!$form->{invnumber} || $form->{postasnew}) {
+    if ($form->{type} eq "credit_note") {
+      $form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber");
+    } else {
+      $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+    }
+  }
+  relink_accounts();
+  if ($print_post) {
+    if (!(IS->post_invoice(\%myconfig, \%$form))) {
+      $form->error($locale->text('Cannot post invoice!'));
+    }
+    remove_draft() if $form->{remove_draft};
+    # saving the history
+  	if(!exists $form->{addition}) {
+  	  $form->{addition} = "PRINTED AND POSTED";
+  	  $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history
+    
+  } else {
+    if (IS->post_invoice(\%myconfig, \%$form)){
+      remove_draft() if $form->{remove_draft};
+    	# saving the history
+        if(!exists $form->{addition}) {
+  	  		if($form->{storno}) {
+  	  			$form->{addition} = "STORNO";
+  	  		}
+  	  		else {
+  	  			$form->{addition} = "POSTED";
+  	  		}
+  	  		$form->save_history($form->dbconnect(\%myconfig));
+    	}
+    	# /saving the history
     
+    	$form->redirect(
+            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
+  	}
+    $form->error($locale->text('Cannot post invoice!'));
+  }
+
   $lxdebug->leave_sub();
 }
 
+sub print_and_post {
+  $lxdebug->enter_sub();
 
+  $old_form               = new Form;
+  $print_post             = 1;
+  $form->{print_and_post} = 1;
+  &post();
 
+  &edit();
+  $lxdebug->leave_sub();
 
-sub delete {
+}
+
+sub use_as_template {
   $lxdebug->enter_sub();
 
+  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;
+  $form->{rowcount}--;
+  $form->{invdate} = $form->current_date(\%myconfig);
+  &display_form;
+
+  $lxdebug->leave_sub();
+}
+
+sub storno {
+  $lxdebug->enter_sub();
+
+  if ($form->{storno}) {
+    $form->error($locale->text('Cannot storno storno invoice!'));
+  }
+
+  $form->{storno_id} = $form->{id};
+  $form->{storno} = 1;
+  $form->{id} = "";
+  $form->{invnumber} = "Storno zu " . $form->{invnumber};
+
+  &post();
+  $lxdebug->leave_sub();
+
+}
+
+sub preview {
+  $lxdebug->enter_sub();
+
+  $form->{preview} = 1;
+  $old_form = new Form;
+  for (keys %$form) { $old_form->{$_} = $form->{$_} }
+  $old_form->{rowcount}++;
+
+  &print_form($old_form);
+  $lxdebug->leave_sub();
+
+}
+
+sub delete {
+  $lxdebug->enter_sub();
+  if ($form->{second_run}) {
+    $form->{print_and_post} = 0;
+  }
   $form->header;
 
   print qq|
@@ -969,28 +1562,88 @@ sub delete {
   }
 
   print qq|
-<h2 class=confirm>|.$locale->text('Confirm!').qq|</h2>
+<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Invoice Number').qq| $form->{invnumber}
+<h4>|
+    . $locale->text('Are you sure you want to delete Invoice Number')
+    . qq| $form->{invnumber}
 </h4>
 
 <p>
-<input name=action class=submit type=submit value="|.$locale->text('Yes').qq|">
+<input name=action class=submit type=submit value="|
+    . $locale->text('Yes') . qq|">
 </form>
 |;
 
-
   $lxdebug->leave_sub();
 }
 
+sub credit_note {
+  $lxdebug->enter_sub();
+
+  $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
+  $form->{duedate} =
+    $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+
+  $form->{id}     = '';
+  $form->{rowcount}--;
+  $form->{shipto} = 1;
+
+
+  $form->{title}  = $locale->text('Add Credit Note');
+  $form->{script} = 'is.pl';
+  $script         = "is";
+  $buysell        = 'buy';
+  
+
+  # bo creates the id, reset it
+  map { delete $form->{$_} }
+    qw(id invnumber subject message cc bcc printed emailed queued);
+  $form->{ $form->{vc} } =~ s/--.*//g;
+  $form->{type} = "credit_note";
+
+
+  map { $form->{"select$_"} = "" } ($form->{vc}, currency);
+
+  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+    qw(creditlimit creditremaining);
+
+  $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->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
+
+  &prepare_invoice;
 
 
+  &display_form;
+
+  $lxdebug->leave_sub();
+}
+
 sub yes {
   $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Invoice deleted!')) if (IS->delete_invoice(\%myconfig, \%$form, $spool));
+  if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
+    # saving the history
+  	if(!exists $form->{addition}) {
+  	  $form->{addition} = "DELETED";
+  	  $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+    $form->redirect($locale->text('Invoice deleted!')); 
+  }
   $form->error($locale->text('Cannot delete invoice!'));
 
   $lxdebug->leave_sub();
 }
-