$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
+ $form->{"taxchart_$i"} = "0--";
$i++;
}
if ($ref->{taxaccno} && !$tax) {
. $locale->text('All') . qq|
<input name="category" class=radio type=radio value=A> |
. $locale->text('Asset') . qq|
- <input name="category" class=radio type=radio value=C> |
- . $locale->text('Contra') . qq|
<input name="category" class=radio type=radio value=L> |
. $locale->text('Liability') . qq|
- <input name="category" class=radio type=radio value=Q> |
- . $locale->text('Equity') . qq|
<input name="category" class=radio type=radio value=I> |
. $locale->text('Revenue') . qq|
<input name="category" class=radio type=radio value=E> |
</tr>
|;
}
- $form->{balance} *= $ml;
+ $form->{balance} *= $ml;
foreach $ref (@{ $form->{GL} }) {
$form->{balance} *= $ml;
+
# if item ne sort print subtotal
if ($form->{l_subtotal} eq 'Y') {
if ($sameitem ne $ref->{ $form->{sort} }) {
&gl_subtotal;
}
}
+
#foreach $key (sort keys(%{ $ref->{amount} })) {
# $form->{balance} += $ref->{amount}{$key};
#}
$credit .= "<br>"
. $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
}
- $form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
}
$debittax = "";
foreach $key (sort keys(%{ $ref->{debit_accno} })) {
if ($key == 0) {
$debitaccno =
- "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
} else {
$debitaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
- }
- if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
- $ref->{debit_tax_accno}{$key} = $taxaccno;
+ "<br><a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
}
+
+ # if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+ # $ref->{debit_tax_accno}{$key} = $taxaccno;
+ # }
$taxaccno = $ref->{debit_tax_accno}{$key};
$debittaxkey = $ref->{debit_taxkey}{$key};
}
foreach $key (sort keys(%{ $ref->{credit_accno} })) {
if ($key == 0) {
$creditaccno =
- "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
} else {
$creditaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
- }
- if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
- $ref->{credit_tax_accno}{$key} = $taxaccno;
+ "<br><a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
}
+
+ # if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+ # $ref->{credit_tax_accno}{$key} = $taxaccno;
+ # }
$taxaccno = $ref->{credit_tax_accno}{$key};
$credittaxkey = $ref->{credit_taxkey}{$key};
}
foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
if ($key == 0) {
$debittaxaccno =
- "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
} else {
$debittaxaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+ "<br><a href=$href&accno=$ref->{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
}
}
foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
if ($key == 0) {
$credittaxaccno =
- "<a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
} else {
$credittaxaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+ "<br><a href=$href&accno=$ref->{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
}
}
$column_data{gifi_accno} =
"<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a> </td>";
$column_data{balance} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $form->{balance}, 2, 0)
- . "</td>";
+ "<td align=right>"
+ . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";
$i++;
$i %= 2;
for $i (1 .. $form->{rowcount}) {
$source = qq|
- <td><input name="source_$i" value="$form->{"source_$i"}" tabindex=|
+ <td><input name="source_$i" value="$form->{"source_$i"}" size="16" tabindex=|
. ($i + 11 + (($i - 1) * 8)) . qq|></td>|;
$memo = qq|
- <td><input name="memo_$i" value="$form->{"memo_$i"}" tabindex=|
+ <td><input name="memo_$i" value="$form->{"memo_$i"}" size="16" tabindex=|
. ($i + 12 + (($i - 1) * 8)) . qq|></td>|;
if ($init) {
$accno = qq|
- <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|
+ <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|
. ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;
$tax =
- qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
+ qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|
. ($i + 10 + (($i - 1) * 8))
. qq|>$form->{taxchart}</select></td>|;
- if ($form->{selectprojectnumber}) {
- $project = qq|
- <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
- }
+
+ # if ($form->{selectprojectnumber}) {
+ # $project = qq|
+ # <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+ # }
$korrektur =
qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
. ($i + 9 + (($i - 1) * 8))
$accno =~
s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
$accno =
- qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:300px" tabindex=|
+ qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|
. ($i + 5 + (($i - 1) * 8))
. qq|>$accno</select></td>|;
$tax = $taxchart;
. ($i + 10 + (($i - 1) * 8))
. qq|>$tax</select></td>|;
- if ($form->{selectprojectnumber}) {
- $form->{"projectnumber_$i"} = ""
- if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-
- $project = $form->{"projectnumber_$i"};
- $project =~ s/--.*//;
- $project = qq|<td>$project</td>|;
- }
+ # if ($form->{selectprojectnumber}) {
+ # $form->{"projectnumber_$i"} = ""
+ # if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
+ #
+ # $project = $form->{"projectnumber_$i"};
+ # $project =~ s/--.*//;
+ # $project = qq|<td>$project</td>|;
+ # }
if ($form->{transfer}) {
$checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked tabindex=|
. ($i + 9 + (($i - 1) * 8))
. qq|></td>|;
- $form->hide_form("accno_$i", "projectnumber_$i");
+ $form->hide_form("accno_$i");
} else {
$tax = qq|
<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
. ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;
- if ($form->{selectprojectnumber}) {
- $project = qq|
- <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
- }
+
+ # if ($form->{selectprojectnumber}) {
+ # $project = qq|
+ # <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+ # }
$korrektur =
qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
. ($i + 9 + (($i - 1) * 8))
print qq|<tr valign=top>
$accno
$fx_transaction
- <td><input name="debit_$i" size=10 value="$form->{"debit_$i"}" accesskey=$i tabindex=|
+ <td><input name="debit_$i" size=8 value="$form->{"debit_$i"}" accesskey=$i tabindex=|
. ($i + 6 + (($i - 1) * 8)) . qq| $debitreadonly></td>
- <td><input name="credit_$i" size=10 value="$form->{"credit_$i"}" tabindex=|
+ <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" tabindex=|
. ($i + 7 + (($i - 1) * 8)) . qq| $creditreadonly></td>
- <td><input name="tax_$i" size=8 value="$form->{"tax_$i"}" tabindex=|
+ <td><input name="tax_$i" size=6 value="$form->{"tax_$i"}" tabindex=|
. ($i + 8 + (($i - 1) * 8)) . qq|></td>
$korrektur
$tax
$source
$memo
- $project
</tr>
|;
}
$form->hide_form(qw(rowcount selectaccno));
- print qq|
-<input type=hidden name=selectprojectnumber value="|
- . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
+
+ # print qq|
+ # <input type=hidden name=selectprojectnumber value="|
+ # . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
$lxdebug->leave_sub();
}
# with JavaScript Calendar
$button1 = qq|
- <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly>
+ <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly>
<input type=button name=transdate id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
#write Trigger
$jsscript =
- Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1", "",
- "", "");
+ Form->write_trigger(\%myconfig, "1", "transdate", "BL", "trigger1");
} else {
# without JavaScript Calendar
$button1 =
- qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate} tabindex="2" $readonly></td>|;
+ qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" tabindex="2" $readonly></td>|;
}
$form->header;
<form method=post action=$form->{script}>
|;
- map { $form->{$_} =~ s/\"/"/g } qw(reference description chart);
+ map { $form->{$_} =~ s/\"/"/g } qw(reference description chart taxchart);
delete $form->{header};
foreach $key (keys %$form) {
- print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+ print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
}
print qq|
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
+ if ($form->{storno}) {
+ for my $i (1 .. $form->{rowcount}) {
+ unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
+ if ($form->{"debit_$i"} ne "") {
+ $form->{"credit_$i"} = $form->{"debit_$i"};
+ $form->{"debit_$i"} = "";
+ } elsif ($form->{"credit_$i"} ne "") {
+ $form->{"debit_$i"} = $form->{"credit_$i"};
+ $form->{"credit_$i"} = "";
+ }
+ }
+ }
+ }
for my $i (1 .. $form->{rowcount}) {
} else {
$form->{"tax_$i"} = 0;
}
+ } elsif ($form->{taxincluded}) {
+ if ($debitcredit) {
+ $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+ } else {
+ $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+ }
}
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }