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

diff --git a/SL/Form.pm b/SL/Form.pm
index 3fe20ffb9aca986e54c75bc317a639e7ad4173e4..6c3b297dbbddf59070dbd899709ccf4d5f7b5981 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1964,7 +1964,7 @@ sub get_employee_data {
   my ($login)  = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, conv_i($params{id}));
 
   if ($login) {
-    my $user = User->new($login);
+    my $user = User->new(login => $login);
     map { $self->{$params{prefix} . "_${_}"} = $user->{$_}; } qw(address businessnumber co_ustid company duns email fax name signature taxnumber tel);
 
     $self->{$params{prefix} . '_login'}   = $login;

diff --git a/css/Mobile.css b/css/Mobile.css
index e59698cdebe5715cd1a97d232e0370c7dfb8653d..1ffaef55555643a8c82ea5e68ff5ae38ab7d78b1 100644 (file)
--- a/css/Mobile.css
+++ b/css/Mobile.css
@@ -24,26 +24,26 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 8pt;
   background-color: #D4D0C8;
   color: black
 }
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
 }
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
 }
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -68,7 +68,7 @@ body.admin {
 }
 body.menu {
   background-color: white;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:8pt;
   color: black;
 }
@@ -145,11 +145,11 @@ body.menu {
 .listtotal { border-top: 1px double black; font-size: 8pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .submit {
   font-size: 8pt;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 .plus0 {    /* font color for negative numbers */

diff --git a/css/Win2000.css b/css/Win2000.css
index 3b6f5685080cd3e69c31279abf1d6a5c029de6d5..ad33ecdd160430695e5d55ed97e5a6093fb24a51 100644 (file)
--- a/css/Win2000.css
+++ b/css/Win2000.css
@@ -23,26 +23,26 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
   background-color: #D4D0C8;
   color: black
 }
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 10pt;
   font-weight: normal;
 }
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 10pt;
   font-weight: normal;
 }
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -67,7 +67,7 @@ body.admin {
 }
 body.menu {
   background-color: white;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:10pt;
   color: black;
 }
@@ -142,11 +142,11 @@ body.menu {
 .listsubtotal { border-top: 1px solid black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .listtotal { border-top: 1px double black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .submit {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 .plus0 {    /* font color for negative numbers */

diff --git a/css/lx-office-erp.css b/css/lx-office-erp.css
index 8716110c85e7379c6cc6fbdc64abc29730a0433f..5d5ca460743712833844afca47a52db77e5be04e 100644 (file)
--- a/css/lx-office-erp.css
+++ b/css/lx-office-erp.css
@@ -15,7 +15,7 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
   background-color: white;
   background-image: url("../image/fade.png"); background-repeat:repeat-x;
@@ -27,7 +27,7 @@ body {
 } */
 
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
@@ -45,7 +45,7 @@ td.hover:hover {
 
 
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
@@ -53,7 +53,7 @@ th {
 
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -80,7 +80,7 @@ body.admin {
 
 body.menu {
   background-image: url("../image/fade.png");background-repeat:repeat-x;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:8pt;
   color: black;
 }
@@ -230,11 +230,11 @@ body.menu {
 
 
 .submit {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 

diff --git a/css/tabcontent.css b/css/tabcontent.css
index 211af44eb417512d4d7fcd2729efd083d9869321..54c3e5e1839034e34fd7a315844190d62809cdba 100644 (file)
--- a/css/tabcontent.css
+++ b/css/tabcontent.css
@@ -5,7 +5,7 @@ padding: 3px 0;
 margin-left: 0;\r
 margin-top: 1px;\r
 margin-bottom: 0;\r
-font: bold 12px sans-serif, Verdana;\r
+font: bold 12px Verdana, sans-serif;\r
 list-style-type: none;\r
 text-align: left; /*set to left, center, or right to align the menu as desired*/\r
 }\r

diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index f82cb595b98d0fc41a419a21817838778aa812a3..253706c93df1c89fddff72b134a100bbeab189b5 100755 (executable)
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -436,7 +436,7 @@ if ($opt_user) {
   }
 
   $locale = new Locale($myconfig{countrycode}, "all");
-  $user   = new User($opt_user);
+  $user   = new User(login => $opt_user);
 
   map { $form->{$_} = $myconfig{$_} } keys %myconfig;
 }

diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl
index 79aef1c76c3f1bdc45c8f90dd0bea24d878b7745..14e4ba0fcd5a97cf73f3d98581e95b3b8f038c91 100755 (executable)
--- a/scripts/rose_auto_create_model.pl
+++ b/scripts/rose_auto_create_model.pl
@@ -59,7 +59,7 @@ sub setup {
   $::locale       = Locale->new("de");
   $::form         = new Form;
   $::auth         = SL::Auth->new();
-  $::user         = User->new($login);
+  $::user         = User->new(login => $login);
   %::myconfig     = $auth->read_user(login => $login);
   $::request      = { cgi => CGI->new({}) };
   $form->{script} = 'rose_meta_data.pl';