- |.$locale->text('Include in Report').qq| |
+ | . $locale->text('Include in Report') . qq| |
- |.$locale->text('All').qq|
- |.$locale->text('Asset').qq|
- |.$locale->text('Liability').qq|
- |.$locale->text('Revenue').qq|
- |.$locale->text('Expense').qq|
+ |
+ . $locale->text('All') . qq|
+ |
+ . $locale->text('Asset') . qq|
+ |
+ . $locale->text('Liability') . qq|
+ |
+ . $locale->text('Revenue') . qq|
+ |
+ . $locale->text('Expense') . qq|
|
@@ -307,12 +364,12 @@ $jsscript
-{path}>
{login}>
{password}>
-
+
@@ -321,148 +378,194 @@ $jsscript
$lxdebug->leave_sub();
}
-
sub generate_report {
$lxdebug->enter_sub();
$form->{sort} = "transdate" unless $form->{sort};
GL->all_transactions(\%myconfig, \%$form);
-
- $callback = "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+ $callback =
+ "$form->{script}?action=generate_report&login=$form->{login}&password=$form->{password}";
$href = $callback;
-
- %acctype = ( 'A' => $locale->text('Asset'),
- 'C' => $locale->text('Contra'),
- 'L' => $locale->text('Liability'),
- 'Q' => $locale->text('Equity'),
- 'I' => $locale->text('Revenue'),
- 'E' => $locale->text('Expense'),
- );
-
+
+ %acctype = ('A' => $locale->text('Asset'),
+ 'C' => $locale->text('Contra'),
+ 'L' => $locale->text('Liability'),
+ 'Q' => $locale->text('Equity'),
+ 'I' => $locale->text('Revenue'),
+ 'E' => $locale->text('Expense'),);
+
$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}});
+ $form->{title} .= " : " . $locale->text($acctype{ $form->{category} });
}
if ($form->{accno}) {
- $href .= "&accno=".$form->escape($form->{accno});
- $callback .= "&accno=".$form->escape($form->{accno},1);
- $option = $locale->text('Account')." : $form->{accno} $form->{account_description}";
- }
- if ($form->{gifi_accno}) {
- $href .= "&gifi_accno=".$form->escape($form->{gifi_accno});
- $callback .= "&gifi_accno=".$form->escape($form->{gifi_accno},1);
- $option .= "\n " if $option;
- $option .= $locale->text('GIFI')." : $form->{gifi_accno} $form->{gifi_account_description}";
+ $href .= "&accno=" . $form->escape($form->{accno});
+ $callback .= "&accno=" . $form->escape($form->{accno}, 1);
+ $option =
+ $locale->text('Account')
+ . " : $form->{accno} $form->{account_description}";
}
if ($form->{source}) {
- $href .= "&source=".$form->escape($form->{source});
- $callback .= "&source=".$form->escape($form->{source},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Source')." : $form->{source}";
+ $href .= "&source=" . $form->escape($form->{source});
+ $callback .= "&source=" . $form->escape($form->{source}, 1);
+ $option .= "\n " if $option;
+ $option .= $locale->text('Source') . " : $form->{source}";
}
if ($form->{reference}) {
- $href .= "&reference=".$form->escape($form->{reference});
- $callback .= "&reference=".$form->escape($form->{reference},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Reference')." : $form->{reference}";
+ $href .= "&reference=" . $form->escape($form->{reference});
+ $callback .= "&reference=" . $form->escape($form->{reference}, 1);
+ $option .= "\n " if $option;
+ $option .= $locale->text('Reference') . " : $form->{reference}";
}
if ($form->{department}) {
- $href .= "&department=".$form->escape($form->{department});
- $callback .= "&department=".$form->escape($form->{department},1);
+ $href .= "&department=" . $form->escape($form->{department});
+ $callback .= "&department=" . $form->escape($form->{department}, 1);
($department) = split /--/, $form->{department};
$option .= "\n " if $option;
- $option .= $locale->text('Department')." : $department";
+ $option .= $locale->text('Department') . " : $department";
}
if ($form->{description}) {
- $href .= "&description=".$form->escape($form->{description});
- $callback .= "&description=".$form->escape($form->{description},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Description')." : $form->{description}";
+ $href .= "&description=" . $form->escape($form->{description});
+ $callback .= "&description=" . $form->escape($form->{description}, 1);
+ $option .= "\n " if $option;
+ $option .= $locale->text('Description') . " : $form->{description}";
}
if ($form->{notes}) {
- $href .= "¬es=".$form->escape($form->{notes});
- $callback .= "¬es=".$form->escape($form->{notes},1);
- $option .= "\n " if $option;
- $option .= $locale->text('Notes')." : $form->{notes}";
+ $href .= "¬es=" . $form->escape($form->{notes});
+ $callback .= "¬es=" . $form->escape($form->{notes}, 1);
+ $option .= "\n " if $option;
+ $option .= $locale->text('Notes') . " : $form->{notes}";
}
-
+ if ($form->{project_id}) {
+ $href .= "&project_id=" . $form->escape($form->{project_id});
+ $callback .= "&project_id=" . $form->escape($form->{project_id});
+ }
+
if ($form->{datefrom}) {
- $href .= "&datefrom=$form->{datefrom}";
+ $href .= "&datefrom=$form->{datefrom}";
$callback .= "&datefrom=$form->{datefrom}";
- $option .= "\n " if $option;
- $option .= $locale->text('From')." ".$locale->date(\%myconfig, $form->{datefrom}, 1);
+ $option .= "\n " if $option;
+ $option .=
+ $locale->text('From') . " "
+ . $locale->date(\%myconfig, $form->{datefrom}, 1);
}
if ($form->{dateto}) {
- $href .= "&dateto=$form->{dateto}";
+ $href .= "&dateto=$form->{dateto}";
$callback .= "&dateto=$form->{dateto}";
if ($form->{datefrom}) {
$option .= " ";
} else {
$option .= "\n " if $option;
}
- $option .= $locale->text('Bis')." ".$locale->date(\%myconfig, $form->{dateto}, 1);
+ $option .=
+ $locale->text('Bis') . " "
+ . $locale->date(\%myconfig, $form->{dateto}, 1);
}
+ @columns = $form->sort_columns( qw(
+ transdate id reference description
+ notes source debit debit_accno
+ credit credit_accno debit_tax debit_tax_accno
+ credit_tax credit_tax_accno accno
+ projectnumbers
+ )
+ );
- @columns = $form->sort_columns(qw(transdate id reference description notes source debit debit_accno credit credit_accno debit_tax debit_tax_accno credit_tax credit_tax_accno accno gifi_accno));
-
- if ($form->{accno} || $form->{gifi_accno}) {
- @columns = grep !/(accno|gifi_accno)/, @columns;
+ if ($form->{accno}) {
+ @columns = grep !/accno/, @columns;
push @columns, "balance";
$form->{l_balance} = "Y";
-
- }
-
- $form->{l_credit_accno} = "Y";
- $form->{l_debit_accno} = "Y";
- $form->{l_credit_tax} = "Y";
- $form->{l_debit_tax} = "Y";
+
+ }
+
+ $form->{l_credit_accno} = "Y";
+ $form->{l_debit_accno} = "Y";
+ $form->{l_credit_tax} = "Y";
+ $form->{l_debit_tax} = "Y";
$form->{l_credit_tax_accno} = "Y";
- $form->{l_debit_tax_accno} = "Y";
- $form->{l_accno} = "N";
+ $form->{l_debit_tax_accno} = "Y";
+ $form->{l_accno} = "N";
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
# add column to href and callback
$callback .= "&l_$item=Y";
- $href .= "&l_$item=Y";
+ $href .= "&l_$item=Y";
}
}
if ($form->{l_subtotal} eq 'Y') {
$callback .= "&l_subtotal=Y";
- $href .= "&l_subtotal=Y";
+ $href .= "&l_subtotal=Y";
}
$callback .= "&category=$form->{category}";
- $href .= "&category=$form->{category}";
-
- $column_header{id} = "".$locale->text('ID')." | ";
- $column_header{transdate} = "".$locale->text('Date')." | ";
- $column_header{reference} = "".$locale->text('Reference')." | ";
- $column_header{source} = "".$locale->text('Source')." | ";
- $column_header{description} = "".$locale->text('Description')." | ";
- $column_header{notes} = "".$locale->text('Notes')." | ";
- $column_header{debit} = "".$locale->text('Debit')." | ";
- $column_header{debit_accno} = "".$locale->text('Debit Account')." | ";
- $column_header{credit} = "".$locale->text('Credit')." | ";
- $column_header{credit_accno} = "".$locale->text('Credit Account')." | ";
- $column_header{debit_tax} = "".$locale->text('Debit Tax')." | ";
- $column_header{debit_tax_accno} = "".$locale->text('Debit Tax Account')." | ";
- $column_header{credit_tax} = "".$locale->text('Credit Tax')." | ";
- $column_header{credit_tax_accno} = "".$locale->text('Credit Tax Account')." | ";
- $column_header{gifi_accno} = "".$locale->text('GIFI')." | ";
- $column_header{balance} = "".$locale->text('Balance')." | ";
-
+ $href .= "&category=$form->{category}";
+
+ $column_header{id} =
+ ""
+ . $locale->text('ID')
+ . " | ";
+ $column_header{transdate} =
+ ""
+ . $locale->text('Date')
+ . " | ";
+ $column_header{reference} =
+ ""
+ . $locale->text('Reference')
+ . " | ";
+ $column_header{source} =
+ ""
+ . $locale->text('Source')
+ . " | ";
+ $column_header{description} =
+ ""
+ . $locale->text('Description')
+ . " | ";
+ $column_header{notes} =
+ "" . $locale->text('Notes') . " | ";
+ $column_header{debit} =
+ "" . $locale->text('Debit') . " | ";
+ $column_header{debit_accno} =
+ ""
+ . $locale->text('Debit Account')
+ . " | ";
+ $column_header{credit} =
+ "" . $locale->text('Credit') . " | ";
+ $column_header{credit_accno} =
+ ""
+ . $locale->text('Credit Account')
+ . " | ";
+ $column_header{debit_tax} =
+ ""
+ . $locale->text('Debit Tax')
+ . " | ";
+ $column_header{debit_tax_accno} =
+ ""
+ . $locale->text('Debit Tax Account')
+ . " | ";
+ $column_header{credit_tax} =
+ ""
+ . $locale->text('Credit Tax')
+ . " | ";
+ $column_header{credit_tax_accno} =
+ ""
+ . $locale->text('Credit Tax Account')
+ . " | ";
+ $column_header{balance} = "" . $locale->text('Balance') . " | ";
+ $column_header{projectnumbers} =
+ "" . $locale->text('Project Numbers') . " | ";
+
$form->{landscape} = 1;
-
+
$form->header;
print qq|
@@ -483,186 +586,246 @@ sub generate_report {
|;
-map { print "$column_header{$_}\n" } @column_index;
+ map { print "$column_header{$_}\n" } @column_index;
-print "
+ print "
";
-
+
# add sort to callback
$form->{callback} = "$callback&sort=$form->{sort}";
$callback = $form->escape($form->{callback});
-
+
# initial item for subtotals
if (@{ $form->{GL} }) {
- $sameitem = $form->{GL}->[0]->{$form->{sort}};
+ $sameitem = $form->{GL}->[0]->{ $form->{sort} };
}
-
- if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
+
+ if ($form->{accno} && $form->{balance}) {
map { $column_data{$_} = " | " } @column_index;
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
- $i++; $i %= 2;
+ $column_data{balance} =
+ ""
+ . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)
+ . " | ";
+
+ $i++;
+ $i %= 2;
print qq|
|;
map { print "$column_data{$_}\n" } @column_index;
-
+
print qq|
|;
}
-
+ $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;
+ 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}})) {
+ foreach $key (sort keys(%{ $ref->{debit} })) {
$subtotaldebit += $ref->{debit}{$key};
- $totaldebit += $ref->{debit}{$key};
+ $totaldebit += $ref->{debit}{$key};
if ($key == 0) {
- $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
+ $debit = $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
} else {
- $debit .= " ".$form->format_amount(\%myconfig, $ref->{debit}{$key} , 2, 0);
+ $debit .=
+ " " . $form->format_amount(\%myconfig, $ref->{debit}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit}{$key});
}
-
+
$credit = "";
- foreach $key (sort keys (%{$ref->{credit}})) {
+ foreach $key (sort keys(%{ $ref->{credit} })) {
$subtotalcredit += $ref->{credit}{$key};
- $totalcredit += $ref->{credit}{$key};
+ $totalcredit += $ref->{credit}{$key};
if ($key == 0) {
- $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
+ $credit = $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
} else {
- $credit .= " ".$form->format_amount(\%myconfig, $ref->{credit}{$key} , 2, 0);
- }
+ $credit .= " "
+ . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
+ }
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
}
-
+
$debittax = "";
- foreach $key (sort keys (%{$ref->{debit_tax}})) {
+ foreach $key (sort keys(%{ $ref->{debit_tax} })) {
$subtotaldebittax += $ref->{debit_tax}{$key};
- $totaldebittax += $ref->{debit_tax}{$key};
+ $totaldebittax += $ref->{debit_tax}{$key};
if ($key == 0) {
- $debittax = $form->format_amount(\%myconfig, $ref->{debit_tax}{$key} , 2, 0);
+ $debittax =
+ $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
} else {
- $debittax .= " ".$form->format_amount(\%myconfig, $ref->{debit_tax}{$key} , 2, 0);
+ $debittax .= " "
+ . $form->format_amount(\%myconfig, $ref->{debit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{debit_tax}{$key});
}
-
+
$credittax = "";
- foreach $key (sort keys (%{$ref->{credit_tax}})) {
+ foreach $key (sort keys(%{ $ref->{credit_tax} })) {
$subtotalcredittax += $ref->{credit_tax}{$key};
- $totalcredittax += $ref->{credit_tax}{$key};
+ $totalcredittax += $ref->{credit_tax}{$key};
if ($key == 0) {
- $credittax = $form->format_amount(\%myconfig, $ref->{credit_tax}{$key} , 2, 0);
+ $credittax =
+ $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
} else {
- $credittax .= " ".$form->format_amount(\%myconfig, $ref->{credit_tax}{$key} , 2, 0);
+ $credittax .= " "
+ . $form->format_amount(\%myconfig, $ref->{credit_tax}{$key}, 2, 0);
}
+ $form->{balance} = abs($form->{balance}) - abs($ref->{credit_tax}{$key});
}
-
- $debitaccno = "";
+
+ $debitaccno = "";
$debittaxkey = "";
- $taxaccno = "";
- foreach $key (sort keys (%{$ref->{debit_accno}})) {
+ $taxaccno = "";
+ foreach $key (sort keys(%{ $ref->{debit_accno} })) {
if ($key == 0) {
- $debitaccno = "{accno}&callback=$callback>$ref->{debit_accno}{$key}";
+ $debitaccno =
+ "{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}";
} else {
- $debitaccno .= " {accno}&callback=$callback>$ref->{debit_accno}{$key}";
+ $debitaccno .=
+ " {debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}";
}
- if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
- $ref->{debit_tax_accno}{$key} = $taxaccno;
- }
- $taxaccno = $ref->{debit_tax_accno}{$key};
+
+ # if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+ # $ref->{debit_tax_accno}{$key} = $taxaccno;
+ # }
+ $taxaccno = $ref->{debit_tax_accno}{$key};
$debittaxkey = $ref->{debit_taxkey}{$key};
}
-
- $creditaccno = "";
+
+ $creditaccno = "";
$credittaxkey = "";
- $taxaccno = "";
- foreach $key (sort keys (%{$ref->{credit_accno}})) {
+ $taxaccno = "";
+ foreach $key (sort keys(%{ $ref->{credit_accno} })) {
if ($key == 0) {
- $creditaccno = "{accno}&callback=$callback>$ref->{credit_accno}{$key}";
+ $creditaccno =
+ "{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}";
} else {
- $creditaccno .= " {accno}&callback=$callback>$ref->{credit_accno}{$key}";
- }
- if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
- $ref->{credit_tax_accno}{$key} = $taxaccno;
+ $creditaccno .=
+ " {credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}";
}
- $taxaccno = $ref->{credit_tax_accno}{$key};
+
+ # if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+ # $ref->{credit_tax_accno}{$key} = $taxaccno;
+ # }
+ $taxaccno = $ref->{credit_tax_accno}{$key};
$credittaxkey = $ref->{credit_taxkey}{$key};
- }
-
+ }
+
$debittaxaccno = "";
- foreach $key (sort keys (%{$ref->{debit_tax_accno}})) {
+ foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
if ($key == 0) {
- $debittaxaccno = "{accno}&callback=$callback>$ref->{debit_tax_accno}{$key}";
+ $debittaxaccno =
+ "{debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}";
} else {
- $debittaxaccno .= " {accno}&callback=$callback>$ref->{debit_tax_accno}{$key}";
+ $debittaxaccno .=
+ " {debit_tax_accno}{$key}&callback=$callback>$ref->{debit_tax_accno}{$key}";
}
}
-
+
$credittaxaccno = "";
- foreach $key (sort keys (%{$ref->{credit_tax_accno}})) {
+ foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
if ($key == 0) {
- $credittaxaccno = "{accno}&callback=$callback>$ref->{credit_tax_accno}{$key}";
+ $credittaxaccno =
+ "{credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}";
} else {
- $credittaxaccno .= " {accno}&callback=$callback>$ref->{credit_tax_accno}{$key}";
+ $credittaxaccno .=
+ " {credit_tax_accno}{$key}&callback=$callback>$ref->{credit_tax_accno}{$key}";
}
- }
-# $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
-# $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
-
- $column_data{id} = " $ref->{id} | ";
- $column_data{transdate} = " $ref->{transdate} | ";
- $column_data{reference} = "{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference} | ";
- $column_data{description} = "$ref->{description} | ";
- $column_data{source} = "$ref->{source} | ";
- $column_data{notes} = "$ref->{notes} | ";
- $column_data{debit} = "$debit | ";
- $column_data{debit_accno} = "$debitaccno | ";
- $column_data{credit} = "$credit | ";
+ }
+
+ $transdate = "";
+ foreach $key (sort keys(%{ $ref->{ac_transdate} })) {
+ if ($key == 0) {
+ $transdate = "$ref->{ac_transdate}{$key}";
+ } else {
+ $transdate .= " $ref->{ac_transdate}{$key}";
+ }
+ }
+
+ # $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
+ # $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
+
+ $column_data{id} = " $ref->{id} | ";
+ $column_data{transdate} = "$transdate | ";
+ $column_data{reference} =
+ "{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference} | ";
+ $column_data{description} = "$ref->{description} | ";
+ $column_data{source} = "$ref->{source} | ";
+ $column_data{notes} = "$ref->{notes} | ";
+ $column_data{debit} = "$debit | ";
+ $column_data{debit_accno} = "$debitaccno | ";
+ $column_data{credit} = "$credit | ";
$column_data{credit_accno} = "$creditaccno | ";
- $column_data{debit_tax} = ($ref->{debit_tax_accno} ne "") ? "$debittax | " : " | ";
+ $column_data{debit_tax} =
+ ($ref->{debit_tax_accno} ne "")
+ ? "$debittax | "
+ : " | ";
$column_data{debit_tax_accno} = "$debittaxaccno | ";
- $column_data{gifi_accno} = "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
- $column_data{credit_tax} = ($ref->{credit_tax_accno} ne "") ? "$credittax | " : " | ";
+ $column_data{credit_tax} =
+ ($ref->{credit_tax_accno} ne "")
+ ? "$credittax | "
+ : " | ";
$column_data{credit_tax_accno} = "$credittaxaccno | ";
- $column_data{gifi_accno} = "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
- $i++; $i %= 2;
+ $column_data{balance} =
+ ""
+ . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . " | ";
+ $column_data{projectnumbers} =
+ "" . join(", ", sort({ lc($a) cmp lc($b) } keys(%{ $ref->{projectnumbers} }))) . " | ";
+
+ $i++;
+ $i %= 2;
print "
";
map { print "$column_data{$_}\n" } @column_index;
print " ";
-
- }
+ }
&gl_subtotal if ($form->{l_subtotal} eq 'Y');
-
map { $column_data{$_} = " | " } @column_index;
-
- $column_data{debit} = "".$form->format_amount(\%myconfig, $totaldebit, 2, " ")." | ";
- $column_data{credit} = "".$form->format_amount(\%myconfig, $totalcredit, 2, " ")." | ";
- $column_data{debit_tax} = "".$form->format_amount(\%myconfig, $totaldebittax, 2, " ")." | ";
- $column_data{credit_tax} = "".$form->format_amount(\%myconfig, $totalcredittax, 2, " ")." | ";
- $column_data{balance} = "".$form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0)." | ";
-
+
+ my $balanced_ledger = $totaldebit
+ + $totaldebittax
+ - $totalcredit
+ - $totalcredittax;
+ # = 0 for balanced ledger
+
+ $column_data{debit} =
+ ""
+ . $form->format_amount(\%myconfig, $totaldebit, 2, " ") . " | ";
+ $column_data{credit} =
+ ""
+ . $form->format_amount(\%myconfig, $totalcredit, 2, " ") . " | ";
+ $column_data{debit_tax} =
+ ""
+ . $form->format_amount(\%myconfig, $totaldebittax, 2, " ") . " | ";
+ $column_data{credit_tax} =
+ ""
+ . $form->format_amount(\%myconfig, $totalcredittax, 2, " ") . " | ";
+ $column_data{balance} =
+ ""
+ . $form->format_amount(\%myconfig, $form->{balance} * $ml, 2, 0) . " | ";
+
print qq|
|;
@@ -671,6 +834,27 @@ print "
print qq|
+ |;
+
+
+ if ( abs($balanced_ledger) > 0.001 ) {
+
+ print qq||
+ . $locale->text('Unbalanced Ledger')
+ . ": "
+ . $form->format_amount(\%myconfig, $balanced_ledger, 3, " ")
+
+ } elsif ( abs($balanced_ledger) <= 0.001 ) {
+
+ print qq| | |
+ . $locale->text('Balanced Ledger')
+
+ }
+
+
+ print qq|
+ |
+
|
@@ -686,215 +870,449 @@ print "
-{path}>
{login}>
{password}>
-
-
-
-
-|;
-
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+
+
+
+
+