diff options
Diffstat (limited to 'LedgerSMB')
| -rw-r--r-- | LedgerSMB/RP.pm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/LedgerSMB/RP.pm b/LedgerSMB/RP.pm index c46ee788..4854355e 100644 --- a/LedgerSMB/RP.pm +++ b/LedgerSMB/RP.pm @@ -251,13 +251,16 @@ sub income_statement { # push description onto array - $str = ( $form->{l_heading} ) ? $form->{padding} : ""; +## $str = ( $form->{l_heading} ) ? $form->{padding} : ""; + $str = ""; if ( $form->{$category}{$key}{charttype} eq "A" ) { $str .= ( $form->{l_accno} ) ? "$form->{$category}{$key}{accno} - $form->{$category}{$key}{description}" : "$form->{$category}{$key}{description}"; + $str = {account => $form->{$category}{$key}{accno}, text => $str }; + $str->{gifi_account} = 1 if $form->{accounttype} eq 'gifi'; } if ( $form->{$category}{$key}{charttype} eq "H" ) { if ( $account{$category}{subtotal} @@ -266,8 +269,10 @@ sub income_statement { $dash = "- "; push( - @{ $form->{"$account{$category}{label}_account"} }, -"$str$form->{bold}$account{$category}{subdescription}$form->{endbold}" + @{ $form->{"$account{$category}{label}_account"} }, { + text => "$account{$category}{subdescription}", + subtotal => 1, + }, ); push( @@ -304,8 +309,10 @@ sub income_statement { } - $str = -"$form->{br}$form->{bold}$form->{$category}{$key}{description}$form->{endbold}"; + $str = { + text => "$form->{$category}{$key}{description}", + heading => 1, + }; $account{$category}{subthis} = $form->{$category}{$key}{this}; $account{$category}{sublast} = $form->{$category}{$key}{last}; @@ -357,11 +364,14 @@ sub income_statement { } } - $str = ( $form->{l_heading} ) ? $form->{padding} : ""; +## $str = ( $form->{l_heading} ) ? $form->{padding} : ""; + $str = ""; if ( $account{$category}{subtotal} && $form->{l_subtotal} ) { push( - @{ $form->{"$account{$category}{label}_account"} }, -"$str$form->{bold}$account{$category}{subdescription}$form->{endbold}" + @{ $form->{"$account{$category}{label}_account"} }, { + text => "$account{$category}{subdescription}", + subtotal => 1, + }, ); push( @{ $form->{"$account{$category}{labels}_this_period"} }, |