X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=7c0055582d4ae82b0952dde83de6cc4a9c4c5146;hb=0b280f98054da74f79cbc9fdb3e9f4c23326be53;hp=7eb339804da84c31ca454300aca6b3b8798c3f60;hpb=3740b5032e01a83f12912887e66d0824c47aebcc;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 7eb339804..7c0055582 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -83,7 +83,7 @@ sub edit {
# show history button
$form->{javascript} = qq||;
#/show hhistory button
-
+
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
{
$form->error("Access Denied");
@@ -288,13 +288,13 @@ sub form_header {
if ($form->{type} eq "credit_note") {
$form->{title} = $locale->text('Edit Credit Note');
-
+
if ($form->{storno}) {
$form->{title} = $locale->text('Edit Storno Credit Note');
}
} else {
$form->{title} = $locale->text('Edit Sales Invoice');
-
+
if ($form->{storno}) {
$form->{title} = $locale->text('Edit Storno Invoice');
}
@@ -340,9 +340,18 @@ sub form_header {
$labels{$item->{"cp_id"}} = $item->{"cp_name"} .
($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
}
- my $contact =
- NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+ my $contact;
+ if (scalar @values > 1) {
+ $contact = qq|
+
+ | . $locale->text('Contact Person') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px',
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+ . qq|
+ |
+
|;
+ }
%labels = ();
@values = ();
@@ -370,28 +379,32 @@ sub form_header {
my $customers = qq|
| . $locale->text('Customer') . qq| |
- | .
- (($myconfig{vclimit} == 1 )
- ? qq||
- : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
+ | | .
+ (($myconfig{vclimit} <= scalar(@values))
+ ? qq||
+ : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
'-onChange' => 'document.getElementById(\'update_button\').click();',
- '-values' => \@values, '-labels' => \%labels)))) . qq|
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
+
| |;
-
+
%labels = ();
@values = ("");
foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
push(@values, $item->{"shipto_id"});
- $labels{$item->{"shipto_id"}} =
- $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+ $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
}
- my $shipto = qq|
- | . $locale->text('Shipping Address') . qq| |
- | .
- NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+ my $shipto;
+ if (scalar @values > 1) {
+ $shipto = qq|
+ |
+ | . $locale->text('Shipping Address') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px',
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
. qq| | |;
+ }
%labels = ();
@values = ();
@@ -399,9 +412,11 @@ sub form_header {
push(@values, $item);
$labels{$item} = $item;
}
-
+
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- my $currencies = qq|
+ my $currencies;
+ if (scalar @values) {
+ $currencies = qq|
| . $locale->text('Currency') . qq| |
| .
@@ -409,6 +424,7 @@ sub form_header {
'-values' => \@values, '-labels' => \%labels)) . qq|
|
|;
+ }
%labels = ();
@values = ("");
@@ -450,7 +466,7 @@ sub form_header {
| . $locale->text('Steuersatz') . qq| |
| .
NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
- '-values' => \@values, '-labels' => \%labels)) . qq|
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px',)) . qq|
|
|;
@@ -477,7 +493,7 @@ sub form_header {
#substitute \n and \r to \s (bug 543)
$form->{selectcustomer} =~ s/[\n\r]/ /g;
-
+
if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
$creditwarning = 1;
} else {
@@ -513,7 +529,7 @@ sub form_header {
$department = qq|
| . $locale->text('Department') . qq| |
-
+ |
|
@@ -524,99 +540,71 @@ sub form_header {
if ($form->{business}) {
$business = qq|
- | . $locale->text('Business') . qq| |
- $form->{business} |
- | . $locale->text('Trade Discount') . qq| |
- |
+ | | . $locale->text('Customer type') . qq| |
+ $form->{business}; | . $locale->text('Trade Discount') . qq| |
. $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
. qq| % |
-
+
|;
}
if ($form->{max_dunning_level}) {
$dunning = qq|
-
-
-
-
- | . $locale->text('Max. Dunning Level') . qq|: |
- $form->{max_dunning_level} |
- | . $locale->text('Dunning Amount') . qq|: |
- |
- . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
- . qq| |
-
-
- |
-
+
+ | . $locale->text('Max. Dunning Level') . qq|: |
+
+ $form->{max_dunning_level};
+ | . $locale->text('Dunning Amount') . qq|: |
+ . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+ . qq|
+ |
+
|;
}
$form->{fokus} = "invoice.customer";
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{type} eq "credit_note") {
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- |
- | |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "1",
- "invdate", "BL",
- "trigger1");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq| | |;
- $button2 =
- qq| | |;
- }
+ $button1 = qq|
+
+ | |;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "1",
+ "invdate", "BL",
+ "trigger1");
} else {
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- |
- |
- |;
- $button2 = qq|
- |
- |
+ $button1 = qq|
+
+ |
|;
- $button3 = qq|
- |
- |
- |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "3",
- "invdate", "BL",
- "trigger1", "duedate",
- "BL", "trigger2",
- "deliverydate", "BL",
- "trigger3");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq| | |;
- $button2 =
- qq|{duedate} onBlur=\"check_right_date_format(this)\"> | |;
- }
+ $button2 = qq|
+
+ |
+ |;
+ $button3 = qq|
+
+ |
+ |;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "3",
+ "invdate", "BL",
+ "trigger1", "duedate",
+ "BL", "trigger2",
+ "deliverydate", "BL",
+ "trigger3");
}
+
if ($form->{resubmit} && ($form->{format} eq "html")) {
$onload =
qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
@@ -633,6 +621,7 @@ sub form_header {
}
$form->{"javascript"} .= qq||;
+ $form->{javascript} .= qq||;
$jsscript .=
$form->write_trigger(\%myconfig, 2,
@@ -652,55 +641,40 @@ sub form_header {