Bugzilla – Attachment 156044 Details for
Bug 34880
Receive impossible if items created 'in cataloguing'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34880: (follow-up) Make condition more specific
Bug-34880-follow-up-Make-condition-more-specific.patch (text/plain), 2.81 KB, created by
Katrin Fischer
on 2023-09-22 09:11:39 UTC
(
hide
)
Description:
Bug 34880: (follow-up) Make condition more specific
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-09-22 09:11:39 UTC
Size:
2.81 KB
patch
obsolete
>From 9ccd68099db92397d77dff9afcff29320826a29a Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer@bsz-bw.de> >Date: Fri, 22 Sep 2023 08:53:23 +0000 >Subject: [PATCH] Bug 34880: (follow-up) Make condition more specific > >To test (applies to both patches): > >* Add a new basket as 'standing order' and with 'items created in cataloguing' >* Create an order line >* Receive shipment and create an invoice >* Receive your order >* Verify: > * Quantity ordered: 1 > * Quantity received: 1 (pre-filled) > * No item form on the right >* Confirm >* Receive error: > Order X: No quantity to receive set. No items will be created. >* Verify no receive was processed (received orders remains empty) >* Apply patch >* Verify receive works as expected > >Other possible combinations to test: > >* Standing order, items on receive >* Standing order, items on order (no items are created) >* Standing order + order from subscription + any item setting (no items are created) >* No standing order + items in cataloguing >* No standing order + items on receive >* No standing order + items on order >* No standing oder + order from subscription + all item settings (no items are created) > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 7c7c0be717..74991def4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1102,12 +1102,13 @@ > var set_editor = function() { > var modal = $("#order_edit"); > var row = modal.data('row'); >+ var effective_create_items = row.basket.create_items || AcqCreateItem; > var origrec = $("#order_edit").data('origrec')||{}; > if(!origrec.hasOwnProperty(row.order_id)) { > origrec[row.order_id] = row.quantity_received; > $("#order_edit").data('origrec', origrec); > } >- if(row.subscription_id || row.basket.standing === true) { >+ if(row.subscription_id || ( row.basket.standing === true && effective_create_items == 'cataloguing') ) { > row.quantity_received = row.quantity; > } > var keep = $("#order_edit").data('kept'); >@@ -1159,8 +1160,6 @@ > $("#suggestion_fieldset").hide(); > } > >- var effective_create_items = row.basket.create_items || AcqCreateItem; >- > // set today if no date_received in row > document.querySelector("#datereceived")._flatpickr.setDate(row.date_received||new Date()); > >-- >2.30.2
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 34880
:
156036
|
156043
|
156044
|
156075
|
156076
|
156085
|
156086