[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6229] branches/1.3
- Subject: SF.net SVN: ledger-smb:[6229] branches/1.3
- From: ..hidden..
- Date: Wed, 6 Nov 2013 10:55:00 +0000
Revision: 6229
http://sourceforge.net/p/ledger-smb/code/6229
Author: einhverfr
Date: 2013-11-06 10:55:00 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Removing 'apply discount' from using the overpayments. merging from trunk
Modified Paths:
--------------
branches/1.3/Changelog
branches/1.3/UI/payments/use_overpayment1.html
branches/1.3/UI/payments/use_overpayment2.html
Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog 2013-11-06 10:53:11 UTC (rev 6228)
+++ branches/1.3/Changelog 2013-11-06 10:55:00 UTC (rev 6229)
@@ -4,6 +4,7 @@
Changelog for 1.3.36
* Set default date for AP invoice creation to current date (Chris T)
+* Removed "apply discount" from use overpayment screen (Chris T)
Changelog for 1.3.35
* Fixed uninitialized value warnings when cached template enabled (Chris T)
Modified: branches/1.3/UI/payments/use_overpayment1.html
===================================================================
--- branches/1.3/UI/payments/use_overpayment1.html 2013-11-06 10:53:11 UTC (rev 6228)
+++ branches/1.3/UI/payments/use_overpayment1.html 2013-11-06 10:55:00 UTC (rev 6229)
@@ -1,5 +1,5 @@
<?lsmb INCLUDE "ui-header.html" ?>
-<body id="use_overpayment1">
+<body id="use_overpayment1" class="<?lsmb dojo_theme ?>">
<form name="search" method="post" action="payment.pl">
<?lsmb PROCESS elements.html # Include form elements helper. -?>
<?lsmb login.type = 'hidden' ; INCLUDE input element_data=login -?>
Modified: branches/1.3/UI/payments/use_overpayment2.html
===================================================================
--- branches/1.3/UI/payments/use_overpayment2.html 2013-11-06 10:53:11 UTC (rev 6228)
+++ branches/1.3/UI/payments/use_overpayment2.html 2013-11-06 10:55:00 UTC (rev 6229)
@@ -1,5 +1,6 @@
<?lsmb INCLUDE "ui-header.html" ?>
-<body id="payment_2_body" onLoad="maximize_minimize_on_load('div_topay_state', 'UI/payments/img/down.gif','UI/payments/img/up.gif') ">
+<body id="payment_2_body" onLoad="maximize_minimize_on_load('div_topay_state', 'UI/payments/img/down.gif','UI/payments/img/up.gif') "
+class="<?lsmb dojo_theme ?>">
<form name="pay_single_dues" method="post" action="payment.pl">
<?lsmb PROCESS elements.html # Include form elements helper. ?>
@@ -143,7 +144,6 @@
<th class="listheading"><?lsmb text('Vendor') -?>/<?lsmb text('Customer') -?></th>
<th class="listheading"><?lsmb text('Invoice date') -?></th>
<th class="listheading"><?lsmb text('Invoice due') -?></th>
- <th class="listheading"><?lsmb text('Apply Disc') -?></th>
<th class="listheading"><?lsmb text('Overpayment Account') ?>
<th class="listheading"><?lsmb text('Amount to be used') -?></th>
<th class="listheading">X</th>
@@ -160,25 +160,16 @@
</td>
<td align="center"> <?lsmb data.entity_name ?>
<input type="hidden" id="entity_id_<?lsmb i -?>" name="entity_id_<?lsmb i -?>" value="<?lsmb data.entity_id -?>" />
- <input type="hidden" id="vc_discount_accno_<?lsmb i -?>" name="vc_discount_accno_<?lsmb i -?>" value="<?lsmb data.vc_discount_accno -?>" />
</td>
<td align="center"> <?lsmb data.invoice_date ?>
<input type="hidden" id="invoice_date_<?lsmb i -?>" name="invoice_date_<?lsmb i -?>" value="<?lsmb data.invoice_date -?>" />
</td>
<td align="right"> <?lsmb data.applied_due -?>
<input type="hidden" id="due_<?lsmb i -?>" name="due_<?lsmb i -?>" value="<?lsmb data.due -?>" />
- <input type="hidden" id="discount_<?lsmb i -?>" name="discount_<?lsmb i -?>" value="<?lsmb data.discount -?>" />
</td>
<?lsmb IF data.repeated_invoice == 'true' -?>
<td align="center">
- <input type="hidden" id="optional_discount_<?lsmb i -?>" name="optional_discount_<?lsmb i -?>" value="<?lsmb data.optional_discount -?>"/>
</td>
- <?lsmb ELSE -?>
- <?lsmb IF data.optional_discount -?>
- <td align="center"> <input type="checkbox" id="optional_discount_<?lsmb i -?>" name="optional_discount_<?lsmb i -?>" checked/> </td>
- <?lsmb ELSE -?>
- <td align="center"> <input type="checkbox" id="optional_discount_<?lsmb i -?>" name="optional_discount_<?lsmb i -?>" /> </td>
- <?lsmb END -?>
<?lsmb END -?>
<td align="center"> <?lsmb data.selected_accno.ovp_accno ?>
<input type="hidden" id="selected_accno_<?lsmb i -?>" name="selected_accno_<?lsmb i -?>" value="<?lsmb data.selected_accno.id -?>--<?lsmb data.selected_accno.ovp_accno -?>" />
@@ -199,19 +190,15 @@
</td>
<td align="center"> <?lsmb data.entity_name ?>
<input type="hidden" id="entity_id_<?lsmb i -?>" name="entity_id_<?lsmb i -?>" value="<?lsmb data.entity_id -?>" />
- <input type="hidden" id="vc_discount_accno_<?lsmb i -?>" name="vc_discount_accno_<?lsmb i -?>" value="<?lsmb data.vc_discount_accno -?>" />
</td>
<td align="center"> <?lsmb data.invoice_date ?>
<input type="hidden" id="invoice_date_<?lsmb i -?>" name="invoice_date_<?lsmb i -?>" value="<?lsmb data.invoice_date -?>" />
</td >
<td align="right"> <?lsmb data.due ?>
<input type="hidden" id="due_<?lsmb i -?>" name="due_<?lsmb i -?>" value="<?lsmb data.due -?>" />
- <input type="hidden" id="discount_<?lsmb i -?>" name="discount_<?lsmb i -?>" value="<?lsmb data.discount -?>" />
</td>
<?lsmb IF data.repeated_invoice == 'true' -?>
<td align="center"> </td>
- <?lsmb ELSE -?>
- <td align="center"> <input type="checkbox" id="optional_discount_<?lsmb i -?>" name="optional_discount_<?lsmb i ?>" checked/> </td>
<?lsmb END -?>
<td align="center"> <?lsmb data.selected_accno.ovp_accno ?>
<input type="hidden" id="selected_accno_<?lsmb i -?>" name="selected_accno_<?lsmb i -?>" value="<?lsmb data.selected_accno.id -?>--<?lsmb data.selected_accno.ovp_accno -?>" />
@@ -239,7 +226,6 @@
</td>
<td align="center">N/A</td>
<td align="center">N/A</td>
- <td align="center"> </td>
<td align="center">
<select id="new_accno" name="new_accno">
<?lsmb FOREACH item IN overpayments ?>
@@ -259,7 +245,7 @@
</td>
</tr>
<tr class="listsubtotal" >
- <th class="listsubtotal" colspan="6" align="right"> <?lsmb text('Subtotal') -?></th>
+ <th class="listsubtotal" colspan="5" align="right"> <?lsmb text('Subtotal') -?></th>
<th class="listsubtotal"> <?lsmb subtotal_inv -?>
<input type="hidden" id="subtotal_inv" name="subtotal_inv" value="<?lsmb subtotal_inv -?>" />
</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits