SF.net SVN: ledger-smb:[3143] trunk

[..hidden..]

Revision: 3143
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3143&view=rev
Author:   einhverfr
Date:     2011-05-20 05:38:46 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Erik's single payment workflow fixes

Modified Paths:
--------------
    trunk/UI/payments/payment2.html
    trunk/sql/modules/Payment.sql

Modified: trunk/UI/payments/payment2.html
===================================================================
--- trunk/UI/payments/payment2.html	2011-05-18 21:30:57 UTC (rev 3142)
+++ trunk/UI/payments/payment2.html	2011-05-20 05:38:46 UTC (rev 3143)
@@ -36,7 +36,11 @@
    <td width="50%" id="info_data">
     <table id="cv_info_table">
      <tr id="cv_row">
-      <th class="label_left" id="cv_label_column"><?lsmb  text('Vendor') ?></th>
+      <th class="label_left" id="cv_label_column">
+                <?lsmb IF (type.value == 'receipt') -?>
+                  <?lsmb text('Customer Name') -?>
+                <?lsmb ELSE; text('Vendor Name') -?>
+                <?lsmb END -?></th>
        <td id="cv_column">
        		<?lsmb vc.name ?><?lsmb vendorcustomer.type = 'hidden'; INCLUDE input element_data=vendorcustomer?>       		
        </td>

Modified: trunk/sql/modules/Payment.sql
===================================================================
--- trunk/sql/modules/Payment.sql	2011-05-18 21:30:57 UTC (rev 3142)
+++ trunk/sql/modules/Payment.sql	2011-05-20 05:38:46 UTC (rev 3143)
@@ -39,7 +39,9 @@
 
  BEGIN
  	FOR out_entity IN
- 		SELECT ec.id, cp.legal_name||': '||ec.description as name, e.entity_class, ec.discount_account_id, ec.meta_number
+              SELECT ec.id, cp.legal_name || 
+                     coalesce(':' || ec.description,'') as name, 
+                     e.entity_class, ec.discount_account_id, ec.meta_number
  		FROM entity_credit_account ec
  		JOIN entity e ON (ec.entity_id = e.id)
  		JOIN company cp ON (cp.entity_id = e.id)


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