Vorgangsbezeichnung erzwingen auch im Order-Controller

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 516ad4c363de095fd1c79f64fc9eebc63964e46b..460b59305d3aac99828f79c6e873d17829931dec 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1729,7 +1729,7 @@ sub pre_render {
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
   $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
   $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery

-                                                         edit_periodic_invoices_config calculate_qty);
+                                                         edit_periodic_invoices_config calculate_qty kivi.Validator);

   $self->setup_edit_action_bar;
 }
 
   $self->setup_edit_action_bar;
 }
 


@@ -1748,7 +1748,7 @@ sub setup_edit_action_bar {
           call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
                                                     $::instance_conf->get_order_warn_no_deliverydate,
                                                                                                       ],
           call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
                                                     $::instance_conf->get_order_warn_no_deliverydate,
                                                                                                       ],

-          checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
+          checks    => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'] ],

         ],
         action => [
           t8('Save as new'),
         ],
         action => [
           t8('Save as new'),

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index f3806ff63dbcf9288de1c2797664fc23f2a92dae..c356589cd26b7c219f06b94a3feedeee88f520e4 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -85,7 +85,7 @@
 
           <tr>
             <th align="right">[% 'Transaction description' | $T8 %]</th>
 
           <tr>
             <th align="right">[% 'Transaction description' | $T8 %]</th>

-            <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %]</td>
+            <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', style='width: 300px') %]</td>

           </tr>
 
           <tr>
           </tr>
 
           <tr>