-
-
-
-$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');
$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->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2);
+ $selectAP_amount = $selectAP_amount_unquoted;
+ $re_amount = quotemeta($form->{"AP_amount_$i"});
+ $selectAP_amount =~
+ s/option value=\"${re_amount}\"/option value=\"$form->{"AP_amount_$i"}\" selected/;
+ $tax = $taxchart;
+ $tax_selected = $form->{"taxchart_$i"};
+ $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
+ $tax =
+ 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"}>
- |
- |
+ |
+ {"amount_$i"}> |
+ {"tax_$i"}> |
+ |
+ $tax
+ $projectnumber |
|;
$amount = "";
@@ -539,39 +607,37 @@ $jsscript
? $locale->text('Tax Included')
: $locale->text('Tax');
- # format and reverse tax
- $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 2);
+ $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
print qq|
- ${taxlabel} |
- {"tax"} $readonly> |
- |
- | . $locale->text('Correct Tax') . qq| |
- |
+
+
+ |
-|;
-
- $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
-
- print qq|
- | . $locale->text('Total') . qq| |
- $form->{invtotal} |
+ |
+
+ $form->{invtotal} |
{oldinvtotal}>
{oldtotalpaid}>
- |
- |
-
+ |
-
-
- | . $locale->text('Notes') . qq| |
- $notes |
+
+
+
+ |
+
+
+
+
+
+ | . $locale->text('Notes') . qq| |
+ $notes |
|
@@ -580,14 +646,14 @@ $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') . " | ";
@@ -596,6 +662,7 @@ $jsscript
$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 "
@@ -605,6 +672,7 @@ $jsscript
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
@@ -616,8 +684,10 @@ $jsscript
s/option value=\"$form->{"AP_paid_$i"}\">/option value=\"$form->{"AP_paid_$i"}\" selected>/;
# format amounts
- $form->{"paid_$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"});
@@ -642,20 +712,30 @@ $jsscript
qq| | |;
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
$column_data{"datepaid_$i"} =
- qq|{"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}>
@@ -677,10 +757,15 @@ sub form_footer {
print qq|
+
{path}>
{login}>
{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
|;
@@ -688,43 +773,45 @@ sub form_footer {
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
- if ($form->{id} && $form->{radier}) {
+ print qq||;
+
+ if ($form->{id}) {
# print qq|
# |;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
- print qq|
+ if ($form->{radier}) {
+ print qq|
|;
- }
}
- if ($transdate > $closedto) {
- print qq|
+ print qq|
+ . $locale->text('Use As Template') . qq|">
+
|;
- }
-
- } else {
- if (($transdate > $closedto) && !$form->{id}) {
- print qq|
+ } elsif (($transdate > $closedto) && !$form->{id}) {
+ print qq|
|;
- }
+ . $locale->text('Post') . 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 "
@@ -746,13 +833,9 @@ sub update {
$form->{invtotal} = 0;
- $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/;
+ # $form->{selectAP_amount} = $form->{AP_amount};
+ # $form->{selectAP_amount} =~
+ # s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
($AP_amountaccno, $AP_amounttaxkey) =
split(/--/, $form->{AP_amountselected});
@@ -767,19 +850,35 @@ sub update {
@flds = qw(amount AP_amount projectnumber oldprojectnumber project_id);
$count = 0;
- for $i (1 .. 1) {
+ 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"};
+ map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
$form->{exchangerate} = $exchangerate
if (
@@ -794,45 +893,13 @@ sub update {
&check_name(vendor);
$form->{AP} = $save_AP;
- &check_project;
-
-TAXCALC:
-
- # recalculate taxes
-
- @taxaccounts = split / /, $form->{taxaccounts};
-
- $form->{"tax"} = $form->parse_amount(\%myconfig, $form->{"tax"});
-
- if ($form->{taxincluded} && $form->{"rate"}) {
- $taxrate = $form->{"rate"};
- $withholdingrate = 0;
-
- $amount =
- $form->round_amount(
- ($form->{invtotal} - ($form->{invtotal} / ($taxrate + 1))),
- 2);
- $form->{"tax"} = $form->round_amount($amount, 2);
- $taxdiff += ($amount - $form->{"tax"});
-
- 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"};
-
- }
+ $form->{rowcount} = $count + 1;
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
@@ -861,6 +928,38 @@ TAXCALC:
$lxdebug->leave_sub();
}
+
+sub post_payment {
+ $lxdebug->enter_sub();
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($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);
+
+ 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->{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();
@@ -880,7 +979,7 @@ sub post {
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!'));
@@ -913,8 +1012,16 @@ sub post {
$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();
@@ -924,11 +1031,29 @@ 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();
@@ -969,9 +1094,15 @@ sub delete {
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();
@@ -1019,14 +1150,12 @@ sub search {
$button1 = qq|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
$button2 = qq|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
#write Trigger
@@ -1042,6 +1171,19 @@ sub search {
| |;
}
+ $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|
@@ -1074,6 +1216,10 @@ sub search {
| . $locale->text('Notes') . qq| |
|
+
+ | . $locale->text("Project Number") . qq| |
+ $projectnumber |
+
| . $locale->text('From') . qq| |
$button1
@@ -1138,6 +1284,8 @@ sub search {
|
| . $locale->text('Subtotal') . qq| |
+ |
+ | . $locale->text('Project Number') . qq| |
|
@@ -1240,11 +1388,14 @@ sub ap_transactions {
$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)
- );
+ 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") {
@@ -1304,6 +1455,8 @@ sub ap_transactions {
$column_header{employee} =
""
. $locale->text('Employee') . " | ";
+ $column_header{globalprojectnumber} =
+ qq|| . $locale->text('Project Number') . qq| | |;
$form->{title} = $locale->text('AP Transactions');
@@ -1394,6 +1547,8 @@ sub ap_transactions {
$ap->{notes} =~ s/\r\n/ /g;
$column_data{notes} = "$ap->{notes} | ";
$column_data{employee} = "$ap->{employee} | ";
+ $column_data{globalprojectnumber} =
+ "" . H($ap->{globalprojectnumber}) . " | ";
$i++;
$i %= 2;
@@ -1462,14 +1617,8 @@ sub ap_transactions {
. $locale->text('AP Transaction') . qq|">
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Vendor Invoice') . qq|">
- print qq|
|