X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b2f45e7ebfee8fd1cf79632baccad61d6814fd8c..e20f3f0dac8c4b362af0e6594de9581d05d0f6c4:/bin/mozilla/is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f39ff1368..d2f27c925 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -529,7 +529,7 @@ sub form_header {
   if ($form->{type} eq "credit_note") {
     $button1 = qq|
       <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>|;
 
     #write Trigger
@@ -540,17 +540,17 @@ sub form_header {
   } else {
     $button1 = qq|
       <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>
       |;
     $button2 = qq|
       <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="duedate" id="trigger2" value="|
+       <input type="button" name="duedate_button" id="trigger2" value="|
       . $locale->text('button') . qq|"></td>
     |;
     $button3 = qq|
       <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="deliverydate" id="trigger3" value="|
+       <input type="button" name="deliverydate_button" id="trigger3" value="|
       . $locale->text('button') . qq|"></td>
     |;
 
@@ -911,7 +911,7 @@ sub form_footer {
 	      <tr valign="top">
 		<td>$notes</td>
 		<td>$intnotes</td>
-                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
+                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
                 </select></td>
 	      </tr>
         $follow_ups_block
@@ -1113,7 +1113,7 @@ 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");
+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
 
     print qq|
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
@@ -1202,6 +1202,7 @@ if ($form->{type} eq "credit_note") {
 $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
 . qq|
 </form>
 
@@ -1267,7 +1268,7 @@ 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->{customer_discount} * 100);
 
     if ($rows) {
       $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;