Revision 138255b0
Von Stephan Köhler vor etwa 19 Jahren hinzugefügt
| bin/mozilla/gl.pl | ||
|---|---|---|
| 399 | 399 |
|
| 400 | 400 |
$form->{title} = $locale->text('General Ledger');
|
| 401 | 401 |
|
| 402 |
$ml = ($form->{ml} =~ /(A|E)/) ? -1 : 1;
|
|
| 402 |
$ml = ($form->{ml} =~ /(A|E|Q)/) ? -1 : 1;
|
|
| 403 | 403 |
|
| 404 | 404 |
unless ($form->{category} eq 'X') {
|
| 405 | 405 |
$form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
|
| ... | ... | |
| 624 | 624 |
</tr> |
| 625 | 625 |
|; |
| 626 | 626 |
} |
| 627 |
|
|
| 627 |
$form->{balance} *= $ml;
|
|
| 628 | 628 |
foreach $ref (@{ $form->{GL} }) {
|
| 629 |
|
|
| 629 |
$form->{balance} *= $ml;
|
|
| 630 | 630 |
# if item ne sort print subtotal |
| 631 | 631 |
if ($form->{l_subtotal} eq 'Y') {
|
| 632 | 632 |
if ($sameitem ne $ref->{ $form->{sort} }) {
|
| 633 | 633 |
&gl_subtotal; |
| 634 | 634 |
} |
| 635 | 635 |
} |
| 636 |
foreach $key (sort keys(%{ $ref->{amount} })) {
|
|
| 637 |
$form->{balance} += $ref->{amount}{$key};
|
|
| 638 |
} |
|
| 636 |
#foreach $key (sort keys(%{ $ref->{amount} })) {
|
|
| 637 |
# $form->{balance} += $ref->{amount}{$key};
|
|
| 638 |
#}
|
|
| 639 | 639 |
|
| 640 | 640 |
$debit = ""; |
| 641 | 641 |
foreach $key (sort keys(%{ $ref->{debit} })) {
|
| ... | ... | |
| 647 | 647 |
$debit .= |
| 648 | 648 |
"<br>" . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
|
| 649 | 649 |
} |
| 650 |
$form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});
|
|
| 650 | 651 |
} |
| 651 | 652 |
|
| 652 | 653 |
$credit = ""; |
| ... | ... | |
| 659 | 660 |
$credit .= "<br>" |
| 660 | 661 |
. $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
|
| 661 | 662 |
} |
| 663 |
$form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
|
|
| 662 | 664 |
} |
| 663 | 665 |
|
| 664 | 666 |
$debittax = ""; |
| ... | ... | |
| 672 | 674 |
$debittax .= "<br>" |
| 673 | 675 |
. $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
|
| 674 | 676 |
} |
| 677 |
$form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});
|
|
| 675 | 678 |
} |
| 676 | 679 |
|
| 677 | 680 |
$credittax = ""; |
| ... | ... | |
| 685 | 688 |
$credittax .= "<br>" |
| 686 | 689 |
. $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
|
| 687 | 690 |
} |
| 691 |
$form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});
|
|
| 688 | 692 |
} |
| 689 | 693 |
|
| 690 | 694 |
$debitaccno = ""; |
| ... | ... | |
| 777 | 781 |
"<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a> </td>";
|
| 778 | 782 |
$column_data{balance} =
|
| 779 | 783 |
"<td align=right>" |
| 780 |
. $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)
|
|
| 784 |
. $form->format_amount(\%myconfig, $form->{balance}, 2, 0)
|
|
| 781 | 785 |
. "</td>"; |
| 782 | 786 |
|
| 783 | 787 |
$i++; |
Auch abrufbar als: Unified diff
Merge von 607-609 aus unstable: Bugfix zu UBL
-Unbalanced Ledger Workaround... Betr. Bugzilla ID 124
-Neuer Patch gegen den Unbalanced Ledger!
Betr. Bugzilla ID 124
-Neuer Patch gegen den Unbalanced Ledger!
Test ob Demodatenbank den Unbalanced ist...
Betr. Bugzilla ID 124