X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=459e1b9446ef40f03b7c6807360c497df5b9540a;hb=1514a9d0b358fad627d81e8c88f71536c4e0aaba;hp=857e60409accc070033e4d355f27564cd453e1d7;hpb=9e117fbd2bb27c58831580608cd63f85c82487ac;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 857e60409..459e1b944 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -37,6 +37,7 @@ use Data::Dumper;
 
 require "$form->{path}/io.pl";
 require "$form->{path}/arap.pl";
+require "bin/mozilla/drafts.pl";
 
 1;
 
@@ -44,7 +45,9 @@ require "$form->{path}/arap.pl";
 
 sub add {
   $lxdebug->enter_sub();
-  
+
+  return $lxdebug->leave_sub() if (load_draft_maybe());
+
   if ($form->{type} eq "credit_note") {
     $form->{title} = $locale->text('Add Credit Note');
 
@@ -69,8 +72,6 @@ sub add {
   }
   &invoice_links;
   &prepare_invoice;
-  $form->{format} = "pdf";
-
   &display_form;
 
   $lxdebug->leave_sub();
@@ -79,7 +80,10 @@ sub add {
 sub edit {
   $lxdebug->enter_sub();
 
-
+  # 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");
@@ -117,6 +121,7 @@ sub invoice_links {
   if ($form->{all_customer}) {
     unless ($form->{customer_id}) {
       $form->{customer_id} = $form->{all_customer}->[0]->{id};
+      $form->{salesman_id} = $form->{all_customer}->[0]->{salesman_id};
     }
   }
 
@@ -167,13 +172,13 @@ sub invoice_links {
   chomp $curr[0];
   $form->{defaultcurrency} = $curr[0];
 
-  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
+  map { $form->{selectcurrency} .= "<option>$_</option>\n" } @curr;
 
   $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
 
   if (@{ $form->{all_customer} }) {
     $form->{customer} = "$form->{customer}--$form->{customer_id}";
-    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
+    map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}</option>\n" }
       (@{ $form->{all_customer} });
   }
 
@@ -184,7 +189,7 @@ sub invoice_links {
 
     map {
       $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
+        "<option>$_->{description}--$_->{id}</option>\n"
     } (@{ $form->{all_departments} });
   }
 
@@ -193,7 +198,7 @@ sub invoice_links {
   # sales staff
   if ($form->{all_employees}) {
     $form->{selectemployee} = "";
-    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
+    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}</option>\n" }
       (@{ $form->{all_employees} });
   }
 
@@ -203,7 +208,8 @@ sub invoice_links {
 
   foreach $key (keys %{ $form->{AR_links} }) {
     foreach $ref (@{ $form->{AR_links}{$key} }) {
-      $form->{"select$key"} .= "<option>$ref->{accno}--$ref->{description}\n";
+      $form->{"select$key"} .=
+"<option>$ref->{accno}--$ref->{description}</option>\n";
     }
 
     if ($key eq "AR_paid") {
@@ -246,11 +252,9 @@ sub prepare_invoice {
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";
-    $form->{media}    = "screen";
   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";
-    $form->{media}    = "screen";
   }
 
   if ($form->{id}) {
@@ -261,10 +265,11 @@ sub prepare_invoice {
     #     # get pricegroups for parts
     #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
+    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);
@@ -323,64 +328,102 @@ sub form_header {
     }
   }
 
+  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>$item->{description}</option>";
+          "<option value=$item->{id} selected>" . H($item->{description}) .
+          "</option>";
       } else {
         $form->{selecttaxzone} .=
-          "<option value=$item->{id}>$item->{description}</option>";
+          "<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/;
+      $form->{selecttaxzone} =~ s/value=\"$form->{taxzone_id}\"/value=\"$form->{taxzone_id}\" selected/;
     }
   }
-  if ($form->{rowcount} >0) {
-    $form->{selecttaxzone} =~ /<option value=\d+ selected>.*?<\/option>/;
-    $form->{selecttaxzone} = $&;
-  }
-  
 
   $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}">
+		<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>|;
 
-
-  if (@{ $form->{SHIPTO} }) {
-    $form->{selectshipto} = "<option value=0></option>";
-    foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{shipto_id} == $form->{shipto_id}) {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
-      } else {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
-      }
-
-    }
-  } else {
-    $form->{selectshipto} =~ s/ selected//g;
-    if ($form->{shipto_id} ne "") {
-      $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
-    }
+  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 },
+                   "employees" => "ALL_SALESMEN");
+
+  my %labels;
+  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})" : "");
+  }
+  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"};
   }
 
