X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=d50d6d0f7d4919777edc1295c3f70259dc47df3f;hb=15f549fdb43fba2d99817c659533dfa02638bf27;hp=53230d2b4a12faca54e55d17342b0831397fe252;hpb=07d71c33315605fcfc450d3b9abf0fd10e92bed5;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 53230d2b4..d50d6d0f7 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;
 
@@ -45,7 +46,19 @@ require "$form->{path}/arap.pl";
 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}"
@@ -57,7 +70,6 @@ sub add {
   {
     $form->error("Access Denied");
   }
-
   &invoice_links;
   &prepare_invoice;
   &display_form;
@@ -67,16 +79,29 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
-print STDERR "is.pl-edit\n";
-  $form->{title} = $locale->text('Edit Sales Invoice');
 
+  # 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();
@@ -84,7 +109,7 @@ print STDERR "is.pl-edit\n";
 
 sub invoice_links {
   $lxdebug->enter_sub();
-print STDERR "is.pl-invoice_links\n";
+
   $form->{vc} = 'customer';
 
   # create links
@@ -98,14 +123,51 @@ print STDERR "is.pl-invoice_links\n";
       $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,7 +175,7 @@ print STDERR "is.pl-invoice_links\n";
 
   $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} });
@@ -184,22 +246,28 @@ print STDERR "is.pl-invoice_links\n";
 
 sub prepare_invoice {
   $lxdebug->enter_sub();
-print STDERR "is.pl-prepare_invoice\n";
-  $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);
 
-#     # get pricegroups for parts
-#     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+    #     # 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);
@@ -210,7 +278,12 @@ print STDERR "is.pl-prepare_invoice\n";
       $form->{"sellprice_$i"} =
         $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
                              $decimalplaces);
-      $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+      (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);
@@ -223,29 +296,130 @@ print STDERR "is.pl-prepare_invoice\n";
 
 sub form_header {
   $lxdebug->enter_sub();
-print STDERR "is.pl-form_header\n";
-  # set option selected
-  foreach $item (qw(AR customer currency department employee contact)) {
-    $form->{"select$item"} =~ s/ selected//;
-    $form->{"select$item"} =~
-      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+
+  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');
+      }
+    }
   }
 
-  #build contacts
-  if ($form->{all_contacts}) {
+  $form->{radier} =
+    ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
 
-    $form->{selectcontact} = "";
-    foreach $item (@{ $form->{all_contacts} }) {
-      if ($form->{cp_id} == $item->{cp_id}) {
-        $form->{selectcontact} .=
-          "<option selected>$item->{cp_name}--$item->{cp_id}";
+  $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->{selectcontact} .= "<option>$item->{cp_name}--$item->{cp_id}";
+        $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)) {
+    $form->{"select$item"} =~ s/ selected//;
+    $form->{"select$item"} =~
+      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
-  #else {$form->{all_contacts} = 0;}
+  #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->{exchangerate} =
     $form->format_amount(\%myconfig, $form->{exchangerate});
@@ -278,12 +452,6 @@ print STDERR "is.pl-form_header\n";
     ? 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>|;
-
   $department = qq|
               <tr>
 	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
@@ -308,46 +476,121 @@ print STDERR "is.pl-form_header\n";
 |;
   }
 
+  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");
+  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>|;
+    }
   } 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->{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>
+      |;
+      $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}) {
-    $onload = "document.invoice.submit()";
+  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="$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}>
 
@@ -378,6 +621,10 @@ print STDERR "is.pl-form_header\n";
 
 <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>
@@ -413,13 +660,16 @@ print STDERR "is.pl-form_header\n";
 		    </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>
+		<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>
@@ -437,8 +687,28 @@ print STDERR "is.pl-form_header\n";
 	      <tr>
 		<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>
@@ -447,8 +717,18 @@ print STDERR "is.pl-form_header\n";
 		<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>| . $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>
@@ -461,17 +741,36 @@ print STDERR "is.pl-form_header\n";
                 $button2
 	      </tr>
 	      <tr>
+		<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>
 		<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>
 		<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>
@@ -519,7 +818,7 @@ $jsscript
 
 sub form_footer {
   $lxdebug->enter_sub();
-print STDERR "is.pl-form_footer\n";
+
   $form->{invtotal} = $form->{invsubtotal};
 
   if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
@@ -623,10 +922,13 @@ print STDERR "is.pl-form_footer\n";
 	      <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>
 	      </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>
@@ -673,6 +975,17 @@ print STDERR "is.pl-form_footer\n";
 
     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>
@@ -682,6 +995,7 @@ print STDERR "is.pl-form_footer\n";
     . $locale->text('Incoming Payments') . qq|</th>
 	</tr>
 |;
+}
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     @column_index = qw(datepaid source memo paid AR_paid);
@@ -704,6 +1018,8 @@ print STDERR "is.pl-form_footer\n";
         </tr>
 ";
 
+  my @triggers = ();
+
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   for $i (1 .. $form->{paidaccounts}) {
 
@@ -716,8 +1032,10 @@ print STDERR "is.pl-form_footer\n";
 
     # 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"});
 
@@ -742,7 +1060,8 @@ print STDERR "is.pl-form_footer\n";
     $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>|;
+      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"} =
@@ -751,6 +1070,7 @@ print STDERR "is.pl-form_footer\n";
     map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
     print "
         </tr>\n";
+    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
   }
 
   print qq|
@@ -758,8 +1078,6 @@ print STDERR "is.pl-form_footer\n";
 <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>
-<input type=hidden name=print_and_post value=$form->{print_and_post}>
-<input type=hidden name=second_run value=$form->{second_run}>
     </table>
     </td>
   </tr>
@@ -783,31 +1101,38 @@ print STDERR "is.pl-form_footer\n";
 
   if ($form->{id}) {
     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="|
       . $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|">
+      . $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|">
 |;
@@ -815,7 +1140,7 @@ print STDERR "is.pl-form_footer\n";
 
   } 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="|
         . $locale->text('Ship to') . qq|">
@@ -826,21 +1151,34 @@ print STDERR "is.pl-form_footer\n";
       <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|">|;
+        . $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|
+
+  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}>
@@ -863,9 +1201,10 @@ sub update {
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
   }
-  &check_name(customer);
 
-  &check_project;
+  $form->{update} = 1;
+
+  &check_name(customer);
 
   $form->{exchangerate} = $exchangerate
     if (
@@ -903,7 +1242,7 @@ sub update {
     $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
     &check_form;
 
-      } else {
+  } else {
 
     IS->retrieve_item(\%myconfig, \%$form);
 
@@ -922,14 +1261,19 @@ sub update {
 
       } else {
 
-        $sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
-#print STDERR " SELLPRICE-111- $sellprice\n";
+        $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"};
+        }
 
-        $form->{"discount_$i"} = $form->{discount} * 100;
+        if ($form->{"not_discountable_$i"}) {
+          $form->{"discount_$i"} = 0;
+        }
 
         $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
         ($dec) = ($s =~ /\.(\d+)/);
@@ -981,7 +1325,7 @@ sub update {
         }
 
         # get pricegroups for parts
-        IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new");
+        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
         # build up html code for prices_$i
         &set_pricegroup($i);
@@ -1013,6 +1357,37 @@ 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!'));
@@ -1039,7 +1414,7 @@ sub post {
     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!'));
@@ -1063,16 +1438,45 @@ sub post {
 
   $form->{id} = 0 if $form->{postasnew};
 
-  $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
-    unless $form->{invnumber};
+  # 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();
+    # saving the history
+  	if(!exists $form->{addition}) {
+  	  $form->{addition} = "PRINTED AND POSTED";
+  	  $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history
+    
   } else {
-    $form->redirect(
-            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
-      if (IS->post_invoice(\%myconfig, \%$form));
+    if (IS->post_invoice(\%myconfig, \%$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!'));
   }
 
@@ -1087,7 +1491,36 @@ sub print_and_post {
   $form->{print_and_post} = 1;
   &post();
 
-  &display_form();
+  &edit();
+  $lxdebug->leave_sub();
+
+}
+
+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();
 
 }
@@ -1143,11 +1576,71 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub yes {
+sub credit_note {
   $lxdebug->enter_sub();
 
-  $form->redirect($locale->text('Invoice deleted!'))
-    if (IS->delete_invoice(\%myconfig, \%$form, $spool));
+  $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();
+  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();