Auftrags-Controller: Bemerkungen und interne Bemerkungen

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 9d9624d1e6df8a5d534c3e1f0e843132217cfc1f..7728f6766f5f5426c07fc4e73e5c1c8d5af8895c 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -363,6 +363,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 374b9d822d4b01dc117127e9a58857022e96e8ec..64d73eae24b2eb128ac0f55e9533752f928c5db0 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -163,6 +163,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>