-  $shipto = qq|
+  my $shipto = qq|
 		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>
-		<input type=hidden name=selectshipto value="$form->{selectshipto}">|;
-
+		<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"}));
+
+  %labels = ();
+  @values = ("");
+  foreach my $item (@{ $form->{ALL_SALESMEN} }) {
+    push(@values, $item->{id});
+    $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
+  }
 
+  $salesman =
+    qq|<tr>
+          <th align="right">| . $locale->text('Salesman') . qq|</th>
+          <td>| .
+     NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+                               '-values' => \@values, '-labels' => \%labels))
+     . qq|</td>
+         </tr>|;
 
   # set option selected
   foreach $item (qw(AR customer currency department employee)) {
@@ -391,36 +434,16 @@ sub form_header {
 
   #quote customer Bug 133
   $form->{selectcustomer} = $form->quote($form->{selectcustomer});
-  
-  #build contacts
-  if ($form->{all_contacts}) {
-
-    $form->{selectcontact} = "<option></option>";
-    foreach $item (@{ $form->{all_contacts} }) {
-      my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : "";
-      if ($form->{cp_id} == $item->{cp_id}) {
-        $form->{selectcontact} .=
-          "<option value=$item->{cp_id} selected>$item->{cp_name}$department</option>";
-      } else {
-        $form->{selectcontact} .= "<option value=$item->{cp_id}>$item->{cp_name}$department</option>";
-      }
-    }
-  } else {
-    $form->{selectcontact} =~ s/ selected//g;
-    if ($form->{cp_id} ne "") {
-      $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/;
-    }
-  }
-
 
+  #substitute \n and \r to \s (bug 543)
+  $form->{selectcustomer} =~ s/[\n\r]/&nbsp;/g;
+  
   if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
     $creditwarning = 1;
   } else {
     $creditwarning = 0;
   }
 
-  #else {$form->{all_contacts} = 0;}
-
   $form->{exchangerate} =
     $form->format_amount(\%myconfig, $form->{exchangerate});
 
@@ -433,36 +456,33 @@ sub form_header {
   if ($form->{currency} ne $form->{defaultcurrency}) {
     if ($form->{forex}) {
       $exchangerate .=
-          qq|<th align=right>|
+          qq|<th align="right">|
         . $locale->text('Exchangerate')
-        . qq|</th><td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>|;
+        . qq|</th><td>$form->{exchangerate}<input type="hidden" name="exchangerate" value="$form->{exchangerate}"></td>|;
     } else {
       $exchangerate .=
-          qq|<th align=right>|
+          qq|<th align="right">|
         . $locale->text('Exchangerate')
-        . qq|</th><td><input name=exchangerate size=10 value=$form->{exchangerate}></td>|;
+        . qq|</th><td><input name="exchangerate" size="10" value="$form->{exchangerate}"></td>|;
     }
   }
   $exchangerate .= qq|
-<input type=hidden name=forex value=$form->{forex}>
+<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=cp_id>$form->{selectcontact}</select>\n<input type=hidden name="selectcontact" value="$form->{selectcontact}">|
-    : qq|<input name=contact value="$form->{contact}" size=35>|;
+    ? qq|<select name="customer"
+onchange="document.getElementById('update_button').click();">| .
+    qq|$form->{selectcustomer}</select>\n<input type="hidden" name="selectcustomer" value="| .
+    Q($form->{selectcustomer}) . qq|">|
+    : qq|<input name="customer" value="$form->{customer}" size="35">|;
 
   $department = qq|
               <tr>
 	        <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 colspan="3"><select name="department">$form->{selectdepartment}</select>
+		<input type="hidden" name="selectdepartment" value="$form->{selectdepartment}">
 		</td>
 	      </tr>
 | if $form->{selectdepartment};
@@ -472,9 +492,9 @@ sub form_header {
   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>
+		<th align="right">| . $locale->text('Trade Discount') . qq|</th>
 		<td>|
       . $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
       . qq| %</td>
@@ -485,12 +505,12 @@ sub form_header {
   if ($form->{max_dunning_level}) {
     $dunning = qq|
 	      <tr>
-                <td colspan=4>
+                <td colspan="4">
                 <table>
                   <tr>
-		<th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
+		<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>
+		<th align="right">| . $locale->text('Dunning Amount') . qq|:</th>
 		<td><b>|
       . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
       . qq|</b></td>
@@ -511,11 +531,10 @@ sub 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>
-        |;
-  
+        <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",
@@ -525,28 +544,28 @@ sub form_header {
   
       # without JavaScript Calendar
       $button1 =
-        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
+        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>|;
+        qq|<td width="13"><input name="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}"></td>|;
     }
   } else {
     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>
+        <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>
+        <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>
+        <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
@@ -561,7 +580,7 @@ sub form_header {
   
       # without JavaScript Calendar
       $button1 =
-        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
+        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>|;
     }
@@ -580,6 +599,15 @@ sub form_header {
     $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|
@@ -589,69 +617,45 @@ sub form_header {
 <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}>
-<input type=hidden name=format value=$form->{format}>
-
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
-
-<input type=hidden name=title value="$form->{title}">
-<input type=hidden name=vc value=$form->{vc}>
-
-<input type=hidden name=discount value=$form->{discount}>
-<input type=hidden name=creditlimit value=$form->{creditlimit}>
-<input type=hidden name=creditremaining value=$form->{creditremaining}>
+<form method="post" name="invoice" action="$form->{script}">
+| ;
+map({print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} 
+     qw(id action type media format queued printed emailed title vc discount 
+        creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id)) ;
+print ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") ;
+print qq|
 
-<input type=hidden name=tradediscount value=$form->{tradediscount}>
-<input type=hidden name=business value=$form->{business}>
+<input type="hidden" name="lizenzen" value="$lizenzen">
 
-<input type=hidden name=closedto value=$form->{closedto}>
-<input type=hidden name=locked value=$form->{locked}>
-
-<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}>
-
-
-
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
+<table width="100%">
+  <tr class="listtop">
+    <th class="listtop">$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
-      <table width=100%>
-	<tr valign=top>
+      <table width="100%">
+	<tr valign="top">
 	  <td>
 	    <table>
 	      <tr>
-		<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>|
+		<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="right" nowrap>|
     . $locale->text('Contact Person') . qq|</th>
-                <td colspan=3>$contact</td>
+                <td colspan="3">$contact</td>
 	      </tr>
 	      <tr>
 		<td></td>
-		<td colspan=3>
+		<td colspan="3">
 		  <table>
 		    <tr>
 		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
 		      <td>$form->{creditlimit}</td>
-		      <td width=20%></td>
+		      <td width="20%"></td>
 		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
 		      <td class="plus$n">$form->{creditremaining}</td>
 		    </tr>
@@ -662,28 +666,29 @@ sub form_header {
 	      $business
               $dunning
 	      <tr>
-		<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}">
+		<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>
-		<td><select name=currency>$form->{selectcurrency}</select></td>
-		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-		<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
-		<input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
+		<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}">
+		<input type="hidden" name="fxgain_accno" value="$form->{fxgain_accno}">
+		<input type="hidden" name="fxloss_accno" value="$form->{fxloss_accno}">
 		$exchangerate
 	      </tr>
 	      <tr>
-		<th align=right nowrap>| . $locale->text('Shipping Point') . qq|</th>
-		<td colspan=3><input name=shippingpoint size=35 value="$form->{shippingpoint}"></td>
-	      </tr>
+		<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
+		<td colspan="3"> | .
+		$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
+	  qq|</tr>
 	      <tr>
-		<th align=right nowrap>| . $locale->text('Ship via') . qq|</th>
-		<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
+		<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
+		<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
 	      </tr>|;
 #               <tr>
 #                 <td colspan=4>
@@ -707,52 +712,68 @@ sub form_header {
 #               </tr>
 print qq|	    </table>
 	  </td>
-	  <td align=right>
+	  <td align="right">
 	    <table>
 	      <tr>
-	        <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}">
+	        <th align="right" nowrap>| . $locale->text('Employee') . qq|</th>
+		<td colspan="2"><select name="employee">$form->{selectemployee}</select></td>
+		<input type="hidden" name="selectemployee" value="$form->{selectemployee}">
                 <td></td>
-	      </tr>|;
+	      </tr>
+        $salesman
+|;
 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>
+		<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>| . $locale->text('Credit Note Date') . 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>
+		<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>| . $locale->text('Delivery Date') . 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>
+		<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>
+		<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('Quotation Number') . qq|</th>
-		<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
+		<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('Customer Order Number') . qq|</th>
-		<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
+          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+          <td>$globalprojectnumber</td>
 	      </tr>
 	    </table>
           </td>
@@ -764,37 +785,21 @@ print qq|     <tr>
     <td>
     </td>
   </tr>
-
+| . 
 $jsscript
-
+. qq|
 <!-- shipto are in hidden variables -->
-
-<input type=hidden name=shiptoname value="$form->{shiptoname}">
-<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
-<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
-<input type=hidden name=shiptocity value="$form->{shiptocity}">
-<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
-<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
-<input type=hidden name=shiptophone value="$form->{shiptophone}">
-<input type=hidden name=shiptofax value="$form->{shiptofax}">
-<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
-
-<!-- email variables -->
-<input type=hidden name=message value="$form->{message}">
-<input type=hidden name=email value="$form->{email}">
-<input type=hidden name=subject value="$form->{subject}">
-<input type=hidden name=cc value="$form->{cc}">
-<input type=hidden name=bcc value="$form->{bcc}">
-<input type=hidden name=webdav value=$webdav>
-<input type=hidden name=taxaccounts value="$form->{taxaccounts}">
-|;
-
-  foreach $item (split / /, $form->{taxaccounts}) {
-    print qq|
-<input type=hidden name="${item}_rate" value="$form->{"${item}_rate"}">
-<input type=hidden name="${item}_description" value="$form->{"${item}_description"}">
-<input type=hidden name="${item}_taxnumber" value="$form->{"${item}_taxnumber"}">
-|;
+| ;
+map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
+       qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2));
+print qq|<!-- email variables --> |;
+map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
+    qw(message email subject cc bcc taxaccounts));
+print qq|<input type="hidden" name="webdav" value="| . $webdav . qq|">|;
+
+  foreach $item (split(/ /, $form->{taxaccounts})) {
+    map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
+    ("${item}_rate", "${item}_description", "${item}_taxnumber"));
   }
   $lxdebug->leave_sub();
 }
