if ($tax && ($ref->{accno} eq $taxaccno)) {
$form->{"tax_$j"} = abs($ref->{amount});
$form->{"taxchart_$j"} = $ref->{taxkey} . "--" . $ref->{taxrate};
+ if ($form->{taxincluded}) {
+ if ($ref->{amount} < 0) {
+ $form->{"debit_$j"} += $form->{"tax_$j"};
+ } else {
+ $form->{"credit_$j"} += $form->{"tax_$j"};
+ }
+ }
} else {
$form->{"accno_$i"} = "$ref->{accno}--$ref->{accnotaxkey}";
for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
$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> |
$form->{title} = $locale->text('General Ledger');
- $ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
+ $ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
unless ($form->{category} eq 'X') {
$form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
</tr>
|;
}
-
+ $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};
- }
+ #foreach $key (sort keys(%{ $ref->{amount} })) {
+ # $form->{balance} += $ref->{amount}{$key};
+ #}
$debit = "";
foreach $key (sort keys(%{ $ref->{debit} })) {
$debit .=
"<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});
}
$credit = "";
$credit .= "<br>"
. $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
}
$debittax = "";
$debittax .= "<br>"
. $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});
}
$credittax = "";
$credittax .= "<br>"
. $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});
}
$debitaccno = "";
"<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} * $ml, 2, 0)
+ . $form->format_amount(\%myconfig, $form->{balance}, 2, 0)
. "</td>";
$i++;
$form->{oldtransdate} = $form->{transdate};
}
- my @a = ();
- my $count = 0;
- my $debittax = 0;
- my $credittax = 0;
- my @flds =
+ my @a = ();
+ my $count = 0;
+ my $debittax = 0;
+ my $credittax = 0;
+ my $debitcount = 0;
+ my $creditcount = 0;
+ $debitlock = 0;
+ $creditlock = 0;
+
+ my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
for my $i (1 .. $form->{rowcount}) {
push @a, {};
$debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
+ if ($debitcredit) {
+ $debitcount++;
+ } else {
+ $creditcount++;
+ }
+
+ if (($debitcount >= 2) && ($creditcount == 2)) {
+ $form->{"credit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $creditcount--;
+ $creditlock = 1;
+ }
+ if (($creditcount >= 2) && ($debitcount == 2)) {
+ $form->{"debit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $debitcount--;
+ $debitlock = 1;
+ }
+ if (($creditcount == 1) && ($debitcount == 2)) {
+ $creditlock = 1;
+ }
+ if (($creditcount == 2) && ($debitcount == 1)) {
+ $debitlock = 1;
+ }
+ if ($debitcredit && $credittax) {
+ $form->{"taxchart_$i"} = "0--0.00";
+ }
+ if (!$debitcredit && $debittax) {
+ $form->{"taxchart_$i"} = "0--0.00";
+ }
$amount =
($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
qq|<td><select id="taxchart_$i" name="taxchart_$i" 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))
}
} else {
-
- $form->{totaldebit} += $form->{"debit_$i"};
- $form->{totalcredit} += $form->{"credit_$i"};
+ if ($form->{"debit_$i"} != 0) {
+ $form->{totaldebit} += $form->{"debit_$i"};
+ if (!$form->{taxincluded}) {
+ $form->{totaldebit} += $form->{"tax_$i"};
+ }
+ } else {
+ $form->{totalcredit} += $form->{"credit_$i"};
+ if (!$form->{taxincluded}) {
+ $form->{totalcredit} += $form->{"tax_$i"};
+ }
+ }
for (qw(debit credit tax)) {
$form->{"${_}_$i"} =
. ($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))
}
}
}
+ my $debitreadonly = "";
+ my $creditreadonly = "";
+ if ($i == $form->{rowcount}) {
+ if ($debitlock) {
+ $debitreadonly = "readonly";
+ } elsif ($creditlock) {
+ $creditreadonly = "readonly";
+ }
+ }
print qq|<tr valign=top>
$accno
$fx_transaction
<td><input name="debit_$i" size=10 value="$form->{"debit_$i"}" accesskey=$i tabindex=|
- . ($i + 6 + (($i - 1) * 8)) . qq|></td>
+ . ($i + 6 + (($i - 1) * 8)) . qq| $debitreadonly></td>
<td><input name="credit_$i" size=10 value="$form->{"credit_$i"}" tabindex=|
- . ($i + 7 + (($i - 1) * 8)) . qq|></td>
+ . ($i + 7 + (($i - 1) * 8)) . qq| $creditreadonly></td>
<td><input name="tax_$i" size=8 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();
}
<td>
<table width=100%>
<tr>
- <th align=right>| . $locale->text('Reference') . qq|</th>
+ <th align=left>| . $locale->text('Reference') . qq|</th>
<td><input name=reference size=20 value="$form->{reference}" tabindex="1" $readonly></td>
<td align=left>
- <table width=100%>
+ <table>
<tr>
<th align=right nowrap>| . $locale->text('Date') . qq|</th>
$button1
<th align=right>| . $locale->text('Belegnummer') . qq|</th>
<td><input name=id size=20 value="$form->{id}" $readonly></td>
<td align=left>
- <table width=100%>
+ <table>
<tr>
<th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
<td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly></td>
if ($form->{id}) {
print qq|
<tr>
- <th align=right>| . $locale->text('Description') . qq|</th>
- <td>$description</td>
+ <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+ <td width=1%>$description</td>
<td>
<table>
<tr>
} else {
print qq|
<tr>
- <th align=right>| . $locale->text('Description') . qq|</th>
- <td colspan=2>$description</td>
+ <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+ <td width=1%>$description</td>
<td>
<table>
<tr>
}
print qq|
<tr>
+ <td colspan=4>
<table width=100%>
<tr class=listheading>
<th class=listheading style="width:15%">|
map {
$form->{$_} =
- $form->format_amount(\%myconfig, $form->{$_}, $decimalplaces, " ")
+ $form->format_amount(\%myconfig, $form->{$_}, 2, " ")
} qw(totaldebit totalcredit);
print qq|
+ <tr class=listtotal>
+ <td></td>
+ <th align=right class=listtotal> $form->{totaldebit}</th>
+ <th align=right class=listtotal> $form->{totalcredit}</th>
+ <td colspan=5></td>
+ </tr>
</table>
+ </td>
+ </tr>
</table>
<input type=hidden name=path value=$form->{path}>
# check project
&check_project;
- my @a = ();
- my $count = 0;
- my $debittax = 0;
- my $credittax = 0;
- my @flds =
+ my @a = ();
+ my $count = 0;
+ my $debittax = 0;
+ my $credittax = 0;
+ my $debitcount = 0;
+ my $creditcount = 0;
+ $creditlock = 0;
+ $debitlock = 0;
+
+ 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}) {
push @a, {};
$debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1";
+
+ if ($debitcredit) {
+ $debitcount++;
+ } else {
+ $creditcount++;
+ }
+
+ if (($debitcount >= 2) && ($creditcount == 2)) {
+ $form->{"credit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $creditcount--;
+ $creditlock = 1;
+ }
+ if (($creditcount >= 2) && ($debitcount == 2)) {
+ $form->{"debit_$i"} = 0;
+ $form->{"tax_$i"} = 0;
+ $debitcount--;
+ $debitlock = 1;
+ }
+ if (($creditcount == 1) && ($debitcount == 2)) {
+ $creditlock = 1;
+ }
+ if (($creditcount == 2) && ($debitcount == 1)) {
+ $debitlock = 1;
+ }
+ if ($debitcredit && $credittax) {
+ $form->{"taxchart_$i"} = "0--0.00";
+ }
+ if (!$debitcredit && $debittax) {
+ $form->{"taxchart_$i"} = "0--0.00";
+ }
$amount =
($form->{"debit_$i"} == 0)
? $form->{"credit_$i"}
}
if ($form->{taxincluded}) {
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
+ if ($debitcredit) {
+ $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
+ } else {
+ $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+ }
} else {
$form->{"tax_$i"} = $amount * $rate;
}
} 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"} }
));
}
if ($form->{taxincluded}) {
- $debit += $dr;
- $credit += $cr;
+ if ($dr) {
+ $debit += $dr + $tax;
+ }
+ if ($cr) {
+ $credit += $cr + $tax;
+ }
$taxtotal += $tax;
} else {
if ($dr) {