From 1668bc2dc1d0ead3507a3713e820e251c6be4259 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 22 Oct 2009 16:36:30 +0200 Subject: [PATCH] ir strict - $i und $invdate in post_payment sehen dodgy aus. --- bin/mozilla/ir.pl | 256 ++++++++++++++++++++++++++++------------------ 1 file changed, 159 insertions(+), 97 deletions(-) diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 440ee6e40..f7dcd6af5 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -43,16 +43,21 @@ 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; - $auth->assert('vendor_invoice_edit'); + $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'); @@ -60,13 +65,16 @@ sub add { &prepare_invoice; &display_form; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub edit { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); - $auth->assert('vendor_invoice_edit'); + my $form = $main::form; + my $locale = $main::locale; + + $main::auth->assert('vendor_invoice_edit'); # show history button $form->{javascript} = qq||; @@ -78,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(); + + my $form = $main::form; + my %myconfig = %main::myconfig; - $auth->assert('vendor_invoice_edit'); + $main::auth->assert('vendor_invoice_edit'); # create links - $form->{webdav} = $webdav; + $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}); } @@ -102,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}; } @@ -112,7 +125,7 @@ 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; @@ -127,6 +140,7 @@ sub invoice_links { $form->{taxzone_id} = $taxzone_id; } + my @curr = split(/:/, $form->{currencies}); #seems to be missing map { $form->{selectcurrency} .= "