From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Thu, 8 Nov 2018 09:59:10 +0000 (+0100)
Subject: Auftrags-Controller: date_tags mit richtiger id ansprechen
X-Git-Tag: release-3.5.4~234
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=452e195fa7d3ecf6cb625938d8016dd04bcc33ce;p=kivitendo-erp.git

Auftrags-Controller: date_tags mit richtiger id ansprechen

Fehler kam rein mit:
commit 43e74053df32b26b2e2ec5059bebc60d47be753b
"Auftrags-Controller: date_tag mit _as_date füttern"
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 55f3f747f..b57d772c0 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -488,7 +488,7 @@ sub action_show_periodic_invoices_config_dialog {
   $config  ||= SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $::form->{id}) if $::form->{id};
   $config  ||= SL::DB::PeriodicInvoicesConfig->new(periodicity             => 'm',
                                                    order_value_periodicity => 'p', # = same as periodicity
-                                                   start_date_as_date      => $::form->{transdate} || $::form->current_date,
+                                                   start_date_as_date      => $::form->{transdate_as_date} || $::form->current_date,
                                                    extend_automatically_by => 12,
                                                    active                  => 1,
                                                    email_subject           => GenericTranslations->get(
diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index 3e065522d..e7815d497 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -37,7 +37,7 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.check_valid_reqdate = function() {
-    if ($('#order_reqdate').val() === '') {
+    if ($('#order_reqdate_as_date').val() === '') {
       alert(kivi.t8('Please select a delivery date.'));
       return false;
     } else {
@@ -631,12 +631,12 @@ namespace('kivi.Order', function(ns) {
 
     kivi.popup_dialog({
       url:    'controller.pl?action=Order/show_periodic_invoices_config_dialog',
-      data:   { type:        $('#type').val(),
-                id:          $('#id').val(),
-                config:      $('#order_periodic_invoices_config').val(),
-                customer_id: $('#order_customer_id').val(),
-                transdate:   $('#order_transdate').val(),
-                language_id: $('#language_id').val()
+      data:   { type:              $('#type').val(),
+                id:                $('#id').val(),
+                config:            $('#order_periodic_invoices_config').val(),
+                customer_id:       $('#order_customer_id').val(),
+                transdate_as_date: $('#order_transdate_as_date').val(),
+                language_id:       $('#language_id').val()
               },
       id:     'jq_periodic_invoices_config_dialog',
       load:   kivi.reinit_widgets,