X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=d848abc64f2a9c54cb57fe5215a91f7c91a63a7c;hb=b65cc47a206d0b5df78123d9b36c1867928bf684;hp=541eb6c06b18980214c6c41ed8157e45d1ca3228;hpb=bd32b6070b6d73d60cb8df4a2425d0c711a96615;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 541eb6c06..d848abc64 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -31,18 +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 "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 $main::lxdebug->leave_sub() if (load_draft_maybe());
$form->{title} = $locale->text('Add Vendor Invoice');
@@ -50,11 +65,20 @@ 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');
@@ -62,22 +86,25 @@ sub edit {
&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});
}
@@ -86,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};
}
@@ -96,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;
}
@@ -111,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 $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|
+ |
+
|;
+ }
- }
- } 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 = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
}
- if ($form->{rowcount} >1) {
- $form->{selecttaxzone} =~ /