@@ -812,16 +817,16 @@ sub form_footer {
   }
   $rows = ($rows > $introws) ? $rows : $introws;
   $notes =
-    qq|<textarea name=notes rows=$rows cols=26 wrap=soft>$form->{notes}</textarea>|;
+    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>|;
+    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>|
+	        <input name="taxincluded" class="checkbox" type="checkbox" value=$form->{taxincluded}> <b>|
       . $locale->text('Tax Included') . qq|</b><br><br>|;
   }
 
@@ -839,8 +844,9 @@ sub form_footer {
 
         $tax .= qq|
 	      <tr>
-		<th align=right>$form->{"${item}_description"}</th>
-		<td align=right>$form->{"${item}_total"}</td>
+                <th align="right">$form->{"${item}_description"}&nbsp;|
+                                    . $form->{"${item}_rate"} * 100 .qq|%</th>
+		<td align="right">$form->{"${item}_total"}</td>
 	      </tr>
 |;
       }
@@ -851,8 +857,8 @@ sub form_footer {
 
     $subtotal = qq|
 	      <tr>
-		<th align=right>| . $locale->text('Subtotal') . qq|</th>
-		<td align=right>$form->{invsubtotal}</td>
+		<th align="right">| . $locale->text('Subtotal') . qq|</th>
+		<td align="right">$form->{invsubtotal}</td>
 	      </tr>
 |;
 
@@ -878,12 +884,13 @@ sub form_footer {
 
         $tax .= qq|
 	      <tr>
-		<th align=right>Enthaltene $form->{"${item}_description"}</th>
-		<td align=right>$form->{"${item}_total"}</td>
+		<th align="right">Enthaltene $form->{"${item}_description"}&nbsp;|
+		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
+		<td align="right">$form->{"${item}_total"}</td>
 	      </tr>
 	      <tr>
-	        <th align=right>Nettobetrag</th>
-		<td align=right>$form->{"${item}_netto"}</td>
+	        <th align="right">Nettobetrag</th>
+		<td align="right">$form->{"${item}_netto"}</td>
 	      </tr>
 |;
       }
@@ -898,31 +905,31 @@ sub form_footer {
   print qq|
   <tr>
     <td>
-      <table width=100%>
-	<tr valign=bottom>
+      <table width="100%">
+	<tr valign="bottom">
 	  <td>
 	    <table>
 	      <tr>
-		<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>
+		<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>
+	      <tr valign="top">
 		<td>$notes</td>
 		<td>$intnotes</td>
-                <td><select name=payment_id tabindex=24>$payment
+                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
                 </select></td>
 	      </tr>
 	    </table>
 	  </td>
-	  <td align=right width=100%>
+	  <td align="right" width="100%">
 	    $taxincluded
-	    <table width=100%>
+	    <table width="100%">
 	      $subtotal
 	      $tax
 	      <tr>
-		<th align=right>| . $locale->text('Total') . qq|</th>
-		<td align=right>$form->{invtotal}</td>
+		<th align="right">| . $locale->text('Total') . qq|</th>
+		<td align="right">$form->{invtotal}</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -934,20 +941,20 @@ sub form_footer {
   if ($webdav) {
     $webdav_list = qq|
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
   <tr>
-    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
+    <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>
+    <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>
-        <td align=left>$file</td>
-        <td align=left><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
+        <td align="left">$file</td>
+        <td align="left"><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
       </tr>
 |;
     }
@@ -962,9 +969,9 @@ if ($form->{type} eq "credit_note") {
   print qq|
   <tr>
     <td>
-      <table width=100%>
-	<tr class=listheading>
-	  <th colspan=6 class=listheading>|
+      <table width="100%">
+	<tr class="listheading">
+	  <th colspan="6" class="listheading">|
     . $locale->text('Payments') . qq|</th>
 	</tr>
 |;
@@ -972,9 +979,9 @@ if ($form->{type} eq "credit_note") {
   print qq|
   <tr>
     <td>
-      <table width=100%>
-	<tr class=listheading>
-	  <th colspan=6 class=listheading>|
+      <table width="100%">
+	<tr class="listheading">
+	  <th colspan="6" class="listheading">|
     . $locale->text('Incoming Payments') . qq|</th>
 	</tr>
 |;
@@ -1001,6 +1008,8 @@ if ($form->{type} eq "credit_note") {
         </tr>
 ";
 
+  my @triggers = ();
+
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 
@@ -1013,59 +1022,56 @@ if ($form->{type} eq "credit_note") {
 
     # format amounts
     $totalpaid += $form->{"paid_$i"};
-    $form->{"paid_$i"} =
-      $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+    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"}>
-|;
+    $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{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
+      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>|;
+      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>|;
+      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>|;
+      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>|;
+      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>
+  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); 
+  print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
     </table>
     </td>
   </tr>
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
   <tr>
     <td>
 |;
 
-  &print_options;
+  print_options();
 
   print qq|
     </td>
@@ -1077,29 +1083,34 @@ if ($form->{type} eq "credit_note") {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+
     print qq|
-    <input class=submit type=submit name=action value="|
+    <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="|
+    <input class="submit" type="submit" name="action" value="|
       . $locale->text('Ship to') . qq|">
-    <input class=submit type=submit name=action value="|
+    <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="|
+    <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|"> | if ($show_storno);
+    print qq|<input class="submit" type="submit" name="action" value="|
       . $locale->text('Post Payment') . 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="|
+    <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="|
+    <input class="submit" type="submit" name="action" value="|
       . $locale->text('Delete') . qq|">
 |;
   }
@@ -1107,43 +1118,52 @@ if ($form->{type} eq "credit_note") {
 
     if ($invdate > $closedto) {
       print qq|
-      <input class=submit type=submit name=action value="|
+      <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="|
+      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="|
+      <input class="submit" type="submit" name="action" value="|
         . $locale->text('Ship to') . qq|">
-      <input class=submit type=submit name=action value="|
+      <input class="submit" type="submit" name="action" value="|
         . $locale->text('Preview') . qq|">
-      <input class=submit type=submit name=action value="|
+      <input class="submit" type="submit" name="action" value="|
         . $locale->text('E-mail') . qq|">
-      <input class=submit type=submit name=action value="|
+      <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|">|;
+      <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|">|;
   }
+  # /button for saving history
 
-  print qq|
-
-<input type=hidden name=rowcount value=$form->{rowcount}>
 
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+    qq|
 
+<input type="hidden" name="rowcount" value="$form->{rowcount}">
+| .
+$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}]);
+map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(path login password));
+print qq|
 </form>
 
 </body>
@@ -1167,8 +1187,6 @@ sub update {
 
   &check_name(customer);
 
-  &check_project;
-
   $form->{exchangerate} = $exchangerate
     if (
         $form->{forex} = (
@@ -1207,8 +1225,6 @@ sub update {
 
   } else {
 
-    $form->{"selected_unit_$i"} = $form->{"unit_$i"};
-
     IS->retrieve_item(\%myconfig, \%$form);
 
     $rows = scalar @{ $form->{item_list} };
@@ -1321,6 +1337,7 @@ sub update {
   }
   $lxdebug->leave_sub();
 }
+
 sub post_payment {
   $lxdebug->enter_sub();
   for $i (1 .. $form->{paidaccounts}) {
@@ -1343,6 +1360,7 @@ sub post_payment {
 
   ($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!'));
@@ -1402,23 +1420,28 @@ sub post {
   $form->{id} = 0 if $form->{postasnew};
 
   # get new invnumber in sequence if no invnumber is given or if posasnew was requested
-  if (!$form->{invnumber} || $form->{postasnew}) {
+  if ($form->{postasnew}) {
     if ($form->{type} eq "credit_note") {
-      $form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber");
+      undef($form->{cnnumber});
     } else {
-      $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+      undef($form->{invnumber});
     }
   }
-  if ($print_post) {
-    if (!(IS->post_invoice(\%myconfig, \%$form))) {
-      $form->error($locale->text('Cannot post invoice!'));
-    }
-  } else {
-    $form->redirect(
-            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
-      if (IS->post_invoice(\%myconfig, \%$form));
-    $form->error($locale->text('Cannot post invoice!'));
+
+  relink_accounts();
+  $form->error($locale->text('Cannot post invoice!'))
+    unless IS->post_invoice(\%myconfig, \%$form);
+  remove_draft() if $form->{remove_draft};
+
+  if(!exists $form->{addition}) {
+    $form->{addition} = $print_post     ? "PRINTED AND POSTED" :
+                        $form->{storno} ? "STORNO"             :
+                                          "POSTED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
+  
+  $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
+    unless $print_post;
 
   $lxdebug->leave_sub();
 }
@@ -1436,6 +1459,18 @@ sub print_and_post {
 
 }
 
+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();
 
@@ -1443,11 +1478,22 @@ sub storno {
     $form->error($locale->text('Cannot storno storno invoice!'));
   }
 
+  if (IS->has_storno(\%myconfig, $form, "ar")) {
+    $form->error($locale->text("Invoice has already been storno'd!"));
+  }
+
+  map({ my $key = $_; delete($form->{$key})
+          unless (grep({ $key eq $_ } qw(path login password id type))); }
+      keys(%{ $form }));
+
+  &invoice_links;
+  &prepare_invoice;
+  relink_accounts();
+
   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";
   $form->{invnumber} = "Storno zu " . $form->{invnumber};
-  $form->{rowcount}--;
 
   &post();
   $lxdebug->leave_sub();
@@ -1477,7 +1523,7 @@ sub delete {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method="post" action="$form->{script}">
 |;
 
   # delete action variable
@@ -1485,11 +1531,11 @@ sub delete {
 
   foreach $key (keys %$form) {
     $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
   }
 
   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')
@@ -1497,7 +1543,7 @@ sub delete {
 </h4>
 
 <p>
-<input name=action class=submit type=submit value="|
+<input name="action" class="submit" type="submit" value="|
     . $locale->text('Yes') . qq|">
 </form>
 |;
@@ -1561,10 +1607,37 @@ sub credit_note {
 
 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();
 }
+
+sub e_mail {
+  $lxdebug->enter_sub();
+
+  if (!$form->{id}) {
+    $print_post = 1;
+
+    my $saved_form = save_form();
+
+    post();
+
+    my %saved_vars;
+    map({ $saved_vars{$_} = $form->{$_}; } qw(id invnumber));
+    restore_form($saved_form);
+    map({ $form->{$_} = $saved_vars{$_}; } qw(id invnumber));
+  }
+
+  edit_e_mail();
+
+  $lxdebug->leave_sub();
+}