Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/Common.pm b/SL/Common.pm
index 664bc6a08be95827a415e0b65783d89c8012880a..fae93413b9f9cbd424034a8b090d513901c04bf4 100644 (file)
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -388,7 +388,7 @@ sub webdav_folder {
 
         push @{ $form->{WEBDAV} }, {
           'name' => $fname,
-          'link' => "/$base_path/$file",
+          'link' => "$base_path/$file",
           'type' => $is_directory ? $main::locale->text('Directory') : $main::locale->text('File'),
         };
       }

diff --git a/SL/Form.pm b/SL/Form.pm
index a0c8ce1769fc64b8781fbc6e615375fc02f246a6..c578b2947a1d59f2fbd209ca0474db0e8cddb76f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -636,7 +636,7 @@ sub header {
 
       $jsscript = qq|
         <script type="text/javascript" src="js/jquery.js"></script>
-        <script type='text/javascript' src='js/jquery.autocomplete.js'>
+        <script type='text/javascript' src='js/jquery.autocomplete.js'></script>
         <script type="text/javascript" src="js/common.js"></script>
         <style type="text/css">\@import url(js/jscalendar/calendar-win2k-1.css);</style>
         <script type="text/javascript" src="js/jscalendar/calendar.js"></script>