X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=c6bb8e47c1ea6a6ca0bf4cfe6b30c7c4594adc0d;hb=da4b17d1f278f7b8eeb0d6e2f59ca921425f7554;hp=ecf4f2b3724f2d72cb551dd6eefbd06a5cf3da1e;hpb=4bbb5dbe9a272bc31d5f059b3ece3e230c2a6642;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index ecf4f2b37..c6bb8e47c 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -31,7 +31,10 @@
#
#======================================================================
+use utf8;
+
use SL::Auth;
+use SL::Auth::PasswordPolicy;
use SL::AM;
use SL::CA;
use SL::Form;
@@ -213,29 +216,29 @@ sub account_header {
my $select_eur = q|\n|;
my %eur = (
- 1 => "Umsatzerlöse",
- 2 => "sonstige Erlöse",
+ 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. Fahrzeugkosten",
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",
@@ -245,7 +248,7 @@ sub account_header {
30 => "Ausserordentlicher Aufwand",
31 => "Betriebliche Steuern");
foreach my $item (sort({ $a <=> $b } keys(%eur))) {
- my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $eur{$item}));
+ my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
if ($item == $form->{pos_eur}) {
$select_eur .= qq|\n|;
} else {
@@ -257,30 +260,30 @@ sub account_header {
my $select_bwa = q|\n|;
my %bwapos = (
- 1 => 'Umsatzerlöse',
+ 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.');
foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
- my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $bwapos{$item}));
+ my $text = H($::locale->{iconv_utf8}->convert($bwapos{$item}));
if ($item == $form->{pos_bwa}) {
$select_bwa .= qq|\n|;
foreach my $item ((1, 2, 3, 4)) {
if ($item == $form->{pos_bilanz}) {
@@ -332,7 +335,7 @@ sub account_header {
my %charttype = (
'A' => $locale->text('Account'),
- 'H' => $locale->text('Header'),
+ 'H' => $locale->text('Heading'),
);
foreach my $item ( sort({ $a <=> $b } keys %charttype) ) {
@@ -501,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;
@@ -1108,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 $::vertreter;
+ push @column_index, 'salesman' if $::lx_office_conf{features}->{vertreter};
my %column_header;
$column_header{description} =
qq|
|
@@ -1221,7 +1224,7 @@ sub business_header {
$form->format_amount(\%myconfig, $form->{discount} * 100);
my $salesman_code;
- if ($::vertreter) {
+ if ($::lx_office_conf{features}->{vertreter}) {
$salesman_code = qq|
|
| . $locale->text('Representative') . qq| |
@@ -1870,7 +1873,7 @@ sub buchungsgruppe_header {
}
my $linkaccounts;
- if (!$main::eur) {
+ if (!$::lx_office_conf{system}->{eur}) {
$linkaccounts = qq|
| . $locale->text('Inventory') . qq| |
@@ -2015,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||
- . qq||
- . qq| | |;
- $column_header{down} =
- qq||
- . qq||
- . qq| | |;
- $column_header{description} =
- qq||
- . $locale->text('Description')
- . qq| | |;
- $column_header{description_long} =
- qq||
- . $locale->text('Long Description')
- . qq| | |;
- $column_header{terms_netto} =
- qq||
- . $locale->text('Netto Terms')
- . qq| | |;
- $column_header{terms_skonto} =
- qq||
- . $locale->text('Skonto Terms')
- . qq| | |;
- $column_header{percent_skonto} =
- qq||
- . $locale->text('Skonto')
- . qq| % | |;
-
- $form->header;
-
- print qq|
-
-
-
-
- $form->{title} |
-
-
-
-
-
-
-|;
-
- map { print "$column_header{$_}\n" } @column_index;
-
- print qq|
-
-|;
-
- 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|
-
-|;
-
- if ($row) {
- my $pref = $form->{ALL}->[$row - 1];
- $column_data{up} =
- qq|| .
- qq|| .
- qq|| .
- qq| | |;
- } else {
- $column_data{up} = qq| | |;
- }
-
- if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
- $column_data{down} = qq| | |;
- } else {
- my $nref = $form->{ALL}->[$row + 1];
- $column_data{down} =
- qq|| .
- qq|| .
- qq|| .
- qq| | |;
- }
-
- $column_data{description} =
- qq|{id}", "callback=$callback") .
- qq|">| . H($ref->{description}) . qq| | |;
- $column_data{description_long} =
- qq|| . H($ref->{description_long}) . qq| | |;
- $column_data{terms_netto} =
- qq|$ref->{terms_netto} | |;
- $column_data{terms_skonto} =
- qq|$ref->{terms_skonto} | |;
- $column_data{percent_skonto} =
- qq|| .
- $form->format_amount(\%myconfig, $ref->{percent_skonto} * 100) .
- qq|% | |;
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
- $row++;
- }
-
- print qq|
-
- |
-
-
-
|
-
-
-
-
-
-
-
-