X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=4a7840281095360464e89bf2afb73817cd186553;hb=08b6539d1b4a06760bd12208b76f15e767d336d4;hp=27b18e400fc77f1111e30112c5679d57d4fc7e6c;hpb=08c340d2caca21066fd8797e29f07facfde7a07c;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 27b18e400..4a7840281 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -727,7 +727,7 @@ sub list_department {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -929,7 +929,7 @@ sub list_lead {
map { print "$column_header{$_}\n" } @column_index;
print qq|
-
+
|;
my ($i, %column_data);
@@ -939,17 +939,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 +1107,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 +1121,10 @@ sub list_business {
qq| | |
. $locale->text('Customernumberinit')
. qq| | |;
+ $column_header{salesman} =
+ qq||
+ . $locale->text('Representative')
+ . qq| | |;
$form->header;
@@ -1159,11 +1164,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 +1219,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 +1258,7 @@ sub business_header {
| . $locale->text('Customernumberinit') . qq| |
{customernumberinit}> |
+$salesman_code
|
@@ -1417,7 +1436,7 @@ sub list_language {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -1769,7 +1788,7 @@ sub list_buchungsgruppe {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
$row++;
@@ -1853,10 +1872,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 +1883,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 +1913,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 +1929,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| |
+ |
+
|;
@@ -2106,7 +2125,7 @@ sub list_printer {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
}
@@ -2393,7 +2412,7 @@ sub list_payment {
map { print "$column_data{$_}\n" } @column_index;
print qq|
-
+
|;
$row++;
}
@@ -2512,6 +2531,8 @@ sub payment_header {
"with discount")
. qq|
| . $locale->text("<%skonto_amount%> -- The deductible amount")
+. qq|
+ | . $locale->text("<%skonto_in_percent%> -- The discount in percent")
. qq|
| . $locale->text("<%total%> -- Amount payable")
. qq|
@@ -2724,7 +2745,7 @@ sub config {
}
$form->{STYLESHEETS} = [];
- foreach my $item (qw(lx-office-erp.css Win2000.css)) {
+ foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css)) {
push @{ $form->{STYLESHEETS} }, {
'name' => $item,
'value' => $item,
@@ -2787,10 +2808,10 @@ sub audit_control {
|
@@ -3524,7 +3545,7 @@ sub delete_warehouse {
$form->header();
print $form->parse_html_template('am/confirm_delete_warehouse');
- exit 0;
+ ::end_of_request();
}
if (AM->delete_warehouse(\%myconfig, $form)) {