Bugzilla – Attachment 103263 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: Fix information shown on top of order receive page
Bug-17458-Fix-information-shown-on-top-of-order-re.patch (text/plain), 3.27 KB, created by
ByWater Sandboxes
on 2020-04-20 10:46:09 UTC
(
hide
)
Description:
Bug 17458: Fix information shown on top of order receive page
Filename:
MIME Type:
Creator:
ByWater Sandboxes
Created:
2020-04-20 10:46:09 UTC
Size:
3.27 KB
patch
obsolete
>From ddbc1ba43e89e206c8300b95329661a4971ba8cf 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: Fix information shown on top of 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. > >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 > >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> >--- > acqui/parcel.pl | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index 8d094d8ffe..e21a2c9236 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -284,7 +284,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, >@@ -294,6 +294,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 414844397c..ff238edb0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -89,7 +89,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