X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fconfig.html;fp=templates%2Fwebpages%2Fam%2Fconfig.html;h=cd0e7eeecbcc85141394fcd21df53d0b905c4a90;hp=ac7875b11e627f8b9fd6552ef0c10b2b6782da76;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44

diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index ac7875b11..cd0e7eeec 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -1,11 +1,11 @@
 [%- USE T8 %]
 [%- USE LxERP %]
-[%- USE HTML %][%- USE L %]
-<h1>[% title %]</h1>
+[%- USE HTML %]
+[%- USE L %][%- USE P -%]
 
- <form method="post" action="am.pl" name="Form">
-  <input type="hidden" name="type" value="preferences">
+<h1>[% title %]</h1>
 
+ <form method="post" action="am.pl" name="Form" id="form">
   <div class="tabwidget">
    <ul>
     <li><a href="#page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
@@ -19,7 +19,7 @@
     <table>
      <tr>
       <th align="right">[% 'Name' | $T8 %]</th>
-      <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
+      <td><input name="name" size="15" value="[% HTML.escape(MYCONFIG.name) %]"></td>
      </tr>
 
      <tr>
@@ -34,31 +34,36 @@
      </tr>
 
      <tr>
-      <th align="right">[% 'E-mail' | $T8 %]</th>
-      <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
+      <th align="right">[% 'Email address' | $T8 %]</th>
+      <td><input name="email" size="30" value="[% HTML.escape(MYCONFIG.email) %]"></td>
+     </tr>
+
+     <tr valign="top">
+      <th align="right">[% 'Email signature' | $T8 %]</th>
+      <td>
+       [% P.textarea_tag("signature", MYCONFIG.signature, class="texteditor", rows="5", cols="50") %]
+      </td>
      </tr>
 
      <tr valign="top">
-      <th align="right">[% 'Signature' | $T8 %]</th>
-      <td><textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(myconfig_signature) %] </textarea>
-         <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span>
-         <a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a>
-         <a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a>
-          </td> </tr>
+      <th align="right">[% "Company's email signature" | $T8 %]</th>
+      <td>[% P.restricted_html(company_signature) %]</td>
+     </tr>
+
      <tr>
       <th align="right">[% 'Phone' | $T8 %]</th>
-      <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
+      <td><input name="tel" size="14" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
      </tr>
 
      <tr>
       <th align="right">[% 'Fax' | $T8 %]</th>
-      <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
+      <td><input name="fax" size="14" value="[% HTML.escape(MYCONFIG.fax) %]"></td>
      </tr>
 
       <tr>
         <th align="right">[% 'taxincluded checked' | $T8 %]</th>
         <td>
-          [% L.yes_no_tag('taxincluded_checked', myconfig_taxincluded_checked) %]
+          [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked) %]
         </td>
       </tr>
 
@@ -68,12 +73,14 @@
           [% L.select_tag(
             'focus_position',
             [
-              ['new_description', LxERP.t8('New row, description')],
-              ['new_partnumber', LxERP.t8('New row, partnumber')],
+              ['new_description',  LxERP.t8('New row, description')],
+              ['new_partnumber',   LxERP.t8('New row, partnumber')],
+              ['new_qty',          LxERP.t8('New row, qty')],
               ['last_description', LxERP.t8('Last row, description')],
-              ['last_partnumber', LxERP.t8('Last row, partnumber')],
+              ['last_partnumber',  LxERP.t8('Last row, partnumber')],
+              ['last_qty',         LxERP.t8('Last row, qty')],
             ],
-            default => myconfig_focus_position)
+            default => MYCONFIG.focus_position)
           %]
         </td>
       </tr>
@@ -81,10 +88,17 @@
       <tr>
         <th align="right">[% 'Item multi selection with qty' | $T8 %]</th>
         <td>
-          [% L.yes_no_tag('item_multiselect', myconfig_item_multiselect) %]
+          [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect) %]
         </td>
       </tr>
 
+     <tr>
+      <th align="right">[% 'Use date and duration for time recordings' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('time_recording_use_duration', time_recording_use_duration) %]
+      </td>
+     </tr>
+
     </table>
    </div>
 
@@ -110,11 +124,6 @@
       </td>
      </tr>
 
-     <tr>
-      <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
-      <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
-     </tr>
-
      <tr>
       <th align="right">[% 'Language' | $T8 %]</th>
       <td>
