@@ -, +, @@ Receipt summary for [vendor] ... Receive orders from [vendor] ... - Create a basket with some orders in acq - Close the basket - Receive shipment and create an invoice - Make sure shipment date is not set to today - Verify the information shown on top of parcel.pl is you and today - Change staff users - Go to your invoice, it's now this user and today - Apply patch - Received by: should be gone and the On: replaced by Shipment date: with the date you selected - Check the page title, breadcrumbs and headings read all the same 'Receive orders...' - Finish receiving and close the invoice - "Go to receipt page" - Verify they now read "Receipt summary.." --- acqui/parcel.pl | 4 ++-- .../prog/en/modules/acqui/parcel.tt | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -283,7 +283,7 @@ $template->param( invoiceid => $invoice->{invoiceid}, invoice => $invoice->{invoicenumber}, invoiceclosedate => $invoice->{closedate}, - datereceived => dt_from_string, + shipmentdate => $invoice->{shipmentdate}, name => $bookseller->name, booksellerid => $bookseller->id, loop_received => \@loop_received, @@ -293,6 +293,6 @@ $template->param( total_tax_excluded => $total_tax_excluded, total_tax_included => $total_tax_included, subtotal_for_funds => $subtotal_for_funds, - sticky_filters => $sticky_filters, + sticky_filters => $sticky_filters, ); output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -7,8 +7,14 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% IF ( date ) %] - Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [% invoice | html %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name | html %][% END %] + + Koha › Acquisitions › + [% IF ( invoiceclosedate ) %] + Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [% invoice | html %][% END %] + [% ELSE %] + Receive orders from [% name | html %] + [% END %] + [% INCLUDE 'doc-head-close.inc' %] @@ -17,12 +23,11 @@ [% INCLUDE 'acquisitions-search.inc' %] [% END %]

- [% IF datereceived %] - Receipt summary for [% name | html %] [% IF ( invoice ) %] [ [% invoice | html %] ] [% END %] on [% datereceived | $KohaDates %] + [% IF ( invoiceclosedate ) %] + Receipt summary for [% name | html %] [% IF ( invoice ) %] [ [% invoice | html %] ] [% END %] [% ELSE %] Receive orders from [% name | html %] [% END %] @@ -89,7 +94,7 @@ [% UNLESS no_orders_to_display %]
-

Invoice number: [% invoice | html %] Received by: [% logged_in_user.userid | html %] On: [% datereceived | $KohaDates %]

+

Invoice number: [% invoice | html %] Shipment date: [% shipmentdate | $KohaDates %]

[% UNLESS (invoiceclosedate) %]