Bugzilla – Attachment 110302 Details for
Bug 17458
When receiving an order, information about user and date on top are incorrect
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17458: Remove use of datereceived from order receive page
Bug-17458-Remove-use-of-datereceived-from-order-re.patch (text/plain), 5.51 KB, created by
David Nind
on 2020-09-17 21:28:44 UTC
(
hide
)
Description:
Bug 17458: Remove use of datereceived from order receive page
Filename:
MIME Type:
Creator:
David Nind
Created:
2020-09-17 21:28:44 UTC
Size:
5.51 KB
patch
obsolete
>From a8ec0eb4c5792e5ee1861fe4d36e21a7dae70fb2 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Tue, 14 Apr 2020 11:42:22 +0000 >Subject: [PATCH] Bug 17458: Remove use of datereceived from order receive page > >Before this patch the order receive page (parcel.pl) would show >... Received by: <current user> On: <current date> > >This is not really helpful. Whenever you viewed an invoice, it >would tell you it was _you_ who received that _today_. > >As we don't store a creator of an invoice and the order lines >in an invoice could have been received by different people (which >we also don't know about), the "Received by" is removed by this patch. > >Instead of today's date, we can show the shipment date entered for >the invoice. Again: different order lines could have been received >on different dates for this shipment. So only the shipment date makes >sense as it's on invoice level. > >This also makes changes to the page title, breadcrumby and page heading: >When the invoice is closed, they will read: > Receipt summary for [vendor] ... >When the invoice is not closed, they wil read: > Receive orders from [vendor] ... > >To test: >- 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.." > >If you have older invoices in your system, it would work >even better with these as you'd see that always today's date >is displaying without the patch. > >Signed-off-by: Marjorie <marjorie.barry-vila@collecto.ca> > >Signed-off-by: David Nind <david@davidnind.com> >--- > acqui/parcel.pl | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 19 ++++++++++++------- > 2 files changed, 14 insertions(+), 9 deletions(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index c67c09df78..4ff5ba5133 100755 >--- a/acqui/parcel.pl >+++ b/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; >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 36798c3a47..ce377cdc69 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/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' %] >-<title>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 %]</title> >+<title> >+ Koha › Acquisitions › >+ [% IF ( invoiceclosedate ) %] >+ Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [% invoice | html %][% END %] >+ [% ELSE %] >+ Receive orders from [% name | html %] >+ [% END %] >+</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -17,12 +23,11 @@ > [% INCLUDE 'acquisitions-search.inc' %] > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- [% IF datereceived %] >+ [% IF invoiceclosedate %] > Receipt summary for <i>[% name | html %]</i> > [% IF ( invoice ) %] > <i>[ [% invoice | html %] ]</i> > [% END %] >- on <i>[% datereceived | $KohaDates %]</i> > [% ELSE %] > Receive orders from [% name | html %] > [% END %] >@@ -45,8 +50,8 @@ > </div> > [% END %] > <h1> >- [% IF datereceived %] >- Receipt summary for <i>[% name | html %]</i> [% IF ( invoice ) %] <i> [ [% invoice | html %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i> >+ [% IF ( invoiceclosedate ) %] >+ Receipt summary for <i>[% name | html %]</i> [% IF ( invoice ) %] <i> [ [% invoice | html %] ] </i>[% END %] > [% ELSE %] > Receive orders from [% name | html %] > [% END %] >@@ -89,7 +94,7 @@ > > [% UNLESS no_orders_to_display %] > <div id="acqui_receive_summary"> >-<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Received by:</strong> [% logged_in_user.userid | html %] <strong>On:</strong> [% datereceived | $KohaDates %]</p> >+<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Shipment date:</strong> [% shipmentdate | $KohaDates %]</p> > </div> > [% UNLESS (invoiceclosedate) %] > <div id="acqui_receive_search"> >-- >2.11.0
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 17458
:
103208
|
103263
|
108279
|
110302
|
110744