@@ -133,9 +142,9 @@
       <th align="right">[% 'Setup Menu' | $T8 %]</th>
       <td>
        <select name="menustyle">
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        <option value="old"[% IF MYCONFIG.menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+        <option value="v3"[% IF MYCONFIG.menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+        <option value="neu"[% IF MYCONFIG.menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -144,18 +153,53 @@
       <th align="right">[% 'Form details (second row)' | $T8 %]</th>
       <td>
        <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        <option value="1"[% IF  MYCONFIG.show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="0"[% IF !MYCONFIG.show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
+     <tr>
+      <th align="right">[% 'Longdescription dialog size percentage from main window (0 means fix values)' | $T8 %]</th>
+      <td>
+        [% L.input_tag('longdescription_dialog_size_percentage', longdescription_dialog_size_percentage, size = 5) %]
+      </td>
+     </tr>
+     [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
+     <tr>
+      <th align="right">[% 'Scrollbar height percentage for form postion area (0 means no scrollbar)' | $T8 %]</th>
+      <td>
+        [% L.input_tag('positions_scrollbar_height',  positions_scrollbar_height, size = 5) %]
+      </td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Search parts by vendor partnumber (model) in purchase order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('purchase_search_makemodel', purchase_search_makemodel) %]
+        [%- 'This also enables displaying a column with the vendor partnumber (model) (new order controller).' | $T8 %]
+      </td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Search parts by customer partnumber in sales order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('sales_search_customer_partnumber', sales_search_customer_partnumber) %]
+        [%- 'This also enables displaying a column with the customer partnumber (new order controller).' | $T8 %]
+      </td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Show update button for positions in order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('positions_show_update_button', positions_show_update_button) %]
+      </td>
+     </tr>
+     [%- END -%]
+
      <tr>
       <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
       <td>
        <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        <option value="0"[% IF !MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="1"[% IF  MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -163,17 +207,68 @@
      <tr>
       <th align="right">[% 'Number of columns of custom variables in form details (second row)' | $T8 %]</th>
       <td>
-        [% L.input_tag('form_cvars_nr_cols',  myconfig_form_cvars_nr_cols || 3,  size = 5) %]
+        [% L.input_tag('form_cvars_nr_cols',  MYCONFIG.form_cvars_nr_cols || 3,  size = 5) %]
       </td>
      </tr>
 
+     <tr>
+      <th align="right">[% 'Quick Searches that will be shown in the header for this user' | $T8 %]</th>
+      <td colspan=2>
+        <div class="clearfix">
+         [% L.select_tag("quick_search_modules[]",
+           enabled_quick_searchmodules,
+           value_key  = "name",
+           title_key  = "description_config",
+           id         = "quick_searches",
+           multiple   = 1,
+           with_empty = 1
+           size       = enabled_quick_searchmodules.size,
+           default    = default_quick_searchmodules) %]
+        </div>
+      </td>
+    </tr>
+
+     <tr>
+       <th align="right">[% 'Displayable Name Preferences' | $T8 %]</th>
+       <td>
+         <table>
+           [% FOREACH module=displayable_name_specs_by_module.keys.sort %]
+           [%- SET spec=displayable_name_specs_by_module.$module -%]
+           <tr>
+             <td align="right">[% spec.specs.title %]</td>
+             <td>
+               <table>
+                 <tr>
+                   <th align="left" class="listheading">[% 'Option' | $T8 %]</th>
+                   <th align="left" class="listheading">[% 'Name'   | $T8 %]</th>
+                 </tr>
+                 [% FOREACH option=spec.specs.options %]
+                 <tr>
+                   <td>[% option.title %]</td>
+                   <td>[% option.name  %]</td>
+                 </tr>
+                 [% END %]
+                 <tr>
+                   <th align="left">[% 'Display' | $T8 %]:</th>
+                   <td>
+                     [% L.hidden_tag("displayable_name_specs[+].module", module) %]
+                     [% L.input_tag("displayable_name_specs[].value", spec.prefs.get, size=50) %]
+                   </td>
+                 </tr>
+               </table>
+             </td>
+           </tr>
+           [% END %]
+         </table>
+       </td>
+
     </table>
    </div>
 
    <div id="page_print_options">
 
     <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
+     <input name="printer" type="hidden" value="[% HTML.escape(MYCONFIG.printer) %]">
 
      <tr>
       <th align="right">[% 'Default template format' | $T8 %]</th>
@@ -192,13 +287,13 @@
      <tr>
       <th align="right">[% 'Default printer' | $T8 %]</th>
       <td>
-       [% L.select_tag('default_printer_id', PRINTERS, default = myconfig_default_printer_id, title_key = 'printer_description', with_empty = 1) %]
+       [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1) %]
       </td>
      </tr>
 
      <tr>
       <th align="right">[% 'Number of copies' | $T8 %]</th>
-      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
+      <td><input name="copies" size="10" value="[% HTML.escape(MYCONFIG.copies) %]"></td>
      </tr>
     </table>
    </div>
@@ -232,7 +327,7 @@
       </td>
      </tr>
 
-     [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
+     [%- IF AUTH.assert('sales_quotation_edit', 'may_fail') %]
      <tr>
       <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
       <td>
@@ -248,20 +343,4 @@
     </table>
    </div>
   </div>
-
-  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
-
- <script type="text/javascript">
-  <!--
-$(function() {
-  $("#full_signature").toggle();
-  $("#edit_signature").toggle();
-  $('.togglelink').click(function() {
-    $('.toggletextarea').toggle();
-    $('.togglelink').toggle();
-    return false;
-  });
-});
-    -->
- </script>