[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[5151] branches/1.3



Revision: 5151
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5151&view=rev
Author:   einhverfr
Date:     2012-10-08 08:21:23 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Correcting bug 3556279, end date, start date, and credit limit not showing on summary table

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/ScriptLib/Company.pm
    branches/1.3/UI/Contact/contact.html

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-10-08 08:07:40 UTC (rev 5150)
+++ branches/1.3/Changelog	2012-10-08 08:21:23 UTC (rev 5151)
@@ -17,6 +17,7 @@
 * Fixed query err when generating sales orders from time cards (Erik H, 3559621)
 * Fixed backup does not test for failure (Havard S, h/t Nick P, 3574876)
 * prepre_company_database.sh now only gives user mgmt rights (Berend T)
+* Fixed end date, etc not showing on summary list, (Chris T, 3556279)
 
 Berend T is Berent Tober
 Chris T is Chris Travers

Modified: branches/1.3/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- branches/1.3/LedgerSMB/ScriptLib/Company.pm	2012-10-08 08:07:40 UTC (rev 5150)
+++ branches/1.3/LedgerSMB/ScriptLib/Company.pm	2012-10-08 08:21:23 UTC (rev 5151)
@@ -743,6 +743,10 @@
         procname => 'pricegroup__list'
     );
 
+    for $eca (@{$company->{credit_list}}){
+        $eca->{creditlimit} = $company->format_amount({amount => $eca->{creditlimit}});
+    }
+
     $company->{creditlimit} = $company->format_amount({amount => $company->{creditlimit}}) unless !defined $company->{creditlimit}; 
     $company->{discount} = "$company->{discount}" unless !defined $company->{discount}; 
     $company->{note_class_options} = [

Modified: branches/1.3/UI/Contact/contact.html
===================================================================
--- branches/1.3/UI/Contact/contact.html	2012-10-08 08:07:40 UTC (rev 5150)
+++ branches/1.3/UI/Contact/contact.html	2012-10-08 08:21:23 UTC (rev 5151)
@@ -409,9 +409,9 @@
 		account_class ?>&entity_id=<?lsmb entity_id 
 		?>&meta_number=<?lsmb cl_item.meta_number ?>"><?lsmb cl_item.meta_number ?></a></td>
         <td><?lsmb cl_item.description ?></td>
-        <td><?lsmb cl_item.credit_limit ?></td>
-        <td><?lsmb cl_item.start_date ?></td>
-        <td><?lsmb cl_item.end_date ?></td>
+        <td><?lsmb cl_item.creditlimit ?></td>
+        <td><?lsmb cl_item.startdate ?></td>
+        <td><?lsmb cl_item.enddate ?></td>
     </tr>    
     <?lsmb END ?>
     </table>

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