X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=bf54841661c352fa669caef54072ad9c1d898d53;hb=d4c9b68ec69a5a04d8e185800718c665151b2bbc;hp=7b06ed74a6e0c0bc809e3983e2b32539feb96958;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 7b06ed74a..bf5484166 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -32,8 +32,10 @@
#======================================================================
use POSIX qw(strftime);
+use List::Util qw(sum);
use SL::AP;
+use SL::FU;
use SL::IR;
use SL::IS;
use SL::PE;
@@ -221,17 +223,11 @@ sub form_header {
}
$readonly = ($form->{id}) ? "readonly" : "";
- $form->{radier} =
- ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
- $readonly = ($form->{radier}) ? "" : $readonly;
+ $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
+ $readonly = ($form->{radier}) ? "" : $readonly;
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{transdate}, 'sell'
- )));
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
# format amounts
@@ -302,12 +298,13 @@ selectvendor } |
map({ push(@old_project_ids, $form->{"project_id_$_"})
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids },
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $form->{transdate} },
- "taxcharts" => "ALL_TAXCHARTS");
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids },
+ "charts" => { "key" => "ALL_CHARTS",
+ "transdate" => $form->{transdate} },
+ "taxcharts" => { "key" => "ALL_TAXCHARTS",
+ "module" => "AP" },);
map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; }
@{ $form->{ALL_CHARTS} });
@@ -365,12 +362,12 @@ selectvendor } |
# with JavaScript Calendar
$button1 = qq|
-
$readonly |
+ |
text('button') . qq|> |
|;
$button2 = qq|
- $readonly |
+ |
text('button') . qq|> |
|;
@@ -383,12 +380,18 @@ selectvendor } |
# without JavaScript Calendar
$button1 =
- qq| $readonly | |;
+ qq| | |;
$button2 =
- qq| $readonly | |;
+ qq| | |;
}
+
+ my $follow_up_vc = $form->{vendor};
+ $follow_up_vc =~ s/--.*?//;
+ my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
+
$form->{javascript} .= qq||;
$form->{javascript} .= qq||;
+ $form->{javascript} .= qq||;
$form->header;
$onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
@@ -404,6 +407,11 @@ selectvendor } |
{locked}>
+
+
+
+
+
| . ($form->{saved_message} ? qq|$form->{saved_message}
| : "") . qq|
@@ -491,8 +499,6 @@ $jsscript
. $locale->text('Amount') . qq|
|
. $locale->text('Tax') . qq| |
- |
- . $locale->text('Korrektur') . qq| |
|
. $locale->text('Taxkey') . qq| |
|
@@ -548,8 +554,6 @@ $jsscript
'-default' => $selected_taxchart))
. qq||;
- my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
-
my $projectnumber =
NTI($cgi->popup_menu('-name' => "project_id_$i",
'-values' => \@project_values,
@@ -560,8 +564,7 @@ $jsscript
|
$selectAP_amount |
{"amount_$i"}> |
- {"tax_$i"}> |
- |
+ $form->{"tax_$i"} |
$tax
$projectnumber |
@@ -753,8 +756,20 @@ sub form_footer {
$auth->assert('general_ledger');
+ my $follow_ups_block;
+ if ($form->{id}) {
+ my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+
+ if (@{ $follow_ups} ) {
+ my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups };
+ $follow_ups_block = qq|| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|
|;
+ }
+ }
+
print qq|
+$follow_ups_block
+
|
@@ -792,6 +807,7 @@ sub form_footer {
print qq|
+
|;
} elsif (($transdate > $closedto) && !$form->{id}) {
print qq|
@@ -849,17 +865,15 @@ sub update {
if ($form->{"amount_$i"}) {
push @a, {};
$j = $#a;
- if (!$form->{"korrektur_$i"}) {
- ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
- if ($form->{taxincluded}) {
- $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
- } else {
- $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
- }
+ ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+ if ($taxkey > 1) {
+ if ($form->{taxincluded}) {
+ $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
} else {
- $form->{"tax_$i"} = 0;
+ $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
}
+ } else {
+ $form->{"tax_$i"} = 0;
}
$form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
@@ -872,17 +886,12 @@ sub update {
map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{transdate}, 'sell'
- )));
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
$form->{invdate} = $form->{transdate};
$save_AP = $form->{AP};
- &check_name(vendor);
+ &check_name("vendor");
$form->{AP} = $save_AP;
$form->{rowcount} = $count + 1;
@@ -899,13 +908,8 @@ sub update {
$totalpaid += $form->{"paid_$i"};
- $form->{"exchangerate_$i"} = $exchangerate
- if (
- $form->{"forex_$i"} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'
- )));
+ $form->{"forex_$i"} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+ $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
}
}
@@ -915,6 +919,9 @@ sub update {
$form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $totalpaid;
+ # notes
+ $form->{notes} = $form->{intnotes};
+
&display_form;
$lxdebug->leave_sub();
@@ -935,7 +942,7 @@ sub post_payment {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
@@ -969,7 +976,7 @@ sub post {
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $form->error($locale->text('Cannot post transaction for a closed period!')) if ($transdate <= $closedto);
+ $form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
my $zero_amount_posting = 1;
for $i (1 .. $form->{rowcount}) {
@@ -992,7 +999,7 @@ sub post {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
@@ -1363,7 +1370,7 @@ sub ap_transactions {
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
- $form->{sort} ||= 'transdate';
+ report_generator_set_default_sort('transdate', 1);
AP->ap_transactions(\%myconfig, \%$form);
@@ -1400,9 +1407,9 @@ sub ap_transactions {
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
);
- foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
- employee shippingpoint shipvia)) {
- $column_defs{$name}->{link} = $href . "&sort=$name";
+ foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);
@@ -1415,7 +1422,7 @@ sub ap_transactions {
$report->set_export_options('ap_transactions', @hidden_variables);
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
my @options;
if ($form->{vendor}) {
@@ -1438,10 +1445,10 @@ sub ap_transactions {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
if ($form->{transdatefrom}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
- push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
push @options, $locale->text('Open');
@@ -1480,9 +1487,20 @@ sub ap_transactions {
map { $ap->{$_} = $form->format_amount(\%myconfig, $ap->{$_}, 2) } qw(netamount tax amount paid due);
- $ap->{type} =
- $ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
- $locale->text("AP Transaction (abbreviation)");
+ my $is_storno = $ap->{storno} && $ap->{storno_id};
+ my $has_storno = $ap->{storno} && !$ap->{storno_id};
+
+ if ($ap->{invoice}) {
+ $ap->{type} =
+ $has_storno ? $locale->text("Invoice with Storno (abbreviation)")
+ : $is_storno ? $locale->text("Storno (one letter abbreviation)")
+ : $locale->text("Invoice (one letter abbreviation)");
+ } else {
+ $ap->{type} =
+ $has_storno ? $locale->text("AP Transaction with Storno (abbreviation)")
+ : $is_storno ? $locale->text("AP Transaction Storno (one letter abbreviation)")
+ : $locale->text("AP Transaction (abbreviation)");
+ }
my $row = { };
@@ -1517,6 +1535,40 @@ sub ap_transactions {
$lxdebug->leave_sub();
}
+
+sub vendor_invoice {
+ $lxdebug->enter_sub();
+
+ $auth->assert('invoice_edit');
+
+
+ $form->{script} = 'ir.pl';
+ $script = "ir";
+ $form->{type} = "invoice";
+ $locale = new Locale "$myconfig{countrycode}", "$script";
+
+ require "bin/mozilla/$form->{script}";
+ &add;
+
+ $lxdebug->leave_sub();
+}
+
+sub ap_transaction {
+ $lxdebug->enter_sub();
+
+ $auth->assert('general_ledger');
+
+
+ $form->{script} = 'ap.pl';
+ $script = "ap";
+ $locale = new Locale "$myconfig{countrycode}", "$script";
+
+ require "bin/mozilla/$form->{script}";
+ &add;
+
+ $lxdebug->leave_sub();
+}
+
sub storno {
$lxdebug->enter_sub();