Auftrags-Controller: Bemerkungen und interne Bemerkungen

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 8ecfaf6c90a5da5aa56e57b00e93ec968ffdc061..496031abfa9355cb861494ffcfb862d8b4d4df6e 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -146,6 +146,7 @@ sub action_customer_vendor_changed {
     ->val('#order_taxzone_id', $self->order->taxzone_id)
     ->val('#order_payment_id',       $self->order->payment_id)
     ->val('#order_delivery_term_id', $self->order->delivery_term_id)
     ->val('#order_taxzone_id', $self->order->taxzone_id)
     ->val('#order_payment_id',       $self->order->payment_id)
     ->val('#order_delivery_term_id', $self->order->delivery_term_id)

+    ->val('#order_intnotes',         $self->order->$cv_method->notes)

     ->focus('#order_' . $self->cv . '_id')
     ->render($self);
 }
     ->focus('#order_' . $self->cv . '_id')
     ->render($self);
 }


@@ -419,6 +420,8 @@ sub _pre_render {
   $self->{all_delivery_terms}  = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
   $self->{all_delivery_terms}  = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;

+
+  $::request->{layout}->use_javascript("${_}.js")  for qw(ckeditor/ckeditor ckeditor/adapters/jquery);

 }
 
 sub _sales_order_type {
 }
 
 sub _sales_order_type {

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index d109954169fe3d17919997f7015962d674419683..8d1a257017f1bf486bf8b3cf34ecd3090861ac66 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -168,6 +168,23 @@
       <td colspan="100%" width="100%">
         <table width="100%">
           <tr>
       <td colspan="100%" width="100%">
         <table width="100%">
           <tr>

+            <td>
+              <table>
+                <tr>
+                  <th align="left">[% 'Notes' | $T8 %]</th>
+                  <th align="left">[% 'Internal Notes' | $T8 %]</th>
+                </tr>
+                <tr valign="top">
+                  <td>
+                    [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
+                  </td>
+                  <td>
+                    [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
+                  </td>
+                </tr>
+              </table>
+            </td>
+

             <td>
               <table>
                 <tr>
             <td>
               <table>
                 <tr>