X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=3fba37cc8ccbdb757f37399eeeeb17481c743080;hb=6ebad56e58db857141565f397c555524cba43109;hp=edbb35cc48ee10dada3917bf2042f6e19ef1f3bf;hpb=68d46d3841e7306f2aeb4e3e19d88b7e8f712053;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index edbb35cc4..3fba37cc8 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -115,7 +115,7 @@ sub adminlogin {
     qq|Lx-Office ERP $form->{version} | . $locale->text('Administration');
 
   $form->header();
-  print $form->parse_html_template('admin/adminlogin');
+  print $form->parse_html_template2('admin/adminlogin');
 }
 
 sub login {
@@ -155,7 +155,7 @@ sub list_users {
   $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
 
   $form->header();
-  print $form->parse_html_template("admin/list_users");
+  print $form->parse_html_template2("admin/list_users");
 }
 
 sub add_user {
@@ -168,7 +168,7 @@ sub add_user {
   my $myconfig = {
     "vclimit"      => 200,
     "countrycode"  => "de",
-    "numberformat" => "1000,00",
+    "numberformat" => "1.000,00",
     "dateformat"   => "dd.mm.yy",
     "stylesheet"   => "lx-office-erp.css",
     "menustyle"    => "v3",
@@ -313,7 +313,7 @@ sub edit_user_form {
   chop $form->{all_acs};
 
   $form->header();
-  print $form->parse_html_template("admin/edit_user");
+  print $form->parse_html_template2("admin/edit_user");
 }
 
 sub save {
@@ -520,7 +520,7 @@ sub change_admin_password {
     . $locale->text('Change Admin Password');
 
   $form->header();
-  print $form->parse_html_template("admin/change_admin_password");
+  print $form->parse_html_template2("admin/change_admin_password");
 }
 
 sub change_password {
@@ -572,13 +572,17 @@ sub dbselect_source {
   $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED";
 
   $form->header();
-  print $form->parse_html_template("admin/dbadmin");
+  print $form->parse_html_template2("admin/dbadmin");
 }
 
 sub continue {
   call_sub($form->{"nextsub"});
 }
 
+sub back {
+  call_sub($form->{"back_nextsub"});
+}
+
 sub update_dataset {
   $form->{title} =
       "Lx-Office ERP "
@@ -590,7 +594,7 @@ sub update_dataset {
   $form->{ALL_UPDATED}  = !scalar @need_updates;
 
   $form->header();
-  print $form->parse_html_template("admin/update_dataset");
+  print $form->parse_html_template2("admin/update_dataset");
 }
 
 sub dbupdate {
@@ -605,7 +609,7 @@ sub dbupdate {
 
   $| = 1;
 
-  print $form->parse_html_template("admin/dbupgrade_all_header");
+  print $form->parse_html_template2("admin/dbupgrade_all_header");
 
   foreach my $i (@update_rows) {
     restore_form($saved_form);
@@ -614,7 +618,7 @@ sub dbupdate {
 
     my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
 
-    print $form->parse_html_template("admin/dbupgrade_header");
+    print $form->parse_html_template2("admin/dbupgrade_header");
 
     $form->{dbupdate}        = $form->{dbname};
     $form->{$form->{dbname}} = 1;
@@ -622,10 +626,10 @@ sub dbupdate {
     User->dbupdate($form);
     User->dbupdate2($form, $controls);
 
-    print $form->parse_html_template("admin/dbupgrade_footer");
+    print $form->parse_html_template2("admin/dbupgrade_footer");
   }
 
-  print $form->parse_html_template("admin/dbupgrade_all_done");
+  print $form->parse_html_template2("admin/dbupgrade_all_done");
 }
 
 sub create_dataset {
@@ -659,7 +663,7 @@ sub create_dataset {
     . $locale->text('Create Dataset');
 
   $form->header();
-  print $form->parse_html_template("admin/create_dataset");
+  print $form->parse_html_template2("admin/create_dataset");
 }
 
 sub dbcreate {
@@ -673,7 +677,7 @@ sub dbcreate {
     . $locale->text('Create Dataset');
 
   $form->header();
-  print $form->parse_html_template("admin/dbcreate");
+  print $form->parse_html_template2("admin/dbcreate");
 }
 
 sub delete_dataset {
@@ -687,7 +691,7 @@ sub delete_dataset {
   $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
 
   $form->header();
-  print $form->parse_html_template("admin/delete_dataset");
+  print $form->parse_html_template2("admin/delete_dataset");
 }
 
 sub dbdelete {
@@ -703,7 +707,7 @@ sub dbdelete {
     . $locale->text('Database Administration') . " / "
     . $locale->text('Delete Dataset');
   $form->header();
-  print $form->parse_html_template("admin/dbdelete");
+  print $form->parse_html_template2("admin/dbdelete");
 }
 
 sub backup_dataset {
@@ -725,7 +729,7 @@ sub backup_dataset {
   $form->{from} = "Lx-Office Admin <${username}\@${hostname}>";
 
   $form->header();
-  print $form->parse_html_template("admin/backup_dataset");
+  print $form->parse_html_template2("admin/backup_dataset");
 }
 
 sub backup_dataset_start {
@@ -814,7 +818,7 @@ sub backup_dataset_start {
       . $locale->text('Backup Dataset');
 
     $form->header();
-    print $form->parse_html_template("admin/backup_dataset_email_done");
+    print $form->parse_html_template2("admin/backup_dataset_email_done");
   }
 }
 
@@ -840,7 +844,7 @@ sub restore_dataset {
   }
 
   $form->header();
-  print $form->parse_html_template("admin/restore_dataset");
+  print $form->parse_html_template2("admin/restore_dataset");
 }
 
 sub restore_dataset_start {
@@ -952,7 +956,7 @@ sub restore_dataset_start {
   $AUTOFLUSH = 1;
 
   $form->header();
-  print $form->parse_html_template("admin/restore_dataset_start_header");
+  print $form->parse_html_template2("admin/restore_dataset_start_header");
 
   while (my $line = <$in>) {
     print $line;
@@ -960,7 +964,7 @@ sub restore_dataset_start {
   $in->close();
 
   $form->{retval} = $CHILD_ERROR >> 8;
-  print $form->parse_html_template("admin/restore_dataset_start_footer");
+  print $form->parse_html_template2("admin/restore_dataset_start_footer");
 
   unlink "${tmpdir}/.pgpass", $tmp;
   rmdir $tmpdir;