diff options
author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-06-26 17:02:41 +0000 |
---|---|---|
committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-06-26 17:02:41 +0000 |
commit | 671cadd48adad36accbd124f2aaa868111e2675d (patch) | |
tree | 6224e76a32ab7709772d6f417626cf49a84a1779 | |
parent | ecb7951990e6618ba9c2d757279bd0956623999a (diff) |
Altering payment batch creation to allow for adding payments to existing batches
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2175 4979c152-3d1c-0410-bac9-87ea11338e46
-rw-r--r-- | UI/create_batch.html | 20 | ||||
-rw-r--r-- | scripts/vouchers.pl | 6 |
2 files changed, 25 insertions, 1 deletions
diff --git a/UI/create_batch.html b/UI/create_batch.html index df50cdbd..cfd10c2a 100644 --- a/UI/create_batch.html +++ b/UI/create_batch.html @@ -6,6 +6,7 @@ ] ?> <body> +<div class="listtop"><?lsmb text('Create New Batch') ?></div> <form name="create_batch" method="post"> <div class="labelledinput"> <div class="input"> @@ -39,5 +40,24 @@ <input type=hidden name="<?lsmb item.name ?>" value="<?lsmb item.value ?>"> <?lsmb END ?> </form> +<div class="listtop"><?lsmb text('Or Add To Batch') ?></div> +<table> +<tr class="listheading"> + <th><?lsmb text('Batch Type') ?></th> + <th><?lsmb text('Control Number') ?></th> + <th><?lsmb text('Description') ?></th> + <th><?lsmb text('Created By') ?></th> + <th><?lsmb text('Created On') ?></th> +</tr> +<?lsmb FOR row = search_results ?> +<tr> + <td><?lsmb text(row.batch_class) ?></td> + <td><a href="<?lsmb "vouchers.pl?action=add_vouchers&batch_type=$batch_type&id=$row.id" ?>"><?lsmb row.control_code ?></td> + <td><?lsmb row.description ?></td> + <td><?lsmb row.created_by ?></td> + <td><?lsmb row.created_on ?></td> +</tr> +<?lsmb END ?> +</table> </body> </html> diff --git a/scripts/vouchers.pl b/scripts/vouchers.pl index 321c0303..152e43e7 100644 --- a/scripts/vouchers.pl +++ b/scripts/vouchers.pl @@ -20,6 +20,10 @@ sub create_batch { $request->{hidden} = [ {name => "batch_type", value => $request->{batch_type}}, ]; + + my $batch = LedgerSMB::Batch->new({base => $request}); + $batch->get_search_results; + my $template = LedgerSMB::Template->new( user =>$request->{_user}, locale => $request->{_locale}, @@ -27,7 +31,7 @@ sub create_batch { template => 'create_batch', format => 'HTML' ); - $template->render($request); + $template->render($batch); } sub create_vouchers { |