From 3879426c4db6c8a2ff8afa9a98992eeaede38a49 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 5 May 2009 09:43:16 +0000
Subject: [PATCH] =?utf8?q?Die=20Berechnung=20des=20F=C3=A4lligkeitsdatums?=
 =?utf8?q?=20anhand=20des=20momentan=20eingetragenen=20Rechnungsdatums=20d?=
 =?utf8?q?urchf=C3=BChren,=20und=20nicht=20anhand=20des=20Serverdatums.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fix für Bug 927.
---
 SL/Form.pm        | 12 ++++++++----
 bin/mozilla/io.pl |  5 +++--
 bin/mozilla/is.pl | 10 +++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index 637bbe286..525d7329e 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1984,13 +1984,17 @@ sub get_employee_data {
 sub get_duedate {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig) = @_;
+  my ($self, $myconfig, $reference_date) = @_;
 
-  my $dbh = $self->get_standard_dbh($myconfig);
-  my $query = qq|SELECT current_date + terms_netto FROM payment_terms WHERE id = ?|;
-  ($self->{duedate}) = selectrow_query($self, $dbh, $query, $self->{payment_id});
+  my $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date';
+
+  my $dbh            = $self->get_standard_dbh($myconfig);
+  my $query          = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|;
+  my ($duedate)      = selectrow_query($self, $dbh, $query, $self->{payment_id});
 
   $main::lxdebug->leave_sub();
+
+  return $duedate;
 }
 
 sub _get_contacts {
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index c2f789a01..45b756a6e 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1870,9 +1870,10 @@ sub set_duedate {
 
   _check_io_auth();
 
-  $form->get_duedate(\%myconfig);
+  my $invdate = $form->{invdate} eq 'undefined' ? undef : $form->{invdate};
+  my $duedate = $form->get_duedate(\%myconfig, $invdate);
 
-  print $form->ajax_response_header() . $form->{duedate};
+  print $form->ajax_response_header() . $duedate;
 
   $lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f39ff1368..877b16683 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
-- 
2.20.1