use SL::AR;
use SL::IS;
use SL::PE;
+use Data::Dumper;
require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/drafts.pl";
1;
sub add {
$lxdebug->enter_sub();
+ return $lxdebug->leave_sub() if (load_draft_maybe());
+
+ # saving the history
+ if(!exists $form->{addition} && ($form->{id} ne "")) {
+ $form->{addition} = "ADDED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
$form->{title} = "Add";
$form->{callback} =
"$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
&create_links;
+ AR->get_transdate(\%myconfig, $form);
&display_form;
-
$lxdebug->leave_sub();
}
sub edit {
$lxdebug->enter_sub();
+ # show history button
+ $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+ #/show hhistory button
$form->{title} = "Edit";
$duedate = $form->{duedate};
$taxincluded = $form->{taxincluded};
-
+ my $id = $form->{id};
IS->get_customer(\%myconfig, \%$form);
+ $form->{taxincluded} = $taxincluded;
+ $form->{id} = $id;
$form->{duedate} = $duedate if $duedate;
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+ $form->{rowcount} = 1;
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
map {
$tax .=
- qq|<option value=\"$_->{taxkey}--$_->{rate}\">$_->{taxdescription} |
+ qq|<option value=\"$_->{id}--$_->{rate}\">$_->{taxdescription} |
. ($_->{rate} * 100) . qq| %|
} @{ $form->{TAX} };
$form->{taxchart} = $tax;
"<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";
} else {
$form->{"select$key"} .=
- "<option value=\"$ref->{accno}--$ref->{taxkey}\">$ref->{accno}--$ref->{description}</option>\n";
+ "<option value=\"$ref->{accno}--$ref->{tax_id}\">$ref->{accno}--$ref->{description}</option>\n";
}
}
$form->{$key} = $form->{"select$key"};
# if there is a value we have an old entry
- $j = 0;
+ my $j = 0;
+ my $k = 0;
+
for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
if ($key eq "AR_paid") {
$j++;
$form->{"forex_$j"} = $form->{"exchangerate_$i"} =
$form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
$form->{"AR_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
+ $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
$form->{paidaccounts}++;
} else {
$akey = $key;
$akey =~ s/AR_//;
- if ($key eq "AR_tax") {
+ if ($key eq "AR_tax" || $key eq "AP_tax") {
$form->{"${key}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
$form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
$withholdingrate +=
$form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
}
+ $index = $form->{acc_trans}{$key}->[$i - 1]->{index};
+ $form->{"tax_$index"} = $form->{acc_trans}{$key}->[$i - 1]->{amount};
+ $totaltax += $form->{"tax_$index"};
} else {
- $form->{"${akey}_$i"} =
+ $k++;
+ $form->{"${akey}_$k"} =
$form->round_amount(
$form->{acc_trans}{$key}->[$i - 1]->{amount} / $exchangerate,
2);
$form->{rowcount}++;
$totalamount += $form->{"${akey}_$i"};
- $form->{"oldprojectnumber_$i"} = $form->{"projectnumber_$i"} =
+ $form->{"oldprojectnumber_$k"} = $form->{"projectnumber_$k"} =
"$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
$form->{taxrate} = $form->{acc_trans}{$key}->[$i - 1]->{rate};
- $form->{"project_id_$i"} =
+ $form->{"project_id_$k"} =
"$form->{acc_trans}{$key}->[$i-1]->{project_id}";
}
- $form->{"${key}_$i"} =
+ $form->{"${key}_$k"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
$form->{"${key}_$i"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+ my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description});
$form->{"select${key}"} =~
- /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n)/;
- $test = $1;
- $form->{"select${key}"} = $1;
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/;
+ $form->{"${key}_$k"} = $1;
if ($akey eq 'amount') {
- $form->{selecttaxchart} =~
- /(<option value=\"$form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^<]*)/;
- $form->{selecttaxchart} = $1;
+ $form->{"taxchart_$k"} = $form->{taxchart};
+ $form->{"taxchart_$k"} =~
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{id}--[^\"]*)/;
+ $form->{"taxchart_$k"} = $1;
}
}
}
if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
# add tax to amounts and invtotal
- for $i (1 .. 1) {
+ for $i (1 .. $form->{rowcount}) {
$taxamount =
($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
$tax = $form->round_amount($taxamount, 2);
$diff += ($taxamount - $tax);
- $form->{"amount_$i"} += $tax;
+ $form->{"amount_$i"} += $form->{"tax_$i"};
}
$form->{amount_1} += $form->round_amount($diff, 2);
}
- # check if calculated is equal to stored
- if ($form->{taxincluded} && $form->{taxrate} && $withholdingrate) {
- if ($form->{"taxrate"} > 0) {
- $taxamount =
- $form->round_amount(
- ($form->{amount_1} - ($form->{amount_1} / ($form->{taxrate} + 1))),
- 2);
- } else {
- $taxamount =
- $form->round_amount(
- ($totalamount + $totaltax + $totalwithholding) * $withholdingrate /
- (1 - $withholdingrate),
- 2
- ) * $form->{"taxrate"} / $withholdingrate;
- }
- } else {
- $taxamount = $totalamount * $form->{"taxrate"};
- }
$taxamount = $form->round_amount($taxamount, 2);
$form->{tax} = $taxamount;
- $form->{invtotal} = $totalamount + $totaltax + $totalwithholding;
+ $form->{invtotal} = $totalamount + $totaltax;
$form->{locked} =
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"ARselected"} = $form->{"AR_1"};
+
$lxdebug->leave_sub();
}
# $locale->text('Add Accounts Receivables Transaction')
# $locale->text('Edit Accounts Receivables Transaction')
+ $form->{javascript} = qq|<script type="text/javascript">
+ <!--
+ function setTaxkey(accno, row) {
+ var taxkey = accno.options[accno.selectedIndex].value;
+ var reg = /--([0-9]*)/;
+ var found = reg.exec(taxkey);
+ var index = found[1];
+ index = parseInt(index);
+ var tax = 'taxchart_' + row;
+ for (var i = 0; i < document.getElementById(tax).options.length; ++i) {
+ var reg2 = new RegExp("^"+ index, "");
+ if (reg2.exec(document.getElementById(tax).options[i].value)) {
+ document.getElementById(tax).options[i].selected = true;
+ break;
+ }
+ }
+ };
+ //-->
+ </script>|;
+ # show history button js
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+ #/show history button js
$readonly = ($form->{id}) ? "readonly" : "";
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
+ my $ARselected_quoted = quotemeta($form->{"ARselected"});
+ $form->{selectAR} = $form->{AR};
+ $form->{selectAR} =~
+ s/value=\"${ARselected_quoted}\"/value=\"$form->{ARselected}\" selected/;
+
# set option selected
foreach $item (qw(customer currency department employee)) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
-
- map { $form->{$_} =~ s/\"/"/g } qw(AR_amount AR taxchart);
+ $selectAR_amount_unquoted = $form->{selectAR_amount};
+ $taxchart = $form->{taxchart};
+ map { $form->{$_} =~ s/\"/"/g }
+ qw(AR_amount selectAR_amount AR taxchart);
# format amounts
$form->{exchangerate} =
|;
}
+ my @old_project_ids = ();
+ 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 });
+
+ my %project_labels = ();
+ my @project_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@project_values, $item->{"id"});
+ $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
$form->{fokus} = "arledger.customer";
# use JavaScript Calendar or not
$button1 = qq|
<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>
<td><input type=button name=transdate id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
$button2 = qq|
<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
<td><input type=button name=duedate id="trigger2" value=|
- . $locale->text('button')
- . qq|></td></td>
+ . $locale->text('button') . qq|></td></td>
|;
#write Trigger
<input type=hidden name=locked value=$form->{locked}>
<input type=hidden name=title value="$title">
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
+
<table width=100%>
<tr class=listtop>
<th class=listtop>$form->{title}</th>
<th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
$button2
</tr>
- </table>
+ </table>
</td>
</tr>
</table>
</td>
</tr>
- <tr>
- <td>
- <table width=100%>
$jsscript
-
+ <input type=hidden name=selectAR_amount value="$form->{selectAR_amount}">
<input type=hidden name=AR_amount value="$form->{AR_amount}">
<input type=hidden name=taxchart value="$form->{taxchart}">
<input type=hidden name=rowcount value=$form->{rowcount}>
+ <tr>
+ <td>
+ <table width=100%>
+ <tr class=listheading>
+ <th class=listheading style="width:15%">|
+ . $locale->text('Account') . qq|</th>
+ <th class=listheading style="width:10%">|
+ . $locale->text('Amount') . qq|</th>
+ <th class=listheading style="width:10%">|
+ . $locale->text('Tax') . qq|</th>
+ <th class=listheading style="width:5%">|
+ . $locale->text('Korrektur') . qq|</th>
+ <th class=listheading style="width:10%">|
+ . $locale->text('Taxkey') . qq|</th>
+ <th class=listheading style="width:10%">|
+ . $locale->text('Project') . qq|</th>
+ </tr>
|;
- $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);
+ $selectAR_amount = $selectAR_amount_unquoted;
+ $selectAR_amount =~
+ s/option value=\"$form->{"AR_amount_$i"}\"/option value=\"$form->{"AR_amount_$i"}\" selected/;
+ $tax = $taxchart;
+ $tax_selected = $form->{"taxchart_$i"};
+ $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
+ $tax =
+ qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px">$tax</select></td>|;
+ $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|
<tr>
- <th align=right>$amount</th>
- <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
- <th>$project</th>
- <td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
- <input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
- <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}"></td>
- <td width=50%><select name="AR_amountselected">$form->{"selectAR_amount"}</select></td>
+ <td width=50%><select name="AR_amount_$i" onChange="setTaxkey(this, $i)" style="width:100%">$selectAR_amount</select></td>
+ <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
+ <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
+ <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
+ $tax
+ <td>$projectnumber</td>
</tr>
|;
$amount = "";
$project = "";
}
- $taxlabel =
- ($form->{taxincluded})
- ? $locale->text('Tax Included')
- : $locale->text('Tax');
-
- print qq|
- <tr>
- <th align=right nowrap>$taxlabel</th>
- <td><input name="tax" size=10 value=$form->{"tax"}></td>
- <td align=right></td>
- <td></td>
- <td><select name="taxchartselected">$form->{"selecttaxchart"}</select></td>
- </tr>
-|;
-
$form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
print qq|
<tr>
-
- <th align=right>| . $locale->text('Total') . qq|</th>
+ <td colspan=6>
+ <hr noshade>
+ </td>
+ </tr>
+ <tr>
+ <td><select name=ARselected>$form->{selectAR}</select></td>
+ <input type=hidden name=AR value="$form->{AR}">
<th align=left>$form->{invtotal}</th>
<input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
<input type=hidden name=taxaccounts value="$form->{taxaccounts}">
- <td colspan=2></td>
- <td><select name=ARselected>$form->{selectAR}</select></td>
- <input type=hidden name=AR value="$form->{AR}">
-
+ <td colspan=4></td>
+
+
</tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table width=100%>
<tr>
- <th align=right>| . $locale->text('Notes') . qq|</th>
- <td colspan=4>$notes</td>
+ <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+ <td align=left>$notes</td>
</tr>
</table>
</td>
<td>
<table width=100%>
<tr class=listheading>
- <th colspan=6 class=listheading>|
- . $locale->text('Incoming Payments')
- . qq|</th>
+ <th colspan=7 class=listheading>|
+ . $locale->text('Incoming Payments') . qq|</th>
</tr>
|;
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} = "<th>" . $locale->text('Date') . "</th>";
$column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
$column_data{AR_paid} = "<th>" . $locale->text('Account') . "</th>";
$column_data{source} = "<th>" . $locale->text('Source') . "</th>";
- $column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
+ $column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
+ $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
print "
<tr>
</tr>
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
s/option value=\"$form->{"AR_paid_$i"}\">/option value=\"$form->{"AR_paid_$i"}\" selected>/;
# 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"});
qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
$column_data{exchangerate} = qq|<td align=center>$exchangerate</td>|;
$column_data{datepaid} =
- qq|<td align=center><input name="datepaid_$i" size=11 value=$form->{"datepaid_$i"}></td>|;
+ qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 value=$form->{"datepaid_$i"}>
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
$column_data{source} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{memo} =
qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+ $column_data{paid_project_id} =
+ qq|<td>|
+ . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"paid_project_id_$i"} ))
+ . qq|</td>|;
+
map { print qq|$column_data{$_}\n| } @column_index;
print "
</tr>
";
+ 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|
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
<input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
print qq|
+<input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
+
<input name=callback type=hidden value="$form->{callback}">
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
<br>
|;
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
- if ($form->{id} && $form->{radier}) {
-
- print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
+ print qq|<input class=submit type=submit name=action value="|
+ . $locale->text('Update') . qq|">
|;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
- print qq|
- <input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">
- <input class=submit type=submit name=action value="|
- . $locale->text('Delete') . qq|">
-|;
- }
+ if ($form->{id}) {
+ if ($form->{radier}) {
+ print qq|
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Post') . qq|">
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Delete') . qq|">
+ |;
}
-
if ($transdate > $closedto) {
print qq|
-<input class=submit type=submit name=action value="|
- . $locale->text('Post as new') . qq|">
-|;
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Use As Template') . qq|">
+ |;
}
+ print qq|
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Post Payment') . qq|">
+ |;
} else {
if ($transdate > $closedto) {
print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
- <input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">|;
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
}
require "$form->{path}/menu.pl";
&menubar;
}
-
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ <input type=button class=submit onclick=set_history_window(|
+ . $form->{id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
+ }
+ # /button for saving history
print "
</form>
$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/;
+ # $form->{selectAR_amount} = $form->{AR_amount};
+ # $form->{selectAR_amount} =~
+ # s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
($AR_amountaccno, $AR_amounttaxkey) =
split(/--/, $form->{AR_amountselected});
@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 (
&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"})
$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();
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!'));
exit;
}
- ($creditaccno, $credittaxkey) = split /--/, $form->{AR_amountselected};
- ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
- ($receivablesaccno, $payablestaxkey) = split /--/, $form->{ARselected};
+ my ($creditaccno, $credittaxkey) = split /--/, $form->{AR_amountselected};
+ my ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
+ my ($receivablesaccno, $payablestaxkey) = split /--/, $form->{ARselected};
$form->{AR}{amount_1} = $creditaccno;
$form->{AR}{receivables} = $receivablesaccno;
$form->{taxkey} = $taxkey;
unless $form->{invnumber};
$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();
+ $form->redirect($locale->text('Transaction posted!'));
+ }
$form->error($locale->text('Cannot post transaction!'));
$lxdebug->leave_sub();
$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();
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();
} (@{ $form->{all_departments} });
}
- $department = qq|
- <tr>
+ $department = qq|
+ <tr>
<th align=right nowrap>| . $locale->text('Department') . qq|</th>
<td colspan=3><select name=department>$form->{selectdepartment}</select></td>
</tr>
$button1 = qq|
<td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
<input type=button name=transdatefrom id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
$button2 = qq|
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
<input type=button name=transdateto name=transdateto id="trigger2" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
}
+ $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;
<th align=right nowrap>| . $locale->text('Notes') . qq|</th>
<td colspan=3><input name=notes size=40></td>
</tr>
+ <tr>
+ <th align="right">| . $locale->text("Project Number") . qq|</th>
+ <td colspan="3">$projectnumber</td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('From') . qq|</th>
$button1
<tr>
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
<td nowrap>| . $locale->text('Subtotal') . qq|</td>
+ <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
+ <td nowrap>| . $locale->text('Project Number') . qq|</td>
</tr>
</table>
</td>
$option .= "\n<br>" 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") {
"<th><a class=listheading href=$href&sort=duedate>"
. $locale->text('Due Date')
. "</a></th>";
+ $column_header{type} =
+ "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
$column_header{invnumber} =
"<th><a class=listheading href=$href&sort=invnumber>"
. $locale->text('Invoice')
"<th><a class=listheading href=$href&sort=shipvia>"
. $locale->text('Ship via')
. "</a></th>";
+ $column_header{globalprojectnumber} =
+ qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
$form->{title} = $locale->text('AR Transactions');
$column_data{invnumber} =
"<td><a href=$module?action=edit&id=$ar->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+ $column_data{type} = "<td>" .
+ ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ?
+ $locale->text("Credit note (one letter abbreviation)") :
+ $locale->text("Invoice (one letter abbreviation)")) . "</td>";
$column_data{ordnumber} = "<td>$ar->{ordnumber} </td>";
$column_data{name} = "<td>$ar->{name}</td>";
$ar->{notes} =~ s/\r\n/<br>/g;
$column_data{shippingpoint} = "<td>$ar->{shippingpoint} </td>";
$column_data{shipvia} = "<td>$ar->{shipvia} </td>";
$column_data{employee} = "<td>$ar->{employee} </td>";
+ $column_data{globalprojectnumber} =
+ "<td>" . H($ar->{globalprojectnumber}) . "</td>";
$i++;
$i %= 2;
<input class=submit type=submit name=action value="|
. $locale->text('AR Transaction') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Sales Invoice') . qq|">|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Sales Invoice') . qq|">
- print qq|
</form>
</body>
$lxdebug->leave_sub();
}
-
projects / kivitendo-erp.git / blobdiff