X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=c6bb8e47c1ea6a6ca0bf4cfe6b30c7c4594adc0d;hb=f742983addf80ee40aecd76b6602faa452ece91e;hp=bcf934ed1ac1fc624df7dd9553d559caa94eb122;hpb=1072cd08c6f5b1905a34dcb3eeab3ddec98d6905;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index bcf934ed1..c6bb8e47c 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -504,7 +504,7 @@ sub list_account {
 
   push(@ { $form->{AJAX} }, $pjx);
 
-  $form->{stylesheets} = "list_accounts.css";
+  $form->use_stylesheet("list_accounts.css");
   $form->{title}       = $locale->text('Chart of Accounts');
 
   $form->header;
@@ -1111,7 +1111,7 @@ sub list_business {
   $form->{title} = $locale->text('Type of Business');
 
   my @column_index = qw(description discount customernumberinit);
-  push @column_index, 'salesman' if $::lx_office_conf{system}->{vertreter};
+  push @column_index, 'salesman' if $::lx_office_conf{features}->{vertreter};
   my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=60%>|
@@ -1224,7 +1224,7 @@ sub business_header {
     $form->format_amount(\%myconfig, $form->{discount} * 100);
 
   my $salesman_code;
-  if ($::lx_office_conf{system}->{vertreter}) {
+  if ($::lx_office_conf{features}->{vertreter}) {
     $salesman_code = qq|
   <tr>
     <th align="right">| . $locale->text('Representative') . qq|</th>
@@ -2018,369 +2018,6 @@ sub swap_buchungsgruppen {
   $main::lxdebug->leave_sub();
 }
 
-sub add_payment {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_payment" unless $form->{callback};
-
-  $form->{terms_netto} = 0;
-  $form->{terms_skonto} = 0;
-  $form->{percent_skonto} = 0;
-  my @languages = AM->language(\%myconfig, $form, 1);
-  map({ $_->{"language"} = $_->{"description"};
-        $_->{"language_id"} = $_->{"id"}; } @languages);
-  $form->{"TRANSLATION"} = \@languages;
-  &payment_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_payment {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_payment(\%myconfig, $form);
-  $form->{percent_skonto} =
-    $form->format_amount(\%myconfig, $form->{percent_skonto} * 100);
-
-  &payment_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_payment {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->payment(\%myconfig, \%$form);
-
-  $form->{callback} = build_std_url("action=list_payment");
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Payment Terms');
-
-  my @column_index = qw(up down description description_long terms_netto
-                     terms_skonto percent_skonto);
-  my %column_header;
-  $column_header{up} =
-      qq|<th class="listheading" align="center" valign="center" width="16">|
-    . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
-    . qq|</th>|;
-  $column_header{down} =
-      qq|<th class="listheading" align="center" valign="center" width="16">|
-    . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
-    . qq|</th>|;
-  $column_header{description} =
-      qq|<th class=listheading>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{description_long} =
-      qq|<th class=listheading>|
-    . $locale->text('Long Description')
-    . qq|</th>|;
-  $column_header{terms_netto} =
-      qq|<th class=listheading>|
-    . $locale->text('Netto Terms')
-    . qq|</th>|;
-  $column_header{terms_skonto} =
-      qq|<th class=listheading>|
-    . $locale->text('Skonto Terms')
-    . qq|</th>|;
-  $column_header{percent_skonto} =
-      qq|<th class=listheading>|
-    . $locale->text('Skonto')
-    . 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>
-|;
-
-  my $swap_link = build_std_url("action=swap_payment_terms");
-
-  my $row = 0;
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    if ($row) {
-      my $pref = $form->{ALL}->[$row - 1];
-      $column_data{up} =
-        qq|<td align="center" valign="center" width="16">| .
-        qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
-        qq|</a></td>|;
-    } else {
-      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
-    }
-
-    if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
-    } else {
-      my $nref = $form->{ALL}->[$row + 1];
-      $column_data{down} =
-        qq|<td align="center" valign="center" width="16">| .
-        qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
-        qq|</a></td>|;
-    }
-
-    $column_data{description} =
-      qq|<td><a href="| .
-      build_std_url("action=edit_payment", "id=$ref->{id}", "callback=$callback") .
-      qq|">| . H($ref->{description}) . qq|</a></td>|;
-    $column_data{description_long} =
-      qq|<td>| . H($ref->{description_long}) . qq|</td>|;
-    $column_data{terms_netto} =
-      qq|<td align=right>$ref->{terms_netto}</td>|;
-    $column_data{terms_skonto} =
-      qq|<td align=right>$ref->{terms_skonto}</td>|;
-    $column_data{percent_skonto} =
-      qq|<td align=right>| .
-      $form->format_amount(\%myconfig, $ref->{percent_skonto} * 100) .
-      qq|%</td>|;
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-       </tr>
-|;
-    $row++;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=payment>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub payment_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title}    = $locale->text("$form->{title} Payment Terms");
-
-  # $locale->text('Add Payment Terms')
-  # $locale->text('Edit Payment Terms')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=payment>
-
-<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><input name=description size=30 value="$form->{description}"></td>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('Long Description') . qq|</th>
-    <td><input name=description_long size=50 value="$form->{description_long}"></td>
-  </tr>
-|;
-
-  foreach my $language (@{ $form->{"TRANSLATION"} }) {
-    print qq|
-  <tr>
-    <th align="right">| .
-    sprintf($locale->text('Translation (%s)'),
-            $language->{"language"})
-    . qq|</th>
-    <td><input name="description_long_$language->{language_id}" size="50"
-         value="| . Q($language->{"description_long"}) . qq|"></td>
-  </tr>
-|;
-  }
-
-  print qq|
-  <tr>
-    <th align=right>| . $locale->text('Netto Terms') . qq|</th>
-    <td><input name=terms_netto size=10 value="$form->{terms_netto}"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Skonto Terms') . qq|</th>
-    <td><input name=terms_skonto size=10 value="$form->{terms_skonto}"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Skonto') . qq| %</th>
-    <td><input name=percent_skonto size=10 value="$form->{percent_skonto}"></td>
-  </tr>
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<p>| . $locale->text("You can use the following strings in the long " .
-                     "description and all translations. They will be " .
-                     "replaced by their actual values by Lx-Office " .
-                     "before they're output.")
-. qq|</p>
-
-<ul>
-  <li>| . $locale->text("&lt;%netto_date%&gt; -- Date the payment is due in " .
-                        "full")
-. qq|</li>
-  <li>| . $locale->text("&lt;%skonto_date%&gt; -- Date the payment is due " .
-                        "with discount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%skonto_amount%&gt; -- The deductible amount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%skonto_in_percent%&gt; -- The discount in percent")
-. qq|</li>
-  <li>| . $locale->text("&lt;%total%&gt; -- Amount payable")
-. qq|</li>
-  <li>| . $locale->text("&lt;%total_wo_skonto%&gt; -- Amount payable less discount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%invtotal%&gt; -- Invoice total")
-. qq|</li>
-  <li>| . $locale->text("&lt;%invtotal_wo_skonto%&gt; -- Invoice total less discount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%currency%&gt; -- The selected currency")
-. qq|</li>
-  <li>| . $locale->text("&lt;%terms_netto%&gt; -- The number of days for " .
-                        "full payment")
-. qq|</li>
-  <li>| . $locale->text("&lt;%account_number%&gt; -- Your account number")
-. qq|</li>
-  <li>| . $locale->text("&lt;%bank%&gt; -- Your bank")
-. qq|</li>
-  <li>| . $locale->text("&lt;%bank_code%&gt; -- Your bank code")
-. qq|</li>
-</ul>|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_payment {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  $form->{"percent_skonto"} =
-    $form->parse_amount(\%myconfig, $form->{percent_skonto}) / 100;
-  AM->save_payment(\%myconfig, \%$form);
-  $form->redirect($locale->text('Payment Terms saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_payment {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_payment(\%myconfig, \%$form);
-  $form->redirect($locale->text('Payment terms deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub swap_payment_terms {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, "payment_terms");
-  list_payment();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub edit_defaults {
   $main::lxdebug->enter_sub();
 
@@ -2687,15 +2324,13 @@ sub edit_units {
   $units = AM->retrieve_units(\%myconfig, $form);
   my $ddbox = AM->unit_select_data($units, undef, 1);
 
-  my $updownlink = build_std_url("action=swap_units");
-
   $form->{"title"} = $locale->text("Add and edit units");
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS"               => \@unit_list,
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
                                      "LANGUAGES"           => \@languages,
-                                     "updownlink"          => $updownlink }));
+                                   }));
 
   $main::lxdebug->leave_sub();
 }
@@ -2933,22 +2568,6 @@ sub show_am_history {
   $main::lxdebug->leave_sub();
 }
 
-sub swap_units {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
-  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"});
-
-  edit_units();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub add_tax {
   $main::lxdebug->enter_sub();
 
@@ -3141,16 +2760,8 @@ sub list_price_factors {
 
   AM->get_all_price_factors(\%myconfig, \%$form);
 
-  my $previous;
   foreach my $current (@{ $form->{PRICE_FACTORS} }) {
-    if ($previous) {
-      $previous->{next_id}    = $current->{id};
-      $current->{previous_id} = $previous->{id};
-    }
-
     $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
-
-    $previous = $current;
   }
 
   $form->{callback} = build_std_url('action=list_price_factors');
@@ -3204,20 +2815,6 @@ sub delete_price_factor {
   $main::lxdebug->leave_sub();
 }
 
-sub swap_price_factors {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, 'price_factors');
-  list_price_factors();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub add_warehouse {
   $main::lxdebug->enter_sub();
 
@@ -3270,16 +2867,6 @@ sub list_warehouses {
 
   AM->get_all_warehouses(\%myconfig, $form);
 
-  my $previous;
-  foreach my $current (@{ $form->{WAREHOUSES} }) {
-    if ($previous) {
-      $previous->{next_id}    = $current->{id};
-      $current->{previous_id} = $previous->{id};
-    }
-
-    $previous = $current;
-  }
-
   $form->{callback} = build_std_url('action=list_warehouses');
   $form->{title}    = $locale->text('Warehouses');
   $form->{url_base} = build_std_url('callback');
@@ -3312,20 +2899,6 @@ sub save_warehouse {
   $main::lxdebug->leave_sub();
 }
 
-sub swap_warehouses {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, 'warehouse');
-  list_warehouses();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub delete_warehouse {
   $main::lxdebug->enter_sub();