-
-
-
-$jsscript
+
+
+
+ |
+ . $locale->text('Account') . qq| |
+ |
+ . $locale->text('Amount') . qq| |
+ |
+ . $locale->text('Tax') . qq| |
+ |
+ . $locale->text('Korrektur') . qq| |
+ |
+ . $locale->text('Taxkey') . qq| |
+ |
+ . $locale->text('Project') . qq| |
+
|;
- $amount = $locale->text('Amount');
+ $amount = $locale->text('Amount');
$project = $locale->text('Project');
- for $i (1 .. 1) {
-
-# $form->{"selectAP_amount"} =~ s/ selected//;
-# $form->{"selectAP_amount"} =~ s/option>\Q$form->{"AP_amount_$i"}\E/option selected>$form->{"AP_amount_$i"}/;
+ for $i (1 .. $form->{rowcount}) {
# format amounts
- $form->{"amount_$i"} = $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
+ $form->{"amount_$i"} =
+ $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
+ $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
+
+ my $selected_accno_full;
+ my ($accno_row) = split(/--/, $form->{"AP_amount_$i"});
+ my $item = $charts{$accno_row};
+ $selected_accno_full = "$item->{accno}--$item->{tax_id}";
+
+ my $selected_taxchart = $form->{"taxchart_$i"};
+ my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full);
+ my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_AP_amount_$i"});
+
+ if ($previous_accno &&
+ ($previous_accno eq $selected_accno) &&
+ ($previous_tax_id ne $selected_tax_id)) {
+ my $item = $taxcharts{$selected_tax_id};
+ $selected_taxchart = "$item->{id}--$item->{rate}";
+ }
+
+ $selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"});
+
+ $selectAP_amount =
+ NTI($cgi->popup_menu('-name' => "AP_amount_$i",
+ '-id' => "AP_amount_$i",
+ '-style' => 'width:400px',
+ '-onChange' => "setTaxkey(this, $i)",
+ '-values' => \@AP_amount_values,
+ '-labels' => \%AP_amount_labels,
+ '-default' => $selected_accno_full))
+ . $cgi->hidden('-name' => "previous_AP_amount_$i",
+ '-default' => $selected_accno_full);
+
+ $tax = qq|| .
+ NTI($cgi->popup_menu('-name' => "taxchart_$i",
+ '-id' => "taxchart_$i",
+ '-style' => 'width:200px',
+ '-values' => \@taxchart_values,
+ '-labels' => \%taxchart_labels,
+ '-default' => $selected_taxchart))
+ . qq| | |;
+
+ my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
+
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"project_id_$i"} ));
print qq|
- $amount |
- {"amount_$i"} $readonly> |
- $project |
-
- {"project_id_$i"}>
- |
- |
+ $selectAP_amount |
+ {"amount_$i"}> |
+ {"tax_$i"}> |
+ |
+ $tax
+ $projectnumber |
|;
- $amount = "";
+ $amount = "";
$project = "";
}
- $taxlabel = ($form->{taxincluded}) ? $locale->text('Tax Included') : $locale->text('Tax');
- # format and reverse tax
- $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 2);
-
- print qq|
-
- ${taxlabel} |
- {"tax"} $readonly> |
- |
- |.$locale->text('Correct Tax').qq| |
- |
-
-|;
-
-
-
-
+ $taxlabel =
+ ($form->{taxincluded})
+ ? $locale->text('Tax Included')
+ : $locale->text('Tax');
-
$form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
+ $APselected =
+ NTI($cgi->popup_menu('-name' => "APselected", '-id' => "APselected",
+ '-style' => 'width:400px',
+ '-values' => \@AP_values, '-labels' => \%AP_labels,
+ '-default' => $form->{APselected}));
print qq|
- |.$locale->text('Total').qq| |
- $form->{invtotal} |
+
+
+ |
+
+
+ ${APselected} |
+ $form->{invtotal} |
{oldinvtotal}>
{oldtotalpaid}>
-
+
-
- |
- |
-
-
-
-
- |.$locale->text('Notes').qq| |
- $notes |
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+ | . $locale->text('Notes') . qq| |
+ $notes |
|
@@ -527,23 +711,23 @@ $jsscript
- |.$locale->text('Payments').qq| |
+ | . $locale->text('Payments') . qq| |
|;
-
if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AP_paid);
+ @column_index = qw(datepaid source memo paid AP_paid paid_project_id);
} else {
- @column_index = qw(datepaid source memo paid exchangerate AP_paid);
+ @column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id);
}
- $column_data{datepaid} = "".$locale->text('Date')." | ";
- $column_data{paid} = "".$locale->text('Amount')." | ";
- $column_data{exchangerate} = "".$locale->text('Exch')." | ";
- $column_data{AP_paid} = "".$locale->text('Account')." | ";
- $column_data{source} = "".$locale->text('Source')." | ";
- $column_data{memo} = "".$locale->text('Memo')." | ";
+ $column_data{datepaid} = "" . $locale->text('Date') . " | ";
+ $column_data{paid} = "" . $locale->text('Amount') . " | ";
+ $column_data{exchangerate} = "" . $locale->text('Exch') . " | ";
+ $column_data{AP_paid} = "" . $locale->text('Account') . " | ";
+ $column_data{source} = "" . $locale->text('Source') . " | ";
+ $column_data{memo} = "" . $locale->text('Memo') . " | ";
+ $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | ";
print "
@@ -553,26 +737,36 @@ $jsscript
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
";
- $form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
- $form->{"selectAP_paid_$i"} =~ s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
+ $selectAP_paid =
+ NTI($cgi->popup_menu('-name' => "AP_paid_$i",
+ '-id' => "AP_paid_$i",
+ '-values' => \@AP_paid_values,
+ '-labels' => \%AP_paid_labels,
+ '-default' => $form->{"AP_paid_$i"}));
-
# format amounts
- $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
- $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
+ if ($form->{"paid_$i"}) {
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ }
+ $form->{"exchangerate_$i"} =
+ $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+
$exchangerate = qq| |;
if ($form->{currency} ne $form->{defaultcurrency}) {
if ($form->{"forex_$i"}) {
- $exchangerate = qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
+ $exchangerate =
+ qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
} else {
- $exchangerate = qq|{"exchangerate_$i"}>|;
+ $exchangerate =
+ qq|{"exchangerate_$i"}>|;
}
}
@@ -580,24 +774,37 @@ $jsscript
{"forex_$i"}>
|;
- $column_data{"paid_$i"} = qq|{"paid_$i"}> | |;
- $column_data{"AP_paid_$i"} = qq| | |;
+ $column_data{"paid_$i"} =
+ qq|{"paid_$i"}> | |;
+ $column_data{"AP_paid_$i"} =
+ qq|${selectAP_paid} | |;
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
- $column_data{"datepaid_$i"} = qq|{"datepaid_$i"}> | |;
- $column_data{"source_$i"} = qq| | |;
- $column_data{"memo_$i"} = qq| | |;
-
+ $column_data{"datepaid_$i"} =
+ qq|{"datepaid_$i"}>
+ | |;
+ $column_data{"source_$i"} =
+ qq| | |;
+ $column_data{"memo_$i"} =
+ qq| | |;
+ $column_data{"paid_project_id_$i"} =
+ qq||
+ . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"paid_project_id_$i"} ))
+ . qq| | |;
+
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
- map { $form->{$_} =~ s/\"/"/g } qw(selectAP_paid);
- print qq|
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
{paidaccounts}>
-
-
+
|
@@ -610,56 +817,76 @@ $jsscript
$lxdebug->leave_sub();
}
-
sub form_footer {
$lxdebug->enter_sub();
-
print qq|
+
{path}>
{login}>
{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
|;
+ if (!$form->{id} && $form->{draft_id}) {
+ print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
+ '-value' => 1, '-checked' => $form->{remove_draft},
+ '-label' => '')) .
+ qq| |);
+ }
+
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
- if ($form->{id} && $form->{radier}) {
-# print qq|
-# |;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
- print qq|
-
-
-|;
- }
- }
+ $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+
+ print qq||;
- if ($transdate > $closedto) {
+ if ($form->{id}) {
+
+ # print qq|
+ # |;
+ if ($form->{radier}) {
print qq|
-
+
+
|;
}
- } else {
- if (($transdate > $closedto) && !$form->{id}) {
- print qq|
- |;
- }
+ print qq|
+
+
+|;
+ } elsif (($transdate > $closedto) && !$form->{id}) {
+ print qq|
+ | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ {id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
}
-
+ # /button for saving history
print "
@@ -670,144 +897,164 @@ sub form_footer {
$lxdebug->leave_sub();
}
-
sub update {
$lxdebug->enter_sub();
my $display = shift;
-# if ($display) {
-# goto TAXCALC;
-# }
-
$form->{invtotal} = 0;
+ map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+ qw(exchangerate creditlimit creditremaining);
-
- $form->{selectAP_amount} = $form->{AP_amount};
- $form->{selectAP_amount} =~ s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
-
-
- $form->{selectAP} = $form->{AP};
- $form->{selectAP} =~ s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
-
- ($AP_amountaccno, $AP_amounttaxkey) = split(/--/, $form->{AP_amountselected});
- $form->{selecttaxchart} = $form->{taxchart};
- $form->{selecttaxchart} =~ s/value=\"$AP_amounttaxkey--([^\"]*)\"/value=\"$AP_amounttaxkey--$1\" selected/;
-
- $form->{rate} = $1;
-
- 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);
$count = 0;
- for $i (1 .. 1) {
- $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"});
+ for $i (1 .. $form->{rowcount}) {
+ $form->{"amount_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"amount_$i"});
+ $form->{"tax_$i"} = $form->parse_amount(\%myconfig, $form->{"tax_$i"});
if ($form->{"amount_$i"}) {
push @a, {};
- my $j = $#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;
+ }
+ } else {
+ $form->{"tax_$i"} = 0;
+ }
+ }
+ $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
+
+ $totaltax += $form->{"tax_$i"};
map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
$count++;
}
}
$form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
-
- $form->{invtotal} += $form->{"amount_1"};
-
- $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, 'sell')));
+
+ 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->{invdate} = $form->{transdate};
$save_AP = $form->{AP};
&check_name(vendor);
$form->{AP} = $save_AP;
- &check_project;
+ $form->{rowcount} = $count + 1;
+ $form->{invtotal} =
+ ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
-TAXCALC:
- # recalculate taxes
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+ map {
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ } qw(paid exchangerate);
- @taxaccounts = split / /, $form->{taxaccounts};
+ $totalpaid += $form->{"paid_$i"};
- $form->{"tax"} = $form->parse_amount(\%myconfig, $form->{"tax"});
-
- if ($form->{taxincluded} && $form->{"rate"}) {
- $taxrate = $form->{"rate"};
- $withholdingrate = 0;
+ $form->{"exchangerate_$i"} = $exchangerate
+ if (
+ $form->{"forex_$i"} = (
+ $exchangerate =
+ $form->check_exchangerate(
+ \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'
+ )));
+ }
+ }
- $amount = $form->round_amount(($form->{invtotal} - ($form->{invtotal} / ($taxrate + 1))), 2);
- $form->{"tax"} = $form->round_amount($amount, 2);
- $taxdiff += ($amount - $form->{"tax"});
+ $form->{creditremaining} -=
+ ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} -
+ $form->{oldinvtotal});
+ $form->{oldinvtotal} = $form->{invtotal};
+ $form->{oldtotalpaid} = $totalpaid;
-
- if (abs $taxdiff >= 0.005) {
- $form->{"tax"} += $form->round_amount($taxdiff, 2);
- $taxdiff = 0;
- }
- $totaltax += $form->{"tax"};
-
- } else {
- $form->{"tax"} = $form->round_amount($form->{invtotal} * $form->{"rate"}, 2);
- $totaltax += $form->{"tax"};
-
- }
+ &display_form;
- $form->{invtotal} = ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
-
+ $lxdebug->leave_sub();
+}
+
+
+sub post_payment {
+ $lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
- map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
+ $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
- $totalpaid += $form->{"paid_$i"};
-
- $form->{"exchangerate_$i"} = $exchangerate if ($form->{"forex_$i"} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell')));
+ $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->{currency} ne $form->{defaultcurrency}) {
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
+ }
}
}
- $form->{creditremaining} -= ($form->{invtotal} - $totalpaid + $form->{oldtotalpaid} - $form->{oldinvtotal});
- $form->{oldinvtotal} = $form->{invtotal};
- $form->{oldtotalpaid} = $totalpaid;
-
- &display_form;
+ ($form->{AP}) = split /--/, $form->{AP};
+ ($form->{AP_paid}) = split /--/, $form->{AP_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AP->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
$lxdebug->leave_sub();
}
-
-
+
+
sub post {
$lxdebug->enter_sub();
-
# 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!"));
- $form->isblank("vendor", $locale->text('Vendor missing!'));
-
-
- $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+ $form->isblank("duedate", $locale->text("Due Date missing!"));
+ $form->isblank("vendor", $locale->text('Vendor missing!'));
+
+ $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 ($transdate <= $closedto);
- $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency});
+ $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
+ if ($form->{currency} ne $form->{defaultcurrency});
delete($form->{AP});
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
- $form->error($locale->text('Cannot post payment for a closed period!')) if ($datepaid <= $closedto);
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($datepaid <= $closedto);
if ($form->{currency} ne $form->{defaultcurrency}) {
- $form->{"exchangerate_$i"} = $form->{exchangerate} if ($transdate == $datepaid);
- $form->isblank("exchangerate_$i", $locale->text('Exchangerate for payment missing!'));
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($transdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
}
-
+
}
}
-
# if old vendor ne vendor redo form
($vendor) = split /--/, $form->{vendor};
@@ -815,43 +1062,66 @@ sub post {
&update;
exit;
}
- ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
- ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
- ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
+ ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
+ ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
+ ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
$form->{AP}{amount_1} = $debitaccno;
$form->{AP}{payables} = $payablesaccno;
- $form->{taxkey} = $taxkey;
-
+ $form->{taxkey} = $taxkey;
+
$form->{id} = 0 if $form->{postasnew};
- $form->redirect($locale->text('Transaction posted!')) if (AP->post_transaction(\%myconfig, \%$form));
+ if (AP->post_transaction(\%myconfig, \%$form)) {
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ remove_draft() if $form->{remove_draft};
+ $form->redirect($locale->text('Transaction posted!'));
+ }
$form->error($locale->text('Cannot post transaction!'));
-
+
$lxdebug->leave_sub();
}
-
sub post_as_new {
$lxdebug->enter_sub();
-
$form->{postasnew} = 1;
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED AS NEW";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&post;
$lxdebug->leave_sub();
}
+sub use_as_template {
+ $lxdebug->enter_sub();
+
+ 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}--;
+ $form->{invdate} = $form->current_date(\%myconfig);
+ &update;
+
+ $lxdebug->leave_sub();
+}
sub delete {
$lxdebug->enter_sub();
-
$form->{title} = $locale->text('Confirm!');
-
+
$form->header;
delete $form->{header};
-
+
print qq|
@@ -859,16 +1129,19 @@ sub delete {
|;
foreach $key (keys %$form) {
- $form->{$key} =~ s/\"/"/g;
+ $form->{$key} =~ s/\"/"/g;
print qq|\n|;
}
print qq|
$form->{title}
-|.$locale->text('Are you sure you want to delete Transaction').qq| $form->{invnumber}
+|
+ . $locale->text('Are you sure you want to delete Transaction')
+ . qq| $form->{invnumber}
-
+
@@ -878,43 +1151,49 @@ sub delete {
$lxdebug->leave_sub();
}
-
-
sub yes {
$lxdebug->enter_sub();
-
-
- $form->redirect($locale->text('Transaction deleted!')) if (AP->delete_transaction(\%myconfig, \%$form, $spool));
+ if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ $form->redirect($locale->text('Transaction deleted!'));
+ }
$form->error($locale->text('Cannot delete transaction!'));
$lxdebug->leave_sub();
}
-
sub search {
$lxdebug->enter_sub();
-
# setup vendor selection
$form->all_vc(\%myconfig, "vendor", "AP");
if (@{ $form->{all_vendor} }) {
- map { $vendor .= "\n";
- map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} });
+ map {
+ $form->{selectdepartment} .=
+ "$_->{description}--$_->{id}\n"
+ } (@{ $form->{all_departments} });
}
$department = qq|
- |.$locale->text('Department').qq| |
+ | . $locale->text('Department') . qq| |
|
| if $form->{selectdepartment};
@@ -923,30 +1202,47 @@ sub search {
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
- $jsscript = "";
- if ($form->{jsscript})
- {
+ $jsscript = "";
+ if ($form->{jsscript}) {
+
# with JavaScript Calendar
$button1 = qq|
- text('button').qq|> |
+ text('button') . qq|>
|;
- $button2 = qq|
+ $button2 = qq|
- text('button').qq|> |
+ text('button') . qq|>
|;
+
#write Trigger
- $jsscript = Form->write_trigger(\%myconfig,"2","transdatefrom","BR","trigger1","transdateto","BL","trigger2");
- }
- else
- {
- # without JavaScript Calendar
- $button1 = qq|
+ $jsscript =
+ Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger1",
+ "transdateto", "BL", "trigger2");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 = qq|
| |;
- $button2 = qq|
+ $button2 = qq|
| |;
- }
-
+ }
+
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 });
+
+ my %labels = ();
+ my @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+ '-labels' => \%labels));
+
$form->header;
print qq|
@@ -963,26 +1259,30 @@ sub search {
- |.$locale->text('Vendor').qq| |
+ | . $locale->text('Vendor') . qq| |
$vendor |
$department
- |.$locale->text('Invoice Number').qq| |
+ | . $locale->text('Invoice Number') . qq| |
|
- |.$locale->text('Order Number').qq| |
+ | . $locale->text('Order Number') . qq| |
|
- |.$locale->text('Notes').qq| |
+ | . $locale->text('Notes') . qq| |
|
+
+ | . $locale->text("Project Number") . qq| |
+ $projectnumber |
+
- |.$locale->text('From').qq| |
+ | . $locale->text('From') . qq| |
$button1
- |.$locale->text('Bis').qq| |
+ | . $locale->text('Bis') . qq| |
$button2
@@ -993,56 +1293,58 @@ sub search {
- |.$locale->text('Include in Report').qq| |
+ | . $locale->text('Include in Report') . qq| |
|
@@ -1063,7 +1365,8 @@ $jsscript
{login}>
{password}>
-
+
@@ -1073,114 +1376,151 @@ $jsscript
$lxdebug->leave_sub();
}
-
sub ap_transactions {
$lxdebug->enter_sub();
-
$form->{vendor} = $form->unescape($form->{vendor});
($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor});
AP->ap_transactions(\%myconfig, \%$form);
- $callback = "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+ $callback =
+ "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}";
$href = $callback;
-
if ($form->{vendor}) {
- $callback .= "&vendor=".$form->escape($form->{vendor},1);
- $href .= "&vendor=".$form->escape($form->{vendor});
- $option .= $locale->text('Vendor')." : $form->{vendor}";
+ $callback .= "&vendor=" . $form->escape($form->{vendor}, 1);
+ $href .= "&vendor=" . $form->escape($form->{vendor});
+ $option .= $locale->text('Vendor') . " : $form->{vendor}";
}
if ($form->{department}) {
- $callback .= "&department=".$form->escape($form->{department},1);
- $href .= "&department=".$form->escape($form->{department});
+ $callback .= "&department=" . $form->escape($form->{department}, 1);
+ $href .= "&department=" . $form->escape($form->{department});
($department) = split /--/, $form->{department};
$option .= "\n " if ($option);
- $option .= $locale->text('Department')." : $department";
+ $option .= $locale->text('Department') . " : $department";
}
if ($form->{invnumber}) {
- $callback .= "&invnumber=".$form->escape($form->{invnumber},1);
- $href .= "&invnumber=".$form->escape($form->{invnumber});
+ $callback .= "&invnumber=" . $form->escape($form->{invnumber}, 1);
+ $href .= "&invnumber=" . $form->escape($form->{invnumber});
$option .= "\n " if ($option);
- $option .= $locale->text('Invoice Number')." : $form->{invnumber}";
+ $option .= $locale->text('Invoice Number') . " : $form->{invnumber}";
}
if ($form->{ordnumber}) {
- $callback .= "&ordnumber=".$form->escape($form->{ordnumber},1);
- $href .= "&ordnumber=".$form->escape($form->{ordnumber});
+ $callback .= "&ordnumber=" . $form->escape($form->{ordnumber}, 1);
+ $href .= "&ordnumber=" . $form->escape($form->{ordnumber});
$option .= "\n " if ($option);
- $option .= $locale->text('Order Number')." : $form->{ordnumber}";
+ $option .= $locale->text('Order Number') . " : $form->{ordnumber}";
}
if ($form->{notes}) {
- $callback .= "¬es=".$form->escape($form->{notes},1);
- $href .= "¬es=".$form->escape($form->{notes});
+ $callback .= "¬es=" . $form->escape($form->{notes}, 1);
+ $href .= "¬es=" . $form->escape($form->{notes});
$option .= "\n " if $option;
- $option .= $locale->text('Notes')." : $form->{notes}";
+ $option .= $locale->text('Notes') . " : $form->{notes}";
}
-
+
if ($form->{transdatefrom}) {
$callback .= "&transdatefrom=$form->{transdatefrom}";
- $href .= "&transdatefrom=$form->{transdatefrom}";
- $option .= "\n " if ($option);
- $option .= $locale->text('From')." ".$locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ $href .= "&transdatefrom=$form->{transdatefrom}";
+ $option .= "\n " if ($option);
+ $option .=
+ $locale->text('From') . " "
+ . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
$callback .= "&transdateto=$form->{transdateto}";
- $href .= "&transdateto=$form->{transdateto}";
- $option .= "\n " if ($option);
- $option .= $locale->text('Bis')." ".$locale->date(\%myconfig, $form->{transdateto}, 1);
+ $href .= "&transdateto=$form->{transdateto}";
+ $option .= "\n " if ($option);
+ $option .=
+ $locale->text('Bis') . " "
+ . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
$callback .= "&open=$form->{open}";
- $href .= "&open=$form->{open}";
- $option .= "\n " if ($option);
- $option .= $locale->text('Open');
+ $href .= "&open=$form->{open}";
+ $option .= "\n " if ($option);
+ $option .= $locale->text('Open');
}
if ($form->{closed}) {
$callback .= "&closed=$form->{closed}";
- $href .= "&closed=$form->{closed}";
- $option .= "\n " if ($option);
- $option .= $locale->text('Closed');
+ $href .= "&closed=$form->{closed}";
+ $option .= "\n " if ($option);
+ $option .= $locale->text('Closed');
+ }
+ if ($form->{globalproject_id}) {
+ $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+ $href .= "&globalproject_id=" . E($form->{globalproject_id});
}
- @columns = $form->sort_columns(qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee));
+ @columns =
+ qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+ due duedate notes employee globalprojectnumber);
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
-
+
# add column to href and callback
$callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
+ $href .= "&l_$item=Y";
}
}
-
+
if ($form->{l_subtotal} eq 'Y') {
$callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
+ $href .= "&l_subtotal=Y";
}
-
-
- $column_header{id} = qq||.$locale->text('ID').qq| | |;
- $column_header{transdate} = qq||.$locale->text('Date').qq| | |;
- $column_header{duedate} = qq||.$locale->text('Due Date').qq| | |;
- $column_header{due} = qq||.$locale->text('Amount Due').qq| | |;
- $column_header{invnumber} = qq||.$locale->text('Invoice').qq| | |;
- $column_header{ordnumber} = qq||.$locale->text('Order').qq| | |;
- $column_header{name} = qq||.$locale->text('Vendor').qq| | |;
- $column_header{netamount} = qq||.$locale->text('Amount').qq| | |;
- $column_header{tax} = qq||.$locale->text('Tax').qq| | |;
- $column_header{amount} = qq||.$locale->text('Total').qq| | |;
- $column_header{paid} = qq||.$locale->text('Paid').qq| | |;
- $column_header{datepaid} = qq||.$locale->text('Date Paid').qq| | |;
- $column_header{notes} = qq||.$locale->text('Notes').qq| | |;
- $column_header{employee} = "".$locale->text('Employee')." | ";
-
-
+
+ $column_header{id} =
+ qq||
+ . $locale->text('ID')
+ . qq| | |;
+ $column_header{transdate} =
+ qq||
+ . $locale->text('Date')
+ . qq| | |;
+ $column_header{duedate} =
+ qq||
+ . $locale->text('Due Date')
+ . qq| | |;
+ $column_header{due} =
+ qq|| . $locale->text('Amount Due') . qq| | |;
+ $column_header{invnumber} =
+ qq||
+ . $locale->text('Invoice')
+ . qq| | |;
+ $column_header{ordnumber} =
+ qq||
+ . $locale->text('Order')
+ . qq| | |;
+ $column_header{name} =
+ qq||
+ . $locale->text('Vendor')
+ . qq| | |;
+ $column_header{netamount} =
+ qq|| . $locale->text('Amount') . qq| | |;
+ $column_header{tax} =
+ qq|| . $locale->text('Tax') . qq| | |;
+ $column_header{amount} =
+ qq|| . $locale->text('Total') . qq| | |;
+ $column_header{paid} =
+ qq|| . $locale->text('Paid') . qq| | |;
+ $column_header{datepaid} =
+ qq||
+ . $locale->text('Date Paid')
+ . qq| | |;
+ $column_header{notes} =
+ qq|| . $locale->text('Notes') . qq| | |;
+ $column_header{employee} =
+ ""
+ . $locale->text('Employee') . " | ";
+ $column_header{globalprojectnumber} =
+ qq|| . $locale->text('Project Number') . qq| | |;
+
$form->{title} = $locale->text('AP Transactions');
$form->header;
-
+
print qq|
@@ -1209,56 +1549,72 @@ sub ap_transactions {
$callback = $form->escape($form->{callback});
if (@{ $form->{AP} }) {
- $sameitem = $form->{AP}->[0]->{$form->{sort}};
+ $sameitem = $form->{AP}->[0]->{ $form->{sort} };
}
-
+
# sums and tax on reports by Antonio Gallardo
#
foreach $ap (@{ $form->{AP} }) {
if ($form->{l_subtotal} eq 'Y') {
- if ($sameitem ne $ap->{$form->{sort}}) {
- &ap_subtotal;
- $sameitem = $ap->{$form->{sort}};
+ if ($sameitem ne $ap->{ $form->{sort} }) {
+ &ap_subtotal;
+ $sameitem = $ap->{ $form->{sort} };
}
}
-
- $column_data{netamount} = "".$form->format_amount(\%myconfig, $ap->{netamount}, 2, " ")." | ";
- $column_data{tax} = "".$form->format_amount(\%myconfig, $ap->{amount} - $ap->{netamount}, 2, " ") . " | ";
- $column_data{amount} = "".$form->format_amount(\%myconfig, $ap->{amount}, 2, " ") . " | ";
- $column_data{paid} = "".$form->format_amount(\%myconfig, $ap->{paid}, 2, " ")." | ";
- $column_data{due} = "".$form->format_amount(\%myconfig, $ap->{amount} - $ap->{paid}, 2, " ")." | ";
+
+ $column_data{netamount} =
+ ""
+ . $form->format_amount(\%myconfig, $ap->{netamount}, 2, " ")
+ . " | ";
+ $column_data{tax} = ""
+ . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{netamount},
+ 2, " ")
+ . " | ";
+ $column_data{amount} =
+ ""
+ . $form->format_amount(\%myconfig, $ap->{amount}, 2, " ") . " | ";
+ $column_data{paid} =
+ ""
+ . $form->format_amount(\%myconfig, $ap->{paid}, 2, " ") . " | ";
+ $column_data{due} = ""
+ . $form->format_amount(\%myconfig, $ap->{amount} - $ap->{paid},
+ 2, " ")
+ . " | ";
$totalnetamount += $ap->{netamount};
- $totalamount += $ap->{amount};
- $totalpaid += $ap->{paid};
- $totaldue += ($ap->{amount} - $ap->{paid});
+ $totalamount += $ap->{amount};
+ $totalpaid += $ap->{paid};
+ $totaldue += ($ap->{amount} - $ap->{paid});
$subtotalnetamount += $ap->{netamount};
- $subtotalamount += $ap->{amount};
- $subtotalpaid += $ap->{paid};
- $subtotaldue += ($ap->{amount} - $ap->{paid});
+ $subtotalamount += $ap->{amount};
+ $subtotalpaid += $ap->{paid};
+ $subtotaldue += ($ap->{amount} - $ap->{paid});
$column_data{transdate} = "$ap->{transdate} | ";
- $column_data{duedate} = "$ap->{duedate} | ";
- $column_data{datepaid} = "$ap->{datepaid} | ";
+ $column_data{duedate} = "$ap->{duedate} | ";
+ $column_data{datepaid} = "$ap->{datepaid} | ";
$module = ($ap->{invoice}) ? "ir.pl" : $form->{script};
- $column_data{invnumber} = qq|$ap->{invnumber} | |;
- $column_data{id} = "$ap->{id} | ";
+ $column_data{invnumber} =
+ qq|$ap->{invnumber} | |;
+ $column_data{id} = "$ap->{id} | ";
$column_data{ordnumber} = "$ap->{ordnumber} | ";
- $column_data{name} = "$ap->{name} | ";
+ $column_data{name} = "$ap->{name} | ";
$ap->{notes} =~ s/\r\n/ /g;
- $column_data{notes} = "$ap->{notes} | ";
+ $column_data{notes} = "$ap->{notes} | ";
$column_data{employee} = "$ap->{employee} | ";
-
+ $column_data{globalprojectnumber} =
+ "" . H($ap->{globalprojectnumber}) . " | ";
+
$i++;
$i %= 2;
print "
";
-
+
map { print "\n$column_data{$_}" } @column_index;
print qq|
@@ -1266,23 +1622,34 @@ sub ap_transactions {
|;
}
-
+
if ($form->{l_subtotal} eq 'Y') {
&ap_subtotal;
}
-
+
# print totals
print qq|
|;
-
+
map { $column_data{$_} = " | " } @column_index;
-
- $column_data{netamount} = "".$form->format_amount(\%myconfig, $totalnetamount, 2, " ")." | ";
- $column_data{tax} = "".$form->format_amount(\%myconfig, $totalamount - $totalnetamount, 2, " ")." | ";
- $column_data{amount} = "".$form->format_amount(\%myconfig, $totalamount, 2, " ")." | ";
- $column_data{paid} = "".$form->format_amount(\%myconfig, $totalpaid, 2, " ")." | ";
- $column_data{due} = "".$form->format_amount(\%myconfig, $totaldue, 2, " ")." | ";
+
+ $column_data{netamount} =
+ ""
+ . $form->format_amount(\%myconfig, $totalnetamount, 2, " ") . " | ";
+ $column_data{tax} = ""
+ . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
+ 2, " ")
+ . " | ";
+ $column_data{amount} =
+ ""
+ . $form->format_amount(\%myconfig, $totalamount, 2, " ") . " | ";
+ $column_data{paid} =
+ ""
+ . $form->format_amount(\%myconfig, $totalpaid, 2, " ") . " | ";
+ $column_data{due} =
+ ""
+ . $form->format_amount(\%myconfig, $totaldue, 2, " ") . " | ";
map { print "$column_data{$_}\n" } @column_index;
@@ -1293,28 +1660,24 @@ sub ap_transactions {
|
-
+
@@ -1324,26 +1687,36 @@ sub ap_transactions {
$lxdebug->leave_sub();
}
-
sub ap_subtotal {
$lxdebug->enter_sub();
-
map { $column_data{$_} = " | | " } @column_index;
-
- $column_data{netamount} = "".$form->format_amount(\%myconfig, $subtotalnetamount, 2, " ")." | ";
- $column_data{tax} = "".$form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount, 2, " ")." | ";
- $column_data{amount} = "".$form->format_amount(\%myconfig, $subtotalamount, 2, " ")." | ";
- $column_data{paid} = "".$form->format_amount(\%myconfig, $subtotalpaid, 2, " ")." | ";
- $column_data{due} = "".$form->format_amount(\%myconfig, $subtotaldue, 2, " ")." | ";
+
+ $column_data{netamount} =
+ ""
+ . $form->format_amount(\%myconfig, $subtotalnetamount, 2, " ")
+ . " | ";
+ $column_data{tax} = ""
+ . $form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount,
+ 2, " ")
+ . " | ";
+ $column_data{amount} =
+ ""
+ . $form->format_amount(\%myconfig, $subtotalamount, 2, " ") . " | ";
+ $column_data{paid} =
+ ""
+ . $form->format_amount(\%myconfig, $subtotalpaid, 2, " ") . " | ";
+ $column_data{due} =
+ ""
+ . $form->format_amount(\%myconfig, $subtotaldue, 2, " ") . " | ";
$subtotalnetamount = 0;
- $subtotalamount = 0;
- $subtotalpaid = 0;
- $subtotaldue = 0;
+ $subtotalamount = 0;
+ $subtotalpaid = 0;
+ $subtotaldue = 0;
print "";
-
+
map { print "\n$column_data{$_}" } @column_index;
print qq|
@@ -1352,6 +1725,3 @@ sub ap_subtotal {
$lxdebug->leave_sub();
}
-
-
-
| |