X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=d848abc64f2a9c54cb57fe5215a91f7c91a63a7c;hb=b65cc47a206d0b5df78123d9b36c1867928bf684;hp=3f8812e1853d5d894ab1d4a700ecf54c17368f04;hpb=a0f6a00c1db8152633841777a95f5420b56b42ee;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 3f8812e18..d848abc64 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -31,23 +31,33 @@
#
#======================================================================
+use SL::FU;
use SL::IR;
use SL::IS;
use SL::PE;
+use List::Util qw(max sum);
-require "$form->{path}/io.pl";
-require "$form->{path}/arap.pl";
-require "$form->{path}/common.pl";
+require "bin/mozilla/io.pl";
+require "bin/mozilla/invoice_io.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
+use strict;
+
1;
# end of main
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ $main::auth->assert('vendor_invoice_edit');
- return $lxdebug->leave_sub() if (load_draft_maybe());
+ return $main::lxdebug->leave_sub() if (load_draft_maybe());
$form->{title} = $locale->text('Add Vendor Invoice');
@@ -55,38 +65,46 @@ sub add {
&prepare_invoice;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit {
- $lxdebug->enter_sub();
-
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ $main::auth->assert('vendor_invoice_edit');
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
-
+
$form->{title} = $locale->text('Edit Vendor Invoice');
&invoice_links;
&prepare_invoice;
&display_form;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub invoice_links {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- # create links
- $form->{webdav} = $webdav;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- # set jscalendar
- $form->{jscalendar} = $jscalendar;
+ $main::auth->assert('vendor_invoice_edit');
+
+ # create links
+ $form->{webdav} = $main::webdav;
+ $form->{jsscript} = 1;
$form->create_links("AP", \%myconfig, "vendor");
#quote all_vendor Bug 133
- foreach $ref (@{ $form->{all_vendor} }) {
+ foreach my $ref (@{ $form->{all_vendor} }) {
$ref->{name} = $form->quote($ref->{name});
}
@@ -95,6 +113,8 @@ sub invoice_links {
$form->{vendor_id} = $form->{all_vendor}->[0]->{id};
}
}
+
+ my ($payment_id, $language_id, $taxzone_id);
if ($form->{payment_id}) {
$payment_id = $form->{payment_id};
}
@@ -105,11 +125,11 @@ sub invoice_links {
$taxzone_id = $form->{taxzone_id};
}
- $cp_id = $form->{cp_id};
+ my $cp_id = $form->{cp_id};
IR->get_vendor(\%myconfig, \%$form);
IR->retrieve_invoice(\%myconfig, \%$form);
$form->{cp_id} = $cp_id;
-
+
if ($payment_id) {
$form->{payment_id} = $payment_id;
}
@@ -120,22 +140,11 @@ sub invoice_links {
$form->{taxzone_id} = $taxzone_id;
}
- # currencies
- @curr = split(/:/, $form->{currencies});
- chomp $curr[0];
- $form->{defaultcurrency} = $curr[0];
-
+ my @curr = split(/:/, $form->{currencies}); #seems to be missing
map { $form->{selectcurrency} .= "";
- } else {
- $form->{selecttaxzone} .=
- "";
- }
+ my $globalprojectnumber = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, '-labels' => \%labels,
+ '-default' => $form->{"globalproject_id"}));
- }
- } else {
- $form->{selecttaxzone} =~ s/ selected//g;
- if ($form->{taxzone_id} ne "") {
- $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
- }
+ %labels = ();
+ @values = ();
+ my $i = 0;
+ foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
+ push(@values, $item);
+ $labels{$item} = $item;
}
- $taxzone = qq|
-
- | . $locale->text('Steuersatz') . qq| |
- |
-
-
|;
+ $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
+ my $currencies;
+ if (scalar @values) {
+ $currencies = qq|
+
+ | . $locale->text('Currency') . qq| |
+ | . NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ |
+
|;
+ }
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"name"};
+ }
+ my $employees = qq|
+
+ | . $locale->text('Employee') . qq| |
+ | . NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ |
+
|;
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_VENDORS"} }) {
+ push(@values, $item->{name}.qq|--|.$item->{"id"});
+ $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
+ }
- $vendor =
- ($form->{selectvendor})
- ? qq|\n|
- : qq||;
+ $form->{selectvendor} = ($myconfig{vclimit} > scalar(@values));
- $department = qq|
-
- | . $locale->text('Department') . qq| |
-
-
- |
-
-| if $form->{selectdepartment};
+ my $vendors = qq|
+ | . $locale->text('Vendor') . qq| |
+ | .
+ (($myconfig{vclimit} <= scalar(@values))
+ ? qq||
+ : (NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{oldvendor},
+ '-onChange' => 'document.getElementById(\'update_button\').click();',
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
+
+ | |;
- $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_TAXZONES"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"description"};
+ }
- # use JavaScript Calendar or not
- $form->{jsscript} = $form->{jscalendar};
- $jsscript = "";
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- |
- text('button') . qq|> |
- |;
- $button2 = qq|
- |
- text('button') . qq|> |
- |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
+ my $taxzone;
+ if (!$form->{"id"}) {
+ $taxzone = qq|
+
+ | . $locale->text('Steuersatz') . qq| |
+ | . NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq|
+ |
+
|;
} else {
-
- # without JavaScript Calendar
- $button1 =
- qq| | |;
- $button2 =
- qq| | |;
+ $taxzone = qq|
+
+ | . $locale->text('Steuersatz') . qq| |
+
+
+ | . H($labels{$form->{"taxzone_id"}}) . qq|
+ |
+
|;
}
- $form->{"javascript"} .= qq||;
- $form->{"javascript"} .= qq||;
+ my $department = qq|
+
+ | . $locale->text('Department') . qq| |
+
+
+ |
+
\n| if $form->{selectdepartment};
- $jsscript .=
- $form->write_trigger(\%myconfig, 2,
- "orddate", "BL", "trigger_orddate",
- "quodate", "BL", "trigger_quodate");
+ my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+
+ # use JavaScript Calendar or not
+ $form->{jsscript} = 1;
+ my $jsscript = "";
+
+ my $button1 = qq|
+
+
+
+ | \n|;
+
+#, 'old_duedate__'' + document.getElementsByName('duedate')[0].value, 'vendor_id__' + document.getElementsByName('vendor_id')[0].value],['duedate'])">
+ my $button2 = qq|
+
+
+ text('button') . qq|>
+ | \n|;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2",
+ "invdate", "BL", "trigger1",
+ "duedate", "BL", "trigger2");
+
+ my $follow_up_vc = $form->{vendor};
+ $follow_up_vc =~ s/--\d*\s*$//;
+ my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
+
+ $form->{javascript} .= qq||;
+ $form->{javascript} .= qq||;
+ $form->{javascript} .= qq||;
+ $form->{javascript} .= qq||;
+
+ $jsscript .= $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate");
$form->header;
- $onload = qq|focus()|;
+ my $onload = qq|focus()|;
$onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
$onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
+
+