summaryrefslogtreecommitdiff
path: root/UI/payments
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-12-06 22:08:49 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-12-06 22:08:49 +0000
commite5aa2c6737821924b77734ccfee74f1930831234 (patch)
tree3880d2f8f07c04e2e83ebcf63a8c7bfd9880be1f /UI/payments
parent54f827658f696a0cf3209b19d432a624f1f6b02b (diff)
Misc fixes
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1955 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'UI/payments')
-rw-r--r--UI/payments/payments_detail.html61
-rw-r--r--UI/payments/payments_filter.html5
2 files changed, 62 insertions, 4 deletions
diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html
index d46cfe64..be3facb2 100644
--- a/UI/payments/payments_detail.html
+++ b/UI/payments/payments_detail.html
@@ -23,6 +23,12 @@
} ?>
<?lsmb INCLUDE input element_data = {
type = "hidden"
+ name = "account_class"
+ value = account_class
+
+ } ?>
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
name = "department_id"
value = department_id
} ?>
@@ -70,7 +76,9 @@
<div id="date_row">
<label for="date_paid"><?lsmb text('Posting Date:') ?></label>
<?lsmb IF batch_id ?>
- <span id="date_paid"><?lsmb date_paid ?></span>
+ <?lsmb IF ! datepaid ?><?lsmb datepaid = batch_date
+ ?><?lsmb END ?>
+ <span id="date_paid"><?lsmb datepaid ?></span>
<?lsmb END ?>
<?lsmb INCLUDE input element_data= {
value = datepaid
@@ -129,6 +137,15 @@
<?lsmb END # foreach b ?></span>
</div>
<?lsmb END # if business ?>
+ <div class="input" id="cash_account_div">
+ <select name="cash_accno" id="cash_account">
+ <?lsmb FOREACH a = cash_accounts ?>
+ <option value="<?lsmb a.accno ?>">
+ <?lsmb a.accno ?>--<?lsmb a.description ?>
+ </option>
+ <?lsmb END # foreach a ?>
+ </select>
+ </div>
<table id="payments_table">
<tr class="listheading">
<th class="account_number"><?lsmb text('Account_number') ?></th>
@@ -137,11 +154,25 @@
<th class="payment"><?lsmb text('Payment') ?></th>
<th class="payment"><?lsmb text('Details') ?></th>
</tr>
- <?lsmb rc = 1 ?>
+ <?lsmb rc = 1 ?><?lsmb count = 0 ?>
<?lsmb FOREACH r = contact_invoices ?>
- <?lsmb rc = rc + 1; rc = rc % 2 ?>
+ <?lsmb rc = (rc + 1) % 2; count = count + 1 ?>
<tr class="listrow<?lsmb rc ?>">
- <td class="account_number" rowspan="2" ><?lsmb r.account_number ?></td>
+ <td class="account_number" rowspan="2" >
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
+ name = "contact_$count"
+ value = r.contact_id
+ } ?>
+ <?lsmb INCLUDE input element_data = {
+ type = "checkbox"
+ name = "id_$r.contact_id"
+ value = r.contact_id
+ checked = (r.unselected) ? "" : "checked"
+
+ } ?>
+ <?lsmb r.account_number ?>
+ </td>
<td class="entity_name"><?lsmb r.contact_name ?></td>
<td class="invoice"><?lsmb r.total_due ?> <?lsmb currency ?></td>
<td class="payment">
@@ -182,7 +213,9 @@
<th class="net_due_list"><?lsmb text('Net Due') ?> </th>
<th class="to_pay_list"><?lsmb text('To Pay') ?></th>
</tr>
+ <?lsmb icount = 0 ?>
<?lsmb FOREACH i = r.invoices ?>
+ <?lsmb icount = icount + 1 ?>
<tr>
<td class="invoice_date_list">&nbsp;<?lsmb i.2 ?></td>
<td class="invoice_list">&nbsp;<?lsmb i.1 ?></td>
@@ -204,13 +237,33 @@
type = "text"
class = "monetary"
} ?>
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
+ name = "invoice_${r.contact_id}_$icount"
+ value = i.0
+ } ?>
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
+ name = "net_$i.0"
+ value = i.6
+ } ?>
</td>
</tr>
<?lsmb END # foreach i ?>
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
+ name = "invoice_count_${r.contact_id}"
+ value = icount
+ } ?>
</table>
</tr>
<?lsmb END # foreach r ?>
</table>
+ <?lsmb INCLUDE input element_data = {
+ type = "hidden"
+ name = "contact_count"
+ value = count
+ } ?>
<?lsmb INCLUDE button element_data = {
text = text('Post'),
value = 'post_payments_bulk'
diff --git a/UI/payments/payments_filter.html b/UI/payments/payments_filter.html
index e8cbd6b0..f3ff8e3d 100644
--- a/UI/payments/payments_filter.html
+++ b/UI/payments/payments_filter.html
@@ -29,6 +29,11 @@
type = "hidden"
name = "batch_id"
} ?>
+<?lsmb INCLUDE input element_data={
+ value = batch_date
+ type = "hidden"
+ name = "batch_date"
+} ?>
<div id = "payments-filter-categories" class="inputgroup">
<?lsmb IF projects ?>
<div id = "payments-filter-projects" class="input">