X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fap.pl;h=f5ed94069fa891a6931de30add1e08ae56e2e6ac;hb=ab875da135e7c44abb05eae5a136f6df4e09078c;hp=2110042c6aafb5d2c659f9698324d66d14faa8ad;hpb=2b3f8b3a8e518497566e3281dae387db2d98500a;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 2110042c6..f5ed94069 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;
@@ -42,7 +44,7 @@ use SL::ReportGenerator;
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/drafts.pl";
-require "bin/mozilla/report_generator.pl";
+require "bin/mozilla/reportgenerator.pl";
1;
@@ -79,13 +81,13 @@ require "bin/mozilla/report_generator.pl";
sub add {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
return $lxdebug->leave_sub() if (load_draft_maybe());
$form->{title} = "Add";
- $form->{callback} =
- "$form->{script}?action=add&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{callback} = "ap.pl?action=add" unless $form->{callback};
AP->get_transdate(\%myconfig, $form);
$form->{initial_transdate} = $form->{transdate};
@@ -99,6 +101,8 @@ sub add {
sub edit {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->{title} = "Edit";
&create_links;
@@ -110,6 +114,8 @@ sub edit {
sub display_form {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
&form_header;
&form_footer;
@@ -119,6 +125,8 @@ sub display_form {
sub create_links {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->create_links("AP", \%myconfig, "vendor");
$taxincluded = $form->{taxincluded};
$duedate = $form->{duedate};
@@ -174,6 +182,8 @@ sub create_links {
sub form_header {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$title = $form->{title};
$form->{title} = $locale->text("$title Accounts Payables Transaction");
@@ -213,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
@@ -294,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} });
@@ -357,12 +362,12 @@ selectvendor } |
# with JavaScript Calendar
$button1 = qq|
-
$readonly |
+ |
text('button') . qq|> |
|;
$button2 = qq|
- $readonly |
+ |
text('button') . qq|> |
|;
@@ -375,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|')|;
@@ -396,6 +407,11 @@ selectvendor } |
{locked}>
+
+
+
+
+
| . ($form->{saved_message} ? qq|$form->{saved_message}
| : "") . qq|
@@ -411,7 +427,7 @@ selectvendor } |
| . $locale->text('Vendor') . qq| |
- $vendor |
+ $vendor |
@@ -483,8 +499,6 @@ $jsscript
. $locale->text('Amount') . qq|
|
. $locale->text('Tax') . qq| |
- |
- . $locale->text('Korrektur') . qq| |
|
. $locale->text('Taxkey') . qq| |
|
@@ -540,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,
@@ -552,8 +564,7 @@ $jsscript
|
$selectAP_amount |
{"amount_$i"}> |
- {"tax_$i"}> |
- |
+ $form->{"tax_$i"} |
$tax
$projectnumber |
@@ -688,7 +699,7 @@ $jsscript
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
$column_data{"datepaid_$i"} =
qq|
- | |;
+ |;
$column_data{"source_$i"} =
qq| | |;
$column_data{"memo_$i"} =
@@ -743,13 +754,24 @@ $jsscript
sub form_footer {
$lxdebug->enter_sub();
+ $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
+
-
-{login}>
-{password}>
|
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
@@ -778,13 +800,13 @@ sub form_footer {
|;
}
-
# ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
- print qq| |
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap') && !$form->{paid_1});
+ print qq| |
+ if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($total_paid == 0) || ($total_paid eq "")));
print qq|
+
|;
} elsif (($transdate > $closedto) && !$form->{id}) {
print qq|
@@ -793,13 +815,12 @@ sub form_footer {
}
# button for saving history
if($form->{id} ne "") {
- print qq| |;
+ print qq| |;
}
# /button for saving history
# mark_as_paid button
if($form->{id} ne "") {
- print qq||;
+ print qq| |;
}
# /mark_as_paid button
print "
@@ -814,21 +835,29 @@ sub form_footer {
sub mark_as_paid {
$lxdebug->enter_sub();
+
+ $auth->assert('general_ledger');
+
&mark_as_paid_common(\%myconfig,"ap");
+
$lxdebug->leave_sub();
}
sub update {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
my $display = shift;
$form->{invtotal} = 0;
+ delete @{ $form }{ grep { m/^tax_\d+$/ } keys %{ $form } };
+
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
- @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id);
+ @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id taxchart);
$count = 0;
for $i (1 .. $form->{rowcount}) {
$form->{"amount_$i"} =
@@ -837,17 +866,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);
@@ -860,18 +887,20 @@ 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);
- $form->{AP} = $save_AP;
+ my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1);
+
+ &check_name("vendor");
+
+ $form->{AP} = $saved_variables{AP};
+ if ($saved_variables{AP_amount_1} =~ m/.--./) {
+ map { $form->{$_} = $saved_variables{$_} } qw(AP_amount_1 taxchart_1);
+ } else {
+ delete $form->{taxchart_1};
+ }
$form->{rowcount} = $count + 1;
@@ -887,13 +916,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"};
}
}
@@ -903,6 +927,9 @@ sub update {
$form->{oldinvtotal} = $form->{invtotal};
$form->{oldtotalpaid} = $totalpaid;
+ # notes
+ $form->{notes} = $form->{intnotes};
+
&display_form;
$lxdebug->leave_sub();
@@ -912,6 +939,8 @@ sub update {
sub post_payment {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for $i (1 .. $form->{paidaccounts}) {
@@ -921,7 +950,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}
@@ -946,6 +975,8 @@ sub post_payment {
sub post {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
# check if there is a vendor, invoice and due date
$form->isblank("transdate", $locale->text("Invoice Date missing!"));
$form->isblank("duedate", $locale->text("Due Date missing!"));
@@ -953,7 +984,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}) {
@@ -976,7 +1007,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}
@@ -1023,6 +1054,8 @@ sub post {
sub post_as_new {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->{postasnew} = 1;
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
@@ -1039,6 +1072,8 @@ sub post_as_new {
sub use_as_template {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
@@ -1051,6 +1086,8 @@ sub use_as_template {
sub delete {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->{title} = $locale->text('Confirm!');
$form->header;
@@ -1064,6 +1101,7 @@ sub delete {
|;
foreach $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
}
@@ -1088,6 +1126,9 @@ sub delete {
sub yes {
$lxdebug->enter_sub();
+
+ $auth->assert('general_ledger');
+
if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
# saving the history
if(!exists $form->{addition}) {
@@ -1106,6 +1147,8 @@ sub yes {
sub search {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger | vendor_invoice_edit');
+
# setup vendor selection
$form->all_vc(\%myconfig, "vendor", "AP");
@@ -1298,8 +1341,6 @@ $jsscript
{nextsub}>
-{login}>
-{password}>
@@ -1333,9 +1374,11 @@ sub create_subtotal_row {
sub ap_transactions {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger | vendor_invoice_edit');
+
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
- $form->{sort} ||= 'transdate';
+ report_generator_set_default_sort('transdate', 1);
AP->ap_transactions(\%myconfig, \%$form);
@@ -1372,9 +1415,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);
@@ -1385,48 +1428,27 @@ sub ap_transactions {
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('ap_transactions', @hidden_variables);
+ $report->set_export_options('ap_transactions', @hidden_variables, qw(sort sortdir));
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
my @options;
- if ($form->{vendor}) {
- push @options, $locale->text('Vendor') . " : $form->{vendor}";
- }
- if ($form->{department}) {
- ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
- }
- if ($form->{invnumber}) {
- push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
- }
- if ($form->{ordnumber}) {
- push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
- }
- if ($form->{notes}) {
- push @options, $locale->text('Notes') . " : $form->{notes}";
- }
- if ($form->{transaction_description}) {
- push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
- }
- if ($form->{transdatefrom}) {
- 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);
- }
- if ($form->{open}) {
- push @options, $locale->text('Open');
- }
- if ($form->{closed}) {
- push @options, $locale->text('Closed');
- }
+ push @options, $locale->text('Vendor') . " : $form->{vendor}" if ($form->{vendor});
+ push @options, $locale->text('Department') . " : " . (split /--/, $form->{department})[0] if ($form->{department});
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if ($form->{invnumber});
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if ($form->{ordnumber});
+ push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
+ push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if ($form->{transaction_description});
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if ($form->{transdatefrom});
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if ($form->{transdateto});
+ push @options, $locale->text('Open') if ($form->{open});
+ push @options, $locale->text('Closed') if ($form->{closed});
$report->set_options('top_info_text' => join("\n", @options),
'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
'output_format' => 'HTML',
'title' => $form->{title},
- 'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
+ 'attachment_basename' => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time),
);
$report->set_options_from_form();
@@ -1452,9 +1474,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 = { };
@@ -1492,6 +1525,8 @@ sub ap_transactions {
sub storno {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
if (IS->has_storno(\%myconfig, $form, 'ap')) {
$form->{title} = $locale->text("Cancel Accounts Payables Transaction");
$form->error($locale->text("Transaction has already been cancelled!"));