SF.net SVN: ledger-smb: [2202] trunk/UI/payments/payment2.html

[..hidden..]

Revision: 2202
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2202&view=rev
Author:   einhverfr
Date:     2008-07-09 14:30:49 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Committing David Mora's single payment interface fix.

Modified Paths:
--------------
    trunk/UI/payments/payment2.html

Modified: trunk/UI/payments/payment2.html
===================================================================
--- trunk/UI/payments/payment2.html	2008-07-09 17:56:41 UTC (rev 2201)
+++ trunk/UI/payments/payment2.html	2008-07-09 21:30:49 UTC (rev 2202)
@@ -157,14 +157,11 @@
     <td><?lsmb row.invoice_date ?></td>
     <td><?lsmb row.amount ?></td>
     <td><?lsmb row.paid ?></td>
-<<<<<<< .mine
+
     <td><?lsmb row.discount ?></td>
     <td align="center"><input  name="<?lsmb "optional_discount_$row.invoice.id" -?>"  id="<?lsmb
        "optional_discount_$row.invoice.id" -?>" type="checkbox"  class="checkbox"<?lsmb IF
        row.optional_discount OR first_load -?> checked <?lsmb END -?> ></td>
-=======
-    <td><?lsmb row.discount ?></td>
->>>>>>> .r2199
     <td><?lsmb row.due ?></td>
     <?lsmb IF defaultcurrency.text != curr.value ?>
     <td><?lsmb row.exchange_rate ?></td>
@@ -300,7 +297,6 @@
          <input name="overpayment_source2_<?lsmb overpayment_item -?>"  id="overpayment_source2_<?lsmb overpayment_item -?>"/>
          <input type="hidden" name="overpayment_qty" id="overpayment_qty" value="<?lsmb overpayment_item ?>" />
      </td>
-<<<<<<< .mine
      <td align="center"><input name="overpayment_memo_<?lsmb overpayment_item -?>" id="overpayment_memo_<?lsmboverpayment_item ?>" /></td>     
      <td align="center">
       <input 
@@ -311,10 +307,6 @@
                 <?lsmb END -?>"      
       />
      </td>
-=======
-     <td align="center"><input name="overpayment_memo_<?lsmb overpayment_item -?>" id="overpayment_memo_<?lsmboverpayment_item ?>" /></td>     
-     <td align="center"><input name="overpayment_topay_<?lsmb overpayment_item -?>" id="overpayment_topay_<?lsmboverpayment_item ?>" /></td>
->>>>>>> .r2199
      <td align="center"><input type="checkbox" name="overpayment_checkbox_<?lsmb overpayment_item -?>"/></td>
    </tr>
    <tr class="listsubtotal">


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