From 5e274fba8ba41e2a7db78af88a1bcac6c9cc10cf Mon Sep 17 00:00:00 2001 From: Julian Maurice 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 @@

Supplier: [% suppliername %]

- - -

- - -

- - - - +

+ + +

+ + + + +

+ + [% IF ( invoiceclosedate ) %] + Closed on [% invoiceclosedate | $KohaDates %]. +

+ + + [% ELSE %] + Open. +

+ + [% END %] - - - -
- + + +
+ +
-

Status: - [% IF ( invoiceclosedate ) %] - Closed on [% invoiceclosedate | $KohaDates %]. - - Reopen - - [% ELSE %] - Open. - - Close - - [% END %] -

Go to receipt page

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 @@

Invoice number: [% invoice %] Received by: [% loggedinusername %] On: [% formatteddatereceived %]

-

Go to invoice details

[% UNLESS (invoiceclosedate) %] -
- + +
-- 1.7.10.4