SF.net SVN: ledger-smb:[2993] addons/1.3/assets/trunk

[..hidden..]

Revision: 2993
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2993&view=rev
Author:   einhverfr
Date:     2010-04-30 19:04:51 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Fix for partial disposal not displaying all columns

Modified Paths:
--------------
    addons/1.3/assets/trunk/LedgerSMB/DBObject/Asset_Report.pm
    addons/1.3/assets/trunk/scripts/asset.pl

Modified: addons/1.3/assets/trunk/LedgerSMB/DBObject/Asset_Report.pm
===================================================================
--- addons/1.3/assets/trunk/LedgerSMB/DBObject/Asset_Report.pm	2010-04-28 18:51:51 UTC (rev 2992)
+++ addons/1.3/assets/trunk/LedgerSMB/DBObject/Asset_Report.pm	2010-04-30 19:04:51 UTC (rev 2993)
@@ -49,10 +49,14 @@
         @{$self->{report_lines}} = $self->exec_method(
                                   funcname => 'asset_report__get_lines'
         );
-    } else {
+    } elsif ($self->{report_class} == 2) {
         @{$self->{report_lines}} = $self->exec_method(
                                   funcname => 'asset_report__get_disposal'
         );
+    } elsif ($self->{report_class} == 4) {
+       @{$self->{report_lines}} = $self->exec_method(
+                                   funcname => 'asset_report_partial_disposal_details'
+       );
     }
     return;
 }

Modified: addons/1.3/assets/trunk/scripts/asset.pl
===================================================================
--- addons/1.3/assets/trunk/scripts/asset.pl	2010-04-28 18:51:51 UTC (rev 2992)
+++ addons/1.3/assets/trunk/scripts/asset.pl	2010-04-30 19:04:51 UTC (rev 2993)
@@ -641,8 +641,11 @@
                         remaining_aquired_value percent_disposed 
                         percent_remaining)
         ){
-             $r->{$amt} = $report->format_amount({amount => $r->{$amt},
-                                              money  => 1,});
+             $r->{$amt} = $report->format_amount(
+                                  {amount => $r->{$amt},
+                                   money  => 1,
+                                  }
+             );
         }
         $r->{gain_loss} = $report->format_amount({amount => $r->{gain_loss},
                                                  money => 1,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.