X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fam.pl;h=b7c980c9eb4c76757be9cae8114498aa39de11de;hb=2d31141735127d44d92ec276ed154f17dd1ec288;hp=27b18e400fc77f1111e30112c5679d57d4fc7e6c;hpb=08c340d2caca21066fd8797e29f07facfde7a07c;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 27b18e400..b7c980c9e 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -31,6 +31,8 @@
#
#======================================================================
+use utf8;
+
use SL::Auth;
use SL::AM;
use SL::CA;
@@ -39,6 +41,7 @@ use SL::User;
use SL::USTVA;
use SL::Iconv;
use SL::TODO;
+use SL::Printer;
use CGI::Ajax;
use CGI;
@@ -212,29 +215,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",
@@ -244,7 +247,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 {
@@ -256,30 +259,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}) {
@@ -331,7 +334,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) ) {
@@ -727,7 +730,7 @@ sub list_department {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -929,7 +932,7 @@ sub list_lead {
map { print "$column_header{$_}\n" } @column_index;
print qq|
-
+
|;
my ($i, %column_data);
@@ -939,17 +942,17 @@ sub list_lead {
$i %= 2;
print qq|
-
+
|;
-# $lead = $ref->{lead};
+# $lead = $ref->{lead};
$column_data{description} = qq|$ref->{lead} | |;
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -1107,6 +1110,7 @@ sub list_business {
$form->{title} = $locale->text('Type of Business');
my @column_index = qw(description discount customernumberinit);
+ push @column_index, 'salesman' if $::vertreter;
my %column_header;
$column_header{description} =
qq||
@@ -1120,6 +1124,10 @@ sub list_business {
qq| | |
. $locale->text('Customernumberinit')
. qq| | |;
+ $column_header{salesman} =
+ qq||
+ . $locale->text('Representative')
+ . qq| | |;
$form->header;
@@ -1159,11 +1167,12 @@ sub list_business {
$column_data{discount} = qq|$discount | |;
$column_data{customernumberinit} =
qq|$ref->{customernumberinit} | |;
+ $column_data{salesman} = '' . ($ref->{salesman} ? $::locale->text('Yes') : $::locale->text('No')) . ' | ';
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -1213,6 +1222,18 @@ sub business_header {
$form->{discount} =
$form->format_amount(\%myconfig, $form->{discount} * 100);
+ my $salesman_code;
+ if ($::vertreter) {
+ $salesman_code = qq|
+
+ | . $locale->text('Representative') . qq| |
+ | . $::cgi->checkbox(-name => "salesman", -value => 1, -label => '', 'checked' => $form->{salesman} ? 1 : 0) . qq| |
+
+|;
+ } else {
+ $salesman_code = $::cgi->hidden(-name => 'salesman', -value => $form->{salesman} ? 1 : 0);
+ }
+
$form->header;
print qq|
@@ -1240,6 +1261,7 @@ sub business_header {
| . $locale->text('Customernumberinit') . qq| |
{customernumberinit}> |
+$salesman_code
|
@@ -1417,7 +1439,7 @@ sub list_language {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -1769,7 +1791,7 @@ sub list_buchungsgruppe {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
$row++;
@@ -1853,10 +1875,10 @@ sub buchungsgruppe_header {
if (!$main::eur) {
$linkaccounts = qq|
- | . $locale->text('Inventory') . qq| |
- |
-
-
|;
+ | . $locale->text('Inventory') . qq| |
+ |
+
+ |;
} else {
$linkaccounts = qq|
{inventory_accno_id}>|;
@@ -1864,28 +1886,28 @@ sub buchungsgruppe_header {
$linkaccounts .= qq|
-
- | . $locale->text('National Revenues') . qq| |
- |
-
-
- | . $locale->text('National Expenses') . qq| |
- |
-
|;
+
+ | . $locale->text('National Revenues') . qq| |
+ |
+
+
+ | . $locale->text('National Expenses') . qq| |
+ |
+
|;
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
$form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/ value=$form->{income_accno_id_1} selected/;
$form->{selectIC_expense} =~ s/selected//g;
$form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/ value=$form->{expense_accno_id_1} selected/;
}
- $linkaccounts .= qq|
- | . $locale->text('Revenues EU with UStId') . qq| |
- |
-
-
- | . $locale->text('Expenses EU with UStId') . qq| |
- |
-
|;
+ $linkaccounts .= qq|
+ | . $locale->text('Revenues EU with UStId') . qq| |
+ |
+
+
+ | . $locale->text('Expenses EU with UStId') . qq| |
+ |
+
|;
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
@@ -1894,14 +1916,14 @@ sub buchungsgruppe_header {
$form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/ value=$form->{expense_accno_id_2} selected/;
}
- $linkaccounts .= qq|
- | . $locale->text('Revenues EU without UStId') . qq| |
- |
-
-
- | . $locale->text('Expenses EU without UStId') . qq| |
- |
-
|;
+ $linkaccounts .= qq|
+ | . $locale->text('Revenues EU without UStId') . qq| |
+ |
+
+
+ | . $locale->text('Expenses EU without UStId') . qq| |
+ |
+
|;
if ($form->{id}) {
$form->{selectIC_income} =~ s/selected//g;
@@ -1910,14 +1932,14 @@ sub buchungsgruppe_header {
$form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/ value=$form->{expense_accno_id_3} selected/;
}
- $linkaccounts .= qq|
- | . $locale->text('Foreign Revenues') . qq| |
- |
-
-
- | . $locale->text('Foreign Expenses') . qq| |
- |
-
+ $linkaccounts .= qq|
+ | . $locale->text('Foreign Revenues') . qq| |
+ |
+
+
+ | . $locale->text('Foreign Expenses') . qq| |
+ |
+
|;
@@ -1995,234 +2017,6 @@ sub swap_buchungsgruppen {
$main::lxdebug->leave_sub();
}
-
-sub add_printer {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
-
- $main::auth->assert('config');
-
- $form->{title} = "Add";
-
- $form->{callback} = "am.pl?action=add_printer" unless $form->{callback};
-
- &printer_header;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_printer {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- $form->{title} = "Edit";
-
- AM->get_printer(\%myconfig, \%$form);
-
- &printer_header;
-
- $form->{orphaned} = 1;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_printer {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->printer(\%myconfig, \%$form);
-
- $form->{callback} = "am.pl?action=list_printer";
-
- my $callback = $form->escape($form->{callback});
-
- $form->{title} = $locale->text('Printer');
-
- my @column_index = qw(printer_description printer_command template_code);
- my %column_header;
- $column_header{printer_description} =
- qq||
- . $locale->text('Printer Description')
- . qq| | |;
- $column_header{printer_command} =
- qq||
- . $locale->text('Printer Command')
- . qq| | |;
- $column_header{template_code} =
- qq||
- . $locale->text('Template Code')
- . qq| | |;
-
- $form->header;
-
- print qq|
-
-
-
-
- $form->{title} |
-
-
-
-
-
-
-|;
-
- map { print "$column_header{$_}\n" } @column_index;
-
- print qq|
-
-|;
-
- my ($i, %column_data);
- foreach my $ref (@{ $form->{ALL} }) {
-
- $i++;
- $i %= 2;
-
- print qq|
-
-|;
-
-
- $column_data{printer_description} = qq|$ref->{printer_description} | |;
- $column_data{printer_command} = qq|$ref->{printer_command} | |;
- $column_data{template_code} =
- qq|$ref->{template_code} | |;
-
- map { print "$column_data{$_}\n" } @column_index;
-
- print qq|
-
-|;
- }
-
- print qq|
-
- |
-
-
-
|
-
-
-
-
-
-
-
-