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

[..hidden..]

Revision: 2903
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2903&view=rev
Author:   einhverfr
Date:     2010-02-22 17:42:52 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
Minor formatting fixes to asset reports

Modified Paths:
--------------
    addons/1.3/assets/trunk/UI/asset/begin_approval.html
    addons/1.3/assets/trunk/scripts/asset.pl

Modified: addons/1.3/assets/trunk/UI/asset/begin_approval.html
===================================================================
--- addons/1.3/assets/trunk/UI/asset/begin_approval.html	2010-02-19 19:01:21 UTC (rev 2902)
+++ addons/1.3/assets/trunk/UI/asset/begin_approval.html	2010-02-22 17:42:52 UTC (rev 2903)
@@ -37,7 +37,9 @@
 <?lsmb PROCESS select element_data = {
      name = "expense_acct"
      class = "account"
-     options = dep_expense_accts
+     options = exp_accounts
+     text_attr = 'text'
+     value_attr = 'id'
      default_values = [expense_acct]
      label = text('Expense Account') #'
 } ?>

Modified: addons/1.3/assets/trunk/scripts/asset.pl
===================================================================
--- addons/1.3/assets/trunk/scripts/asset.pl	2010-02-19 19:01:21 UTC (rev 2902)
+++ addons/1.3/assets/trunk/scripts/asset.pl	2010-02-22 17:42:52 UTC (rev 2903)
@@ -518,12 +518,15 @@
                             tag => $locale->text('Tag'),
                     description => $locale->text('Description'),
                   purchase_date => $locale->text('Purchase Date'),
+                         basis  => $locale->text('Depreciation Basis'),
                          amount => $locale->text('Amount'),
     };
     my $rows = [];
     for my $r (@{$report->{report_lines}}){
-        $r->{basis} = $report->format_amount({amount => $r->{basis}});
-        $r->{amount} = $report->format_amount({amount => $r->{amount}});
+        $r->{basis} = $report->format_amount({amount => $r->{basis},
+                                              money  => 1,});
+        $r->{amount} = $report->format_amount({amount => $r->{amount},
+                                                money => 1});
         push @$rows, $r;
     }
     my $template = LedgerSMB::Template->new(


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