projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94e596e)
Eingangsrechnungen: Wird das Rechnungsdatum verändert, so wird per AJAX das Fälligkei...
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 7 Jul 2008 15:48:09 +0000 (15:48 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 7 Jul 2008 15:48:09 +0000 (15:48 +0000)
SL/IR.pm patch | blob | history
bin/mozilla/ir.pl patch | blob | history
locale/de/ir patch | blob | history

diff --git a/SL/IR.pm b/SL/IR.pm
index f3c2674..f1c9197 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -1277,4 +1277,42 @@ sub post_payment {
   return $rc;
 }
 
+sub get_duedate {
+  $main::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  if (!$params{vendor_id} || !$params{invdate}) {
+    $main::lxdebug->leave_sub();
+    return $params{default};
+  }
+
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
+
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+  my $query    = qq|SELECT ?::date + pt.terms_netto
+                    FROM vendor v
+                    LEFT JOIN payment_terms pt ON (pt.id = v.payment_id)
+                    WHERE v.id = ?|;
+
+  my ($sth, $duedate);
+
+  if (($sth = $dbh->prepare($query)) && $sth->execute($params{invdate}, conv_i($params{vendor_id}))) {
+    ($duedate) = $sth->fetchrow_array();
+    $sth->finish();
+  } else {
+    $dbh->rollback();
+  }
+
+  $duedate ||= $params{default};
+
+  $main::lxdebug->leave_sub();
+
+  return $duedate;
+}
+
+
 1;
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index ce28fff..07efa66 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -226,6 +226,8 @@ sub form_header {
 
   $auth->assert('vendor_invoice_edit');
 
+  push @{ $form->{AJAX} }, CGI::Ajax->new('set_duedate_vendor' => "$form->{script}?action=set_duedate_vendor");
+
   # set option selected
   foreach $item (qw(AP vendor currency department)) {
     $form->{"select$item"} =~ s/ selected//;
@@ -389,11 +391,18 @@ sub form_header {
   $jsscript = "";
 
   $button1 = qq|
-     <td><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=| . $locale->text('button') . qq|></td>\n|;
+     <td nowrap>
+         <input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"
+                onChange="if (this.value) set_duedate_vendor(['invdate__' + this.value, 'old_duedate__' + document.getElementsByName('duedate')[0].value, 'vendor_id__' + document.getElementsByName('vendor_id')[0].value],['duedate'])">
+         <input type=button name=invdate id="trigger1" value="?">
+     </td>\n|;
+
+#, 'old_duedate__'' + document.getElementsByName('duedate')[0].value, 'vendor_id__' + document.getElementsByName('vendor_id')[0].value],['duedate'])">
   $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=| . $locale->text('button') . qq|></td>\n|;
+     <td width="13" nowrap>
+          <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=| . $locale->text('button') . qq|>
+     </td>\n|;
 
   #write Trigger
   $jsscript =
@@ -419,7 +428,7 @@ sub form_header {
   print qq|
 <body onLoad="$onload">
 <script type="text/javascript" src="js/common.js"></script>
-<form method=post action=$form->{script}>
+<form method="post" action="ir.pl" name="Form">
 |;
 
   $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id
@@ -1206,3 +1215,13 @@ sub yes {
 
   $lxdebug->leave_sub();
 }
+
+sub set_duedate_vendor {
+  $lxdebug->enter_sub();
+
+  print $cgi->header(), IR->get_duedate('vendor_id' => $form->{vendor_id},
+                                        'invdate'   => $form->{invdate},
+                                        'default'   => $form->{old_duedate});
+
+  $lxdebug->leave_sub();
+}
diff --git a/locale/de/ir b/locale/de/ir
index eaa4aa7..b0f4da2 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -377,6 +377,7 @@ $self->{subs} = {
   'select_project'              => 'select_project',
   'send_email'                  => 'send_email',
   'set_duedate'                 => 'set_duedate',
+  'set_duedate_vendor'          => 'set_duedate_vendor',
   'set_longdescription'         => 'set_longdescription',
   'set_pricegroup'              => 'set_pricegroup',
   'ship_to'                     => 'ship_to',
Unnamed repository; edit this file 'description' to name the repository.