Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index c25941cbca40a89d7958a16a0201460b69c9ef7d..95d2254417047d9a46424e9a585dbfc2ae0d839c 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -111,6 +111,8 @@ sub select_tag {
   my $title_sub       = delete($attributes{title_sub});
   my $default_sub     = delete($attributes{default_sub});
 
+  my $with_empty      = delete($attributes{with_empty});
+  my $empty_title     = delete($attributes{empty_title});
 
   my %selected;
 
@@ -128,8 +130,8 @@ sub select_tag {
 
   my @options;
 
-  if ( delete($attributes{with_empty}) ) {
-    push(@options, [undef, $attributes{empty_title} || '']);
+  if ( $with_empty ) {
+    push(@options, [undef, $empty_title || '']);
   }
 
   my $normalize_entry = sub {
@@ -180,7 +182,7 @@ sub select_tag {
     my $title;
 
     if ( $value_title_sub ) {
-      ($value, $title) = $value_title_sub->($entry);
+      ($value, $title) = @{ $value_title_sub->($entry) };
     } else {
 
       $value = $normalize_entry->('value', $entry, $value_sub, $value_key);

diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css
index ca7b2a23e4b890a6fff241e3a958d972457b467e..1b004b79713bb8de9719d49292b80ccc46cd70c9 100644 (file)
--- a/css/kivitendo/menu.css
+++ b/css/kivitendo/menu.css
@@ -181,7 +181,7 @@ li.sub {
 body { margin: 0 }
 
 @media print {
-  #menuv3, #html-menu, #frame-header, #js-menu {   /* items with this class won't print */
+  #menuv3, #html-menu, #frame-header, #main_menu_div, #js-header {   /* items with this class won't print */
     display: none;
   }
   #content.html-menu { margin-left: 0; }

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 318b380120e4d8d7b2e874a34a98d8e5661926b2..42eb844f7c1da3ab845745de884eb288c08d9084 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -190,7 +190,7 @@ body { margin: 0 }
 
 
 @media print {
-  #menuv3, #html-menu, #frame-header, #js-menu {   /* items with this class won't print */
+  #menuv3, #html-menu, #frame-header, #main_menu_div, #js-header {   /* items with this class won't print */
     display: none;
   }
   #content.html-menu { margin-left: 0; }

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 43f64b0e243a659db341e9892289e1a41bc2e236..2864f9e0932114d62064fb9cb1b3fde1701fe4c2 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -314,7 +314,7 @@
      <tr>
       <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td colspan="3">
-       [% L.select_tag('delivery_id', SHIPTO_ALL, title_sub = \shipto_label, with_empty = 1,
+       [% L.select_tag('delivery_id', SHIPTO_ALL, value_key = 'shipto_id', title_sub = \shipto_label, with_empty = 1,
                        onchange = "\$('#delivery').load('ct.pl?action=get_delivery&id=' + \$('#cvid').attr('value') + '&db=' + \$('#db').attr('value') + '&shipto_id=' + this.value)") %]
       </td>
      </tr>

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index ef415027f0f18480371b789f89f7669858212316..cd99f96196226938aab7dcfc380c89108c7dba16 100644 (file)
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -292,9 +292,7 @@
        <tr>
         <th align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
         <td nowrap>
-         <input name="reqdate" id="reqdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(reqdate) %]"
-                onBlur="check_right_date_format(this)"[% RO %]>
-         <input type="button" name="b_reqdate" id="reqdate_trigger" value="?">
+         [% L.date_tag('reqdate', reqdate, readonly => delivered) %]
         </td>
        </tr>
 

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index b54c9beb2942345a396c117397019cab2758f670..e92a83dfb58b0b4e755e5afe3b000ced8246589c 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -15,7 +15,7 @@ $(clockon);
 
  <script type="text/javascript" src="js/dhtmlsuite/menu-for-applications.js"></script>
 
- <table class="menunew">
+ <table id='js-header' class="menunew">
   <tr>
    <td>
     &nbsp;