Bugzilla – Attachment 12352 Details for
Bug 5339
Parcel closing in acq
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5339: ergonomic changes
0001-Bug-5339-ergonomic-changes.patch (text/plain), 6.56 KB, created by
Julian Maurice
on 2012-09-19 14:33:02 UTC
(
hide
)
Description:
Bug 5339: ergonomic changes
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2012-09-19 14:33:02 UTC
Size:
6.56 KB
patch
obsolete
>From 5e274fba8ba41e2a7db78af88a1bcac6c9cc10cf Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Wed, 19 Sep 2012 14:08:28 +0200 >Subject: [PATCH 1/2] Bug 5339: ergonomic changes > >- "Finish receive" on parcel.pl now redirect to acqui/invoice.pl, > allowing the librarian to modify invoice informations (freight, > billing date, ...) and close invoice. >- The librarian can now close (or reopen) the invoice and modify invoice > informations in 1 operation (instead of 2) >--- > acqui/invoice.pl | 5 ++ > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 74 ++++++++++---------- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 5 +- > 3 files changed, 45 insertions(+), 39 deletions(-) > >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index 1dc97ee..7c51ebc 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -79,6 +79,11 @@ elsif ( $op && $op eq 'mod' ) { > shipmentcost => $shipmentcost, > shipmentcost_budgetid => $shipment_budget_id > ); >+ if ($input->param('reopen')) { >+ ReopenInvoice($invoiceid); >+ } elsif ($input->param('close')) { >+ CloseInvoice($invoiceid); >+ } > $template->param( modified => 1 ); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index c03a4d7..7b28b87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -42,46 +42,48 @@ > > <p>Supplier: [% suppliername %]</p> > <form action="" method="post"> >- <label for="shipmentdate">Shipment date:</label> >- <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" /> >- <p></p> >- <label for="billingdate">Billing date:</label> >- <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /> >- <p></p> >- <label for="shipmentcost">Shipment cost:</label> >- <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /> >- <label for="shipment_budget_id">Budget:</label> >- <select id="shipment_budget_id" name="shipment_budget_id"> >- <option value="">No budget</option> >- [% FOREACH budget IN budgets_loop %] >- [% IF ( budget.selected ) %] >- <option selected="selected" value="[% budget.budget_id %]"> >- [% ELSE %] >- <option value="[% budget.budget_id %]"> >+ <fieldset> >+ <label for="shipmentdate">Shipment date:</label> >+ <input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" /> >+ <p></p> >+ <label for="billingdate">Billing date:</label> >+ <input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" /> >+ <p></p> >+ <label for="shipmentcost">Shipment cost:</label> >+ <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /> >+ <label for="shipment_budget_id">Budget:</label> >+ <select id="shipment_budget_id" name="shipment_budget_id"> >+ <option value="">No budget</option> >+ [% FOREACH budget IN budgets_loop %] >+ [% IF ( budget.selected ) %] >+ <option selected="selected" value="[% budget.budget_id %]"> >+ [% ELSE %] >+ <option value="[% budget.budget_id %]"> >+ [% END %] >+ [% budget.budget_name %] >+ </option> > [% END %] >- [% budget.budget_name %] >- </option> >+ </select> >+ <p></p> >+ <label>Status:</label> >+ [% IF ( invoiceclosedate ) %] >+ Closed on [% invoiceclosedate | $KohaDates %]. >+ <p></p> >+ <input type="checkbox" name="reopen" id="reopen" /> >+ <label for="reopen">Reopen</label> >+ [% ELSE %] >+ Open. >+ <p></p> >+ <input type="checkbox" name="close" id="close" /> >+ <label for="close">Close</label> > [% END %] >- </select> >- <input type="hidden" name="op" value="mod" /> >- <input type="hidden" name="invoiceid" value="[% invoiceid %]" /> >- <fieldset class="action"> >- <input type="submit" value="Save"> >+ <input type="hidden" name="op" value="mod" /> >+ <input type="hidden" name="invoiceid" value="[% invoiceid %]" /> >+ <fieldset class="action"> >+ <input type="submit" value="Save"> >+ </fieldset> > </fieldset> > </form> >- <p>Status: >- [% IF ( invoiceclosedate ) %] >- Closed on [% invoiceclosedate | $KohaDates %]. >- <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid %]"> >- Reopen >- </a> >- [% ELSE %] >- Open. >- <a href="/cgi-bin/koha/acqui/invoice.pl?op=close&invoiceid=[% invoiceid %]"> >- Close >- </a> >- [% END %] >- </p> > <p> > <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 554f0af..90bae7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -192,7 +192,6 @@ > > <div id="acqui_receive_summary"> > <p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p> >-<p><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">Go to invoice details</a></p> > </div> > [% UNLESS (invoiceclosedate) %] > <div id="acqui_receive_search"> >@@ -405,8 +404,8 @@ > </div> > > <!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">--> >-<form action="parcels.pl?booksellerid=[% booksellerid %]" method="post"> >- <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> >+<form action="/cgi-bin/koha/acqui/invoice.pl" method="get"> >+ <input type="hidden" name="invoiceid" value="[% invoiceid %]" /> > <fieldset class="action"> > <input type="submit" value="Finish receiving" /> > </fieldset> >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5339
:
7072
|
7073
|
7447
|
7448
|
7690
|
7691
|
7692
|
7693
|
7862
|
7863
|
7961
|
7962
|
8330
|
8331
|
8354
|
8355
|
8555
|
8556
|
8664
|
8665
|
8858
|
8948
|
8949
|
9382
|
10135
|
10137
|
10460
|
10934
|
11077
|
11535
|
11574
|
12266
|
12267
| 12352 |
12353
|
12369