X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=d175ead809bc1ae4b28e6dedc0361dfc2e1f7348;hb=ebef09a8bde1d401fc7b0d60cfe09393e9a84c0f;hp=27ab18b463d93e770bde053913a18a3ebf53aa57;hpb=ecbfb57d0271e5dedcdb7001c43d66fdde5564ec;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 27ab18b46..d175ead80 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -112,7 +112,7 @@ sub account_header {
 	      <tr>
 		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
 		<td><select name=tax>$form->{selecttaxkey}</select></td>
-		<th align=right>| . $locale->text('Gültig ab') . qq|</th>
+		<th align=right>| . $locale->text('Gültig ab') . qq|</th>
                 <td><input name=startdate value="$form->{startdate}"></td>
 	      </tr>|;
 
@@ -139,7 +139,7 @@ sub account_header {
                     <tr>
 		      <th align=right>| . $locale->text('Folgekonto') . qq|</th>
 		      <td><select name=new_chart_id>$form->{selectnewaccount}</select></td>
-                      <th align=right>| . $locale->text('Gültig ab') . qq|</th>
+                      <th align=right>| . $locale->text('Gültig ab') . qq|</th>
 		      <td><input name=valid_from value="$form->{valid_from}"></td>
                     </tr>
                   </table>
@@ -212,29 +212,29 @@ sub account_header {
 	      </tr>|;
 
   $form->{selecteur} = "<option>\n";
-  %eur = (1  => "Umsatzerlöse",
-          2  => "sonstige Erlöse",
+  %eur = (1  => "Umsatzerlöse",
+          2  => "sonstige Erlöse",
           3  => "Privatanteile",
-          4  => "Zinserträge",
-          5  => "Ausserordentliche Erträge",
+          4  => "Zinserträge",
+          5  => "Ausserordentliche Erträge",
           6  => "Vereinnahmte Umsatzst.",
           7  => "Umsatzsteuererstattungen",
-          8  => "Wareneingänge",
-          9  => "Löhne und Gehälter",
+          8  => "Wareneingänge",
+          9  => "Löhne und Gehälter",
           10 => "Gesetzl. sozialer Aufw.",
           11 => "Mieten",
           12 => "Gas, Strom, Wasser",
           13 => "Instandhaltung",
-          14 => "Steuern, Versich., Beiträge",
+          14 => "Steuern, Versich., Beiträge",
           15 => "Kfz-Steuern",
           16 => "Kfz-Versicherungen",
           17 => "Sonst. Fahrtkosten",
           18 => "Werbe- und Reisekosten",
           19 => "Instandhaltung u. Werkzeuge",
-          20 => "Fachzeitschriften, Bücher",
-          21 => "Miete für Einrichtungen",
+          20 => "Fachzeitschriften, Bücher",
+          21 => "Miete für Einrichtungen",
           22 => "Rechts- und Beratungskosten",
-          23 => "Bürobedarf, Porto, Telefon",
+          23 => "Bürobedarf, Porto, Telefon",
           24 => "Sonstige Aufwendungen",
           25 => "Abschreibungen auf Anlagever.",
           26 => "Abschreibungen auf GWG",
@@ -261,25 +261,25 @@ sub account_header {
 
   $form->{selectbwa} = "<option>\n";
 
-  %bwapos = (1  => 'Umsatzerlöse',
+  %bwapos = (1  => 'Umsatzerlöse',
              2  => 'Best.Verdg.FE/UE',
              3  => 'Aktiv.Eigenleistung',
              4  => 'Mat./Wareneinkauf',
-             5  => 'So.betr.Erlöse',
+             5  => 'So.betr.Erlöse',
              10 => 'Personalkosten',
              11 => 'Raumkosten',
              12 => 'Betriebl.Steuern',
-             13 => 'Vers./Beiträge',
+             13 => 'Vers./Beiträge',
              14 => 'Kfz.Kosten o.St.',
              15 => 'Werbe-Reisek.',
              16 => 'Kosten Warenabgabe',
              17 => 'Abschreibungen',
              18 => 'Rep./instandhlt.',
-             19 => 'Übrige Steuern',
+             19 => 'Übrige Steuern',
              20 => 'Sonst.Kosten',
              30 => 'Zinsauwand',
              31 => 'Sonst.neutr.Aufw.',
-             32 => 'Zinserträge',
+             32 => 'Zinserträge',
              33 => 'Sonst.neutr.Ertrag',
              34 => 'Verr.kalk.Kosten',
              35 => 'Steuern Eink.u.Ertr.');
@@ -635,231 +635,6 @@ sub delete_account {
   $lxdebug->leave_sub();
 }
 
-sub list_gifi {
-  $lxdebug->enter_sub();
-
-  @{ $form->{fields} } = (accno, description);
-  $form->{table}     = "gifi";
-  $form->{sortorder} = "accno";
-
-  AM->gifi_accounts(\%myconfig, \%$form);
-
-  $form->{title} = $locale->text('GIFI');
-
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  @column_index = qw(accno description);
-
-  $column_header{accno} = qq|<th>| . $locale->text('GIFI') . qq|</a></th>|;
-  $column_header{description} =
-    qq|<th>| . $locale->text('Description') . qq|</a></th>|;
-
-  $form->header;
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-</tr>
-|;
-
-  # escape callback
-  $callback = $form->escape($callback);
-
-  foreach $ca (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-<tr valign=top class=listrow$i>|;
-
-    $column_data{accno} =
-      qq|<td><a href=$form->{script}?action=edit_gifi&coa=1&accno=$ca->{accno}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{accno}</td>|;
-    $column_data{description} = qq|<td>$ca->{description}&nbsp;</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print "</tr>\n";
-  }
-
-  print qq|
-  <tr>
-    <td colspan=$colspan><hr size=3 noshade></td>
-  </tr>
-</table>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub add_gifi {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-
-  # construct callback
-  $form->{callback} =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $form->{coa} = 1;
-
-  &gifi_header;
-  &gifi_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_gifi {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_gifi(\%myconfig, \%$form);
-
-  &gifi_header;
-  &gifi_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub gifi_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} GIFI");
-
-  # $locale->text('Add GIFI')
-  # $locale->text('Edit GIFI')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{accno}>
-<input type=hidden name=type value=gifi>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('GIFI') . qq|</th>
-	  <td><input name=accno size=20 value=$form->{accno}></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=60 value="$form->{description}"></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub gifi_footer {
-  $lxdebug->enter_sub();
-
-  print qq|
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br><input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
-
-  if ($form->{coa}) {
-    print qq|
-<input type=submit class=submit name=action value="|
-      . $locale->text('Copy to COA') . qq|">
-|;
-
-    if ($form->{accno} && $form->{orphaned}) {
-      print qq|<input type=submit class=submit name=action value="|
-        . $locale->text('Delete') . qq|">|;
-    }
-  }
-
-  print qq|
-  </form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_gifi {
-  $lxdebug->enter_sub();
-
-  $form->isblank("accno", $locale->text('GIFI missing!'));
-  AM->save_gifi(\%myconfig, \%$form);
-  $form->redirect($locale->text('GIFI saved!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub copy_to_coa {
-  $lxdebug->enter_sub();
-
-  $form->isblank("accno", $locale->text('GIFI missing!'));
-
-  AM->save_gifi(\%myconfig, \%$form);
-
-  delete $form->{id};
-  $form->{gifi_accno} = $form->{accno};
-  $form->{title}      = "Add";
-  $form->{charttype}  = "A";
-
-  &account_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub delete_gifi {
-  $lxdebug->enter_sub();
-
-  AM->delete_gifi(\%myconfig, \%$form);
-  $form->redirect($locale->text('GIFI deleted!'));
-
-  $lxdebug->leave_sub();
-}
-
 sub add_department {
   $lxdebug->enter_sub();
 
@@ -1335,7 +1110,7 @@ sub list_business {
 |;
 
     $discount =
-      $form->format_amount(\%myconfig, $ref->{discount} * 100, 1, "&nbsp");
+      $form->format_amount(\%myconfig, $ref->{discount} * 100);
     $description =
       ($ref->{salesman})
       ? "<b>$ref->{description}</b>"
@@ -1441,6 +1216,7 @@ sub save_business {
   $lxdebug->enter_sub();
 
   $form->isblank("description", $locale->text('Description missing!'));
+  $form->{discount} = $form->parse_amount(\%myconfig, $form->{discount}) / 100;
   AM->save_business(\%myconfig, \%$form);
   $form->redirect($locale->text('Business saved!'));
 
@@ -1799,7 +1575,7 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_0} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Inland')
+    . $locale->text('Erlöse Inland')
     . qq|</th>|;
   $column_header{expense_accno_0} =
       qq|<th class=listheading>|
@@ -1807,7 +1583,7 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU m. UStId')
+    . $locale->text('Erlöse EU m. UStId')
     . qq|</th>|;
   $column_header{expense_accno_1} =
       qq|<th class=listheading>|
@@ -1815,7 +1591,7 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU o. UStId')
+    . $locale->text('Erlöse EU o. UStId')
     . qq|</th>|;
   $column_header{expense_accno_2} =
       qq|<th class=listheading>|
@@ -1823,7 +1599,7 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_3} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Ausland')
+    . $locale->text('Erlöse Ausland')
     . qq|</th>|;
   $column_header{expense_accno_3} =
       qq|<th class=listheading>|
@@ -1949,7 +1725,7 @@ sub buchungsgruppe_header {
 
   $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
 
-  # $locale->text('Buchungsgruppe hinzufügen')
+  # $locale->text('Buchungsgruppe hinzufügen')
   # $locale->text('Buchungsgruppe bearbeiten')
 
   my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
@@ -2000,7 +1776,7 @@ sub buchungsgruppe_header {
 
   $linkaccounts .= qq|
 	      <tr>
-		<th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
+		<th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
 		<td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
@@ -2014,7 +1790,7 @@ sub buchungsgruppe_header {
     $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/  value=$form->{expense_accno_id_1} selected/;
   }
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse EU m. UStId') . qq|</th>
+		<th align=right>| . $locale->text('Erlöse EU m. UStId') . qq|</th>
 		<td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
@@ -2030,7 +1806,7 @@ sub buchungsgruppe_header {
   }
 
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse EU o. UStId') . qq|</th>
+		<th align=right>| . $locale->text('Erlöse EU o. UStId') . qq|</th>
 		<td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
@@ -2046,7 +1822,7 @@ sub buchungsgruppe_header {
   }
 
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse Ausland') . qq|</th>
+		<th align=right>| . $locale->text('Erlöse Ausland') . qq|</th>
 		<td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
@@ -2099,7 +1875,7 @@ sub delete_buchungsgruppe {
   $lxdebug->enter_sub();
 
   AM->delete_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
+  $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
 
   $lxdebug->leave_sub();
 }
@@ -2316,7 +2092,6 @@ sub delete_printer {
   $lxdebug->leave_sub();
 }
 
-
 sub add_payment {
   $lxdebug->enter_sub();
 
@@ -2641,283 +2416,80 @@ sub swap_payment_terms {
   $lxdebug->leave_sub();
 }
 
-sub add_sic {
+sub display_stylesheet {
   $lxdebug->enter_sub();
 
-  $form->{title} = "Add";
-
-  $form->{callback} =
-    "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
-
-  &sic_header;
-  &form_footer;
+  $form->{file} = "css/$myconfig{stylesheet}";
+  &display_form;
 
   $lxdebug->leave_sub();
 }
 
-sub edit_sic {
+sub display_form {
   $lxdebug->enter_sub();
 
-  $form->{title} = "Edit";
-
-  AM->get_sic(\%myconfig, \%$form);
+  $form->{file} =~ s/^(.:)*?\/|\.\.\///g;
+  $form->{file} =~ s/^\/*//g;
+  $form->{file} =~ s/$userspath//;
 
-  &sic_header;
+  $form->error("$!: $form->{file}") unless -f $form->{file};
 
-  $form->{orphaned} = 1;
-  &form_footer;
+  AM->load_template(\%$form);
 
-  $lxdebug->leave_sub();
-}
+  $form->{title} = $form->{file};
 
-sub list_sic {
-  $lxdebug->enter_sub();
+  # if it is anything but html
+  if ($form->{file} !~ /\.html$/) {
+    $form->{body} = "<pre>\n$form->{body}\n</pre>";
+  }
 
-  AM->sic(\%myconfig, \%$form);
+  $form->header;
 
-  $form->{callback} =
-    "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  print qq|
+<body>
 
-  $callback = $form->escape($form->{callback});
+$form->{body}
 
-  $form->{title} = $locale->text('Standard Industrial Codes');
+<form method=post action=$form->{script}>
 
-  @column_index = qw(code description);
+<input name=file type=hidden value=$form->{file}>
+<input name=type type=hidden value=template>
 
-  $column_header{code} =
-    qq|<th class=listheading>| . $locale->text('Code') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
+<input type=hidden name=path value=$form->{path}>
+<input type=hidden name=login value=$form->{login}>
+<input type=hidden name=password value=$form->{password}>
 
-  $form->header;
+<input name=action type=submit class=submit value="|
+    . $locale->text('Edit') . qq|">
 
-  print qq|
-<body>
+  </form>
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
+</body>
+</html>
 |;
 
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-|;
+  $lxdebug->leave_sub();
+}
 
-  foreach $ref (@{ $form->{ALL} }) {
+sub edit_template {
+  $lxdebug->enter_sub();
 
-    $i++;
-    $i %= 2;
+  AM->load_template(\%$form);
 
-    if ($ref->{sictype} eq 'H') {
-      print qq|
-        <tr valign=top class=listheading>
-|;
-      $column_data{code} =
-        qq|<th><a href=$form->{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}</th>|;
-      $column_data{description} = qq|<th>$ref->{description}</th>|;
+  $form->{title} = $locale->text('Edit Template');
 
-    } else {
-      print qq|
-        <tr valign=top class=listrow$i>
-|;
+  # convert &nbsp to &amp;nbsp;
+  $form->{body} =~ s/&nbsp;/&amp;nbsp;/gi;
 
-      $column_data{code} =
-        qq|<td><a href=$form->{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}</td>|;
-      $column_data{description} = qq|<td>$ref->{description}</td>|;
+  $form->header;
 
-    }
+  print qq|
+<body>
 
-    map { print "$column_data{$_}\n" } @column_index;
+<form method=post action=$form->{script}>
 
-    print qq|
-	</tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=$form->{script}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=sic>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub sic_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} SIC");
-
-  # $locale->text('Add SIC')
-  # $locale->text('Edit SIC')
-
-  $form->{code}        =~ s/\"/&quot;/g;
-  $form->{description} =~ s/\"/&quot;/g;
-
-  $checked = ($form->{sictype} eq 'H') ? "checked" : "";
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=type value=sic>
-<input type=hidden name=id value=$form->{code}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Code') . qq|</th>
-    <td><input name=code size=10 value=$form->{code}></td>
-  <tr>
-  <tr>
-    <td></td>
-    <th align=left><input name=sictype type=checkbox style=checkbox value="H" $checked> |
-    . $locale->text('Heading') . qq|</th>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td><input name=description size=60 value="$form->{description}"></td>
-  </tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_sic {
-  $lxdebug->enter_sub();
-
-  $form->isblank("code",        $locale->text('Code missing!'));
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_sic(\%myconfig, \%$form);
-  $form->redirect($locale->text('SIC saved!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub delete_sic {
-  $lxdebug->enter_sub();
-
-  AM->delete_sic(\%myconfig, \%$form);
-  $form->redirect($locale->text('SIC deleted!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub display_stylesheet {
-  $lxdebug->enter_sub();
-
-  $form->{file} = "css/$myconfig{stylesheet}";
-  &display_form;
-
-  $lxdebug->leave_sub();
-}
-
-sub display_form {
-  $lxdebug->enter_sub();
-
-  $form->{file} =~ s/^(.:)*?\/|\.\.\///g;
-  $form->{file} =~ s/^\/*//g;
-  $form->{file} =~ s/$userspath//;
-
-  $form->error("$!: $form->{file}") unless -f $form->{file};
-
-  AM->load_template(\%$form);
-
-  $form->{title} = $form->{file};
-
-  # if it is anything but html
-  if ($form->{file} !~ /\.html$/) {
-    $form->{body} = "<pre>\n$form->{body}\n</pre>";
-  }
-
-  $form->header;
-
-  print qq|
-<body>
-
-$form->{body}
-
-<form method=post action=$form->{script}>
-
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input name=action type=submit class=submit value="|
-    . $locale->text('Edit') . qq|">
-
-  </form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_template {
-  $lxdebug->enter_sub();
-
-  AM->load_template(\%$form);
-
-  $form->{title} = $locale->text('Edit Template');
-
-  # convert &nbsp to &amp;nbsp;
-  $form->{body} =~ s/&nbsp;/&amp;nbsp;/gi;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
+<input name=file type=hidden value=$form->{file}>
+<input name=type type=hidden value=template>
 
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
@@ -3053,9 +2625,13 @@ sub config {
     }
   }
 
-  opendir CSS, "css/.";
-  @all = grep /.*\.css$/, readdir CSS;
-  closedir CSS;
+#  opendir CSS, "css/.";
+#  @all = grep /.*\.css$/, readdir CSS;
+#  closedir CSS;
+
+# css dir has styles that are not intended as general layouts.
+# reverting to hardcoded list
+  @all = qw(lx-office-erp.css Win2000.css);
 
   foreach $item (@all) {
     if ($item eq $myconfig{stylesheet}) {
@@ -3357,26 +2933,6 @@ sub save_preferences {
   $lxdebug->leave_sub();
 }
 
-sub backup {
-  $lxdebug->enter_sub();
-
-  if ($form->{media} eq 'email') {
-    $form->error($locale->text('No email address for') . " $myconfig{name}")
-      unless ($myconfig{email});
-
-    $form->{OUT} = "$sendmail";
-
-  }
-
-  AM->backup(\%myconfig, \%$form, $userspath);
-
-  if ($form->{media} eq 'email') {
-    $form->redirect($locale->text('Backup sent to') . qq| $myconfig{email}|);
-  }
-
-  $lxdebug->leave_sub();
-}
-
 sub audit_control {
   $lxdebug->enter_sub();
 
@@ -3463,191 +3019,6 @@ sub doclose {
   $lxdebug->leave_sub();
 }
 
-sub add_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-
-  $form->{callback} =
-    "$form->{script}?action=add_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
-
-  &warehouse_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_warehouse(\%myconfig, \%$form);
-
-  &warehouse_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_warehouse {
-  $lxdebug->enter_sub();
-
-  AM->warehouses(\%myconfig, \%$form);
-
-  $form->{callback} =
-    "$form->{script}?action=list_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Warehouses');
-
-  @column_index = qw(description);
-
-  $column_header{description} =
-      qq|<th class=listheading width=100%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  foreach $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_warehouse&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-	</tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=$form->{script}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=warehouse>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub warehouse_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} Warehouse");
-
-  # $locale->text('Add Warehouse')
-  # $locale->text('Edit Warehouse')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
-    $description =
-      qq|<textarea name="description" rows=$rows cols=60 wrap=soft>$form->{description}</textarea>|;
-  } else {
-    $description =
-      qq|<input name=description size=60 value="$form->{description}">|;
-  }
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=warehouse>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td>$description</td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse saved!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub delete_warehouse {
-  $lxdebug->enter_sub();
-
-  AM->delete_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse deleted!'));
-
-  $lxdebug->leave_sub();
-}
-
 sub continue {
   $lxdebug->enter_sub();
 
@@ -3665,15 +3036,11 @@ sub edit_units {
 
   @languages = AM->language(\%myconfig, $form, 1);
 
-  @unit_list = ();
-  foreach $name (sort({ lc($a) cmp lc($b) } grep({ !$units->{$_}->{"base_unit"} } keys(%{$units})))) {
-    map({ push(@unit_list, $units->{$_}); }
-        sort({ ($units->{$a}->{"resolved_factor"} * 1) <=> ($units->{$b}->{"resolved_factor"} * 1) }
-             grep({ $units->{$_}->{"resolved_base_unit"} eq $name } keys(%{$units}))));
-  }
+  @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
+
   my $i = 1;
   foreach (@unit_list) {
-    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"});
+    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"} * 1) if ($_->{"factor"});
     $_->{"UNITLANGUAGES"} = [];
     foreach my $lang (@languages) {
       push(@{ $_->{"UNITLANGUAGES"} },
@@ -3690,12 +3057,15 @@ sub edit_units {
   $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
   $ddbox = AM->unit_select_data($units, undef, 1);
 
+  my $updownlink = build_std_url("action=swap_units", "unit_type");
+
   $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS" => \@unit_list,
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
-                                     "LANGUAGES" => \@languages }));
+                                     "LANGUAGES" => \@languages,
+                                     "updownlink" => $updownlink }));
 
   $lxdebug->leave_sub();
 }
@@ -3831,3 +3201,110 @@ sub save_unit {
 
   $lxdebug->leave_sub();
 }
+
+sub show_history_search {
+	$lxdebug->enter_sub();
+	
+	$form->{title} = $locale->text("History Search");
+    $form->header();
+    
+    print $form->parse_html_template("/common/search_history");
+	
+	$lxdebug->leave_sub();
+}
+
+sub show_am_history {
+	$lxdebug->enter_sub();
+	my %search = ( "Artikelnummer" => "parts",
+				   "Kundennummer"  => "customer",
+				   "Lieferantennummer" => "vendor",
+				   "Projektnummer" => "project",
+				   "Buchungsnummer" => "oe",
+				   "Eingangsrechnungnummer" => "ap",
+				   "Ausgangsrechnungnummer" => "ar"
+		);
+	my %searchNo = ( "Artikelnummer" => "partnumber",
+				     "Kundennummer"  => "customernumber",
+				     "Lieferantennummer" => "vendornumber",
+				     "Projektnummer" => "projectnummer",
+				     "Buchungsnummer" => "ordnumber",
+				     "Eingangsrechnungnummer" => "invnumber",
+				     "Ausgangsrechnungnummer" => "invnumber"
+		);
+	
+	my $restriction;
+	my $tempNo = 0;
+	foreach(split(/\,/, $form->{einschraenkungen})) {
+		if($tempNo == 0) {
+			$restriction .= " AND addition = '" . $_ . "'";
+			$tempNo = 1;
+		} 
+		else {
+			$restriction .= " OR addition = '" . $_ . "'";
+		}
+	}
+	
+	$restriction .= (($form->{transdate} ne "" && $form->{reqdate} ne "") 
+						? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+						: (($form->{transdate} ne "" && $form->{reqdate} eq "") 
+							? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
+							: ($form->{transdate} eq "" && $form->{reqdate} ne "") 
+								? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+								: ""
+							)
+						);
+	
+	my $dbh = $form->dbconnect(\%myconfig);
+	
+	$restriction .= ($form->{mitarbeiter} eq "" ? "" 
+					: ($form->{mitarbeiter} =~ /^[0-9]*$/  
+						? " AND employee_id = " . $form->{mitarbeiter} 
+						: " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
+	
+	my $query = qq|SELECT id FROM $search{$form->{what2search}} 
+				   WHERE $searchNo{$form->{'what2search'}} ILIKE '$form->{"searchid"}' 
+				   |;
+	
+	my $sth = $dbh->prepare($query);
+	
+	$sth->execute() || $form->dberror($query);
+	
+	$form->{title} = $locale->text("History Search");
+	$form->header();
+	
+	while(my $hash_ref = $sth->fetchrow_hashref()){
+		print $form->parse_html_template("/common/show_history", 
+			{"DATEN" => $form->get_history($dbh,$hash_ref->{id},$restriction),
+			 "SUCCESS" => ($form->get_history($dbh,$hash_ref->{id},$restriction) != 0),
+			 "NONEWWINDOW" => "1"	
+			}
+		);
+	}
+	$dbh->disconnect();
+	
+	$lxdebug->leave_sub();
+}
+
+sub get_employee_id {
+	$lxdebug->enter_sub();
+	my $query = qq|SELECT id FROM employee WHERE name = '| . $_[0] . qq|'|;
+	my $sth = $_[1]->prepare($query);
+	$sth->execute() || $form->dberror($query);
+	my $return = $sth->fetch();
+	$sth->finish();
+	return ${$return}[0];
+	$lxdebug->leave_sub();
+}
+
+sub swap_units {
+  $lxdebug->enter_sub();
+
+  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
+  my $unit_type = $form->{"unit_type"} eq "dimension" ?
+    "dimension" : "service";
+  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"}, $unit_type);
+
+  edit_units();
+
+  $lxdebug->leave_sub();
+}
\ No newline at end of file