-
-
$jsscript
-
-
-
{rowcount}>
+
+
+
+
+ |
+ . $locale->text('Account') . qq| |
+ |
+ . $locale->text('Amount') . qq| |
+ |
+ . $locale->text('Tax') . qq| |
+ |
+ . $locale->text('Korrektur') . qq| |
+ |
+ . $locale->text('Taxkey') . qq| |
+ |
+ . $locale->text('Project') . qq| |
+
|;
- $form->{"tax"} = $form->format_amount(\%myconfig, $form->{"tax"}, 2);
-
$amount = $locale->text('Amount');
$project = $locale->text('Project');
- for $i (1 .. 1) {
+ 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);
+
+ my $selected_accno_full;
+ my ($accno_row) = split(/--/, $form->{"AR_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_AR_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"});
+
+ $selectAR_amount =
+ NTI($cgi->popup_menu('-name' => "AR_amount_$i",
+ '-id' => "AR_amount_$i",
+ '-style' => 'width:400px',
+ '-onChange' => "setTaxkey(this, $i)",
+ '-values' => \@AR_amount_values,
+ '-labels' => \%AR_amount_labels,
+ '-default' => $selected_accno_full))
+ . $cgi->hidden('-name' => "previous_AR_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| | |;
+
+ $korrektur_checked = ($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"}> |
- $project |
-
- {"project_id_$i"}>
- |
- |
+ $selectAR_amount |
+ {"amount_$i"}> |
+ {"tax_$i"}> |
+ |
+ $tax
+ $projectnumber |
|;
$amount = "";
$project = "";
}
- $taxlabel =
- ($form->{taxincluded})
- ? $locale->text('Tax Included')
- : $locale->text('Tax');
-
- print qq|
-
- $taxlabel |
- {"tax"}> |
- |
- |
- |
-
-|;
-
$form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
+ $ARselected =
+ NTI($cgi->popup_menu('-name' => "ARselected", '-id' => "ARselected",
+ '-style' => 'width:400px',
+ '-values' => \@AR_values, '-labels' => \%AR_labels,
+ '-default' => $form->{ARselected}));
+
print qq|
-
- | . $locale->text('Total') . qq| |
+
+
+ |
+
+
+ ${ARselected} |
$form->{invtotal} |
{oldinvtotal}>
@@ -582,14 +701,19 @@ $jsscript
- |
- |
-
-
+ |
+
+
+
+ |
+
+
+
+
- | . $locale->text('Notes') . qq| |
- $notes |
+ | . $locale->text('Notes') . qq| |
+ $notes |
|
@@ -598,16 +722,15 @@ $jsscript
- |
- . $locale->text('Incoming Payments')
- . qq| |
+ |
+ . $locale->text('Incoming Payments') . qq| |
|;
if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AR_paid);
+ @column_index = qw(datepaid source memo paid AR_paid paid_project_id);
} else {
- @column_index = qw(datepaid source memo paid exchangerate AR_paid);
+ @column_index = qw(datepaid source memo paid exchangerate AR_paid paid_project_id);
}
$column_data{datepaid} = "" . $locale->text('Date') . " | ";
@@ -615,7 +738,8 @@ $jsscript
$column_data{exchangerate} = "" . $locale->text('Exch') . " | ";
$column_data{AR_paid} = "" . $locale->text('Account') . " | ";
$column_data{source} = "" . $locale->text('Source') . " | ";
- $column_data{memo} = "" . $locale->text('Memo') . " | ";
+ $column_data{memo} = "" . $locale->text('Memo') . " | ";
+ $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | ";
print "
@@ -625,19 +749,25 @@ $jsscript
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
";
- $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
- $form->{"selectAR_paid_$i"} =~
- s/option value=\"$form->{"AR_paid_$i"}\">/option value=\"$form->{"AR_paid_$i"}\" selected>/;
+ $selectAR_paid =
+ NTI($cgi->popup_menu('-name' => "AR_paid_$i",
+ '-id' => "AR_paid_$i",
+ '-values' => \@AR_paid_values,
+ '-labels' => \%AR_paid_labels,
+ '-default' => $form->{"AR_paid_$i"}));
# format amounts
- $form->{"paid_$i"} =
- $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ 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"});
@@ -659,25 +789,35 @@ $jsscript
$column_data{paid} =
qq|{"paid_$i"}> | |;
$column_data{AR_paid} =
- qq| | |;
+ qq|${selectAR_paid} | |;
$column_data{exchangerate} = qq|$exchangerate | |;
$column_data{datepaid} =
- qq|{"datepaid_$i"}> | |;
+ qq|{"datepaid_$i"}>
+ | |;
$column_data{source} =
qq| | |;
$column_data{memo} =
qq| | |;
+ $column_data{paid_project_id} =
+ 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{$_}\n| } @column_index;
print "
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
- map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid);
- print qq|
+
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
{paidaccounts}>
-
|
@@ -696,48 +836,62 @@ 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|
|;
+ 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|
-
-
+ print qq|
|;
- }
+ if ($form->{id}) {
+ if ($form->{radier}) {
+ print qq|
+
+
+ |;
}
-
if ($transdate > $closedto) {
print qq|
-
-|;
+
+ |;
}
+ print qq|
+
+ |;
} else {
if ($transdate > $closedto) {
print qq|
- |;
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
}
@@ -745,7 +899,16 @@ sub form_footer {
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 "
@@ -761,50 +924,45 @@ sub update {
my $display = shift;
- # if ($display) {
- # goto TAXCALC;
- # }
-
$form->{invtotal} = 0;
- $form->{selectAR_amount} = $form->{AR_amount};
- $form->{selectAR_amount} =~
- s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
-
- $form->{selectAR} = $form->{AR};
-
- $form->{selectAR} =~
- s/value=\"$form->{ARselected}\"/value=\"$form->{ARselected}\" selected/;
-
- ($AR_amountaccno, $AR_amounttaxkey) =
- split(/--/, $form->{AR_amountselected});
- $form->{selecttaxchart} = $form->{taxchart};
- $form->{selecttaxchart} =~
- s/value=\"$AR_amounttaxkey--([^\"]*)\"/value=\"$AR_amounttaxkey--$1\" selected/;
-
- $form->{rate} = $1;
-
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
@flds = qw(amount AR_amount projectnumber oldprojectnumber project_id);
$count = 0;
@a = ();
- 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, {};
$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});
-
- map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. 1);
+ $form->{rowcount} = $count + 1;
+ map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
$form->{exchangerate} = $exchangerate
if (
@@ -819,45 +977,11 @@ sub update {
&check_name(customer);
$form->{AR} = $save_AR;
- &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->{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"})
@@ -886,6 +1010,36 @@ 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->{AR}) = split /--/, $form->{AR};
+ ($form->{AR_paid}) = split /--/, $form->{AR_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AR->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
sub post {
$lxdebug->enter_sub();
@@ -906,7 +1060,7 @@ sub post {
delete($form->{AR});
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!'));
@@ -930,20 +1084,19 @@ sub post {
exit;
}
- ($creditaccno, $credittaxkey) = split /--/, $form->{AR_amountselected};
- ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
- ($receivablesaccno, $payablestaxkey) = split /--/, $form->{ARselected};
- $form->{AR}{amount_1} = $creditaccno;
- $form->{AR}{receivables} = $receivablesaccno;
- $form->{taxkey} = $taxkey;
-
- $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
- unless $form->{invnumber};
+ $form->{AR}{receivables} = $form->{ARselected};
$form->{id} = 0 if $form->{postasnew};
-
- $form->redirect($locale->text('Transaction posted!'))
- if (AR->post_transaction(\%myconfig, \%$form));
+ if (AR->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();
@@ -953,11 +1106,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();
@@ -998,9 +1169,15 @@ sub delete {
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Transaction deleted!'))
- if (AR->delete_transaction(\%myconfig, \%$form, $spool));
+ if (AR->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();
@@ -1030,8 +1207,8 @@ sub search {
} (@{ $form->{all_departments} });
}
- $department = qq|
-
+ $department = qq|
+
| . $locale->text('Department') . qq| |
|
@@ -1048,14 +1225,12 @@ sub search {
$button1 = qq|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
$button2 = qq|
text('button')
- . qq|> |
+ . $locale->text('button') . qq|>
|;
#write Trigger
@@ -1071,6 +1246,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->{fokus} = "search.customer";
$form->header;
@@ -1102,6 +1290,10 @@ sub search {
| . $locale->text('Notes') . qq| |
|
+
+ | . $locale->text("Project Number") . qq| |
+ $projectnumber |
+
| . $locale->text('From') . qq| |
$button1
@@ -1168,6 +1360,8 @@ sub search {
|
| . $locale->text('Subtotal') . qq| |
+ |
+ | . $locale->text('Project Number') . qq| |
|
@@ -1273,11 +1467,17 @@ sub ar_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 shippingpoint shipvia)
- );
+ qw(transdate id type invnumber ordnumber name netamount tax amount paid
+ datepaid due duedate notes employee shippingpoint shipvia
+ globalprojectnumber);
+
+ $form->{"l_type"} = "Y";
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
@@ -1306,6 +1506,8 @@ sub ar_transactions {
""
. $locale->text('Due Date')
. " | ";
+ $column_header{type} =
+ "" . $locale->text('Type') . " | ";
$column_header{invnumber} =
""
. $locale->text('Invoice')
@@ -1346,6 +1548,8 @@ sub ar_transactions {
" | "
. $locale->text('Ship via')
. " | ";
+ $column_header{globalprojectnumber} =
+ qq|| . $locale->text('Project Number') . qq| | |;
$form->{title} = $locale->text('AR Transactions');
@@ -1432,6 +1636,11 @@ sub ar_transactions {
$column_data{invnumber} =
"{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber} | ";
+ $column_data{type} = "" .
+ ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ?
+ $locale->text("Credit note (one letter abbreviation)") :
+ $locale->text("Invoice (one letter abbreviation)")) . " | ";
$column_data{ordnumber} = "$ar->{ordnumber} | ";
$column_data{name} = "$ar->{name} | ";
$ar->{notes} =~ s/\r\n/
/g;
@@ -1439,6 +1648,8 @@ sub ar_transactions {
$column_data{shippingpoint} = "$ar->{shippingpoint} | ";
$column_data{shipvia} = "$ar->{shipvia} | ";
$column_data{employee} = "$ar->{employee} | ";
+ $column_data{globalprojectnumber} =
+ "" . H($ar->{globalprojectnumber}) . " | ";
$i++;
$i %= 2;
@@ -1506,14 +1717,8 @@ sub ar_transactions {
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Sales Invoice') . qq|">
- print qq|