Description
Paul Poulain
2010-11-02 02:48:11 UTC
This patch will allow to create a new order from a subscription. It is currently blocked by Bug 5335. Created attachment 13010 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Created attachment 13011 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Jonathan, have you seen this is a duplicate to bug 8415 and related bug 8456? I tried to get the patch Amit Gupta created from Biblibres patch working and did some follow-ups - I am happy to test this as soon as there is time. But could you take a look maybe at the other bugs? (In reply to comment #4) > Jonathan, have you seen this is a duplicate to bug 8415 and related bug > 8456? I tried to get the patch Amit Gupta created from Biblibres patch > working and did some follow-ups - I am happy to test this as soon as there > is time. But could you take a look maybe at the other bugs? Hi Katrin, Yes I know... But it was easiest to me to recreate the patch from scratch rather than created somes followups for others patches. Several remarks you made for Bug 8415 and Bug 8456 are fixed in my patch. *** Bug 8456 has been marked as a duplicate of this bug. *** *** Bug 8415 has been marked as a duplicate of this bug. *** Hi Jonathan, that's ok - I figured that was the reason and working on the patch it makes a lot of sense to me to redo it. I really got stuck in the end and found a lot of problems. All I was hoping for is that you take a look at the remarks to see if they still apply to your new patch and close the other bugs - which you did :) Created attachment 15840 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) I get this error when searching for a subscription in Step 4: Can't use string (" [my search string] ") as a HASH ref while "strict refs" in use at /home/oleonard/kohaclone/C4/Serials.pm line 669. Created attachment 16321 [details] [review] Bug 5343: Link serial and acqui modules Oops sorry, I forgot to change a call to SearchSubscriptions. There's a problem at step 10 : I can't receive the order because I can't fill Quantity received in page orderreceive.pl (syspref AcqCreateItem =Create an item when placing an order) Created attachment 16482 [details] [review] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) (In reply to comment #12) > There's a problem at step 10 : I can't receive the order because I can't > fill Quantity received in page orderreceive.pl > (syspref AcqCreateItem =Create an item when placing an order) It should be fixed with this last patch. Created attachment 16492 [details] [review] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Created attachment 16510 [details] [review] Bug 5343: Followup: invoicenumber no longer exists, use invoiceid. A previous patch replaces invoicenumber with invoiceid. patch does not apply M. Saby Created attachment 16624 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Created attachment 16625 [details] [review] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Created attachment 16626 [details] [review] Bug 5343: Followup: invoicenumber no longer exists, use invoiceid. A previous patch replaces invoicenumber with invoiceid. just a functionnal comment : when a vendor is choosen in the subscription, it's not logical if it can be order by another vendor in acquisitions module. So after the search of subsrciption (step 4 in test plan), only the subscription with this vendor or with no vendor should be "Orderable" Created attachment 16641 [details] [review] Bug 5343: It is not possible to add a subscription for another supplier If a supplier is defined for a subscription, you cannot order this subscription to another supplier. If no supplier is defined, you can. FIX: If a cancelled order is linked to a subscription, you can order it. Created attachment 16723 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Created attachment 16724 [details] [review] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Created attachment 16725 [details] [review] Bug 5343: Followup: invoicenumber no longer exists, use invoiceid. A previous patch replaces invoicenumber with invoiceid. Created attachment 16726 [details] [review] Bug 5343: It is not possible to add a subscription for another supplier If a supplier is defined for a subscription, you cannot order this subscription to another supplier. If no supplier is defined, you can. FIX: If a cancelled order is linked to a subscription, you can order it. Created attachment 16728 [details] [review] Bug 5343: Link serial and acqui modules (squached) squashed all patches and rebased Created attachment 16733 [details] [review] Bug 5343: Followup: remove useless string on the serials result page Created attachment 16735 [details] [review] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Created attachment 16736 [details] [review] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Created attachment 16737 [details] [review] Bug 5343: Followup: invoicenumber no longer exists, use invoiceid. A previous patch replaces invoicenumber with invoiceid. Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Created attachment 16738 [details] [review] Bug 5343: It is not possible to add a subscription for another supplier If a supplier is defined for a subscription, you cannot order this subscription to another supplier. If no supplier is defined, you can. FIX: If a cancelled order is linked to a subscription, you can order it. Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Created attachment 16739 [details] [review] Bug 5343: Followup: remove useless string on the serials result page Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Test OK OK on order and on receive. We have the information on cgi-bin/koha/serials/subscription-detail.pl?subscriptionid= Looking at this now. On the subscription search screen I think it would be a little bit better to have the last column empty or saying "Cannot be ordered" (asked Kyle and Brendan :) ) Still testing - can be easily dealt with in a little follow up. Created attachment 16748 [details]
screenshot of subscription search when creating an order from a subscription
Attaching a screenshot to illustrate - should also not be a link in this case. Maybe leaving it empty would be easiest.
Created attachment 16754 [details] [review] Bug 5343: Fix non english string Replace "Not orderable" with "Cannot be ordered" (In reply to comment #36) > On the subscription search screen I think it would be a little bit better to > have the last column empty or saying "Cannot be ordered" (asked Kyle and > Brendan :) ) "Orderable" smelt quite bad :) I have some more little typos: See basket informations See invoice informations = information and fund = Fund - If you don't get to it I can make a little follow up on my own for that. Created attachment 16762 [details] [review] Bug 5343: Fix non english string Replace "Not orderable" with "Cannot be ordered" and 3 others typos Created attachment 16764 [details] [review] [PASSED QA] Bug 5343: Link serial and acqui modules DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Comments on last patch. Created attachment 16765 [details] [review] [PASSED QA] Bug 5343: Followup FIX quantity received if items are created when receiving For subscriptions, if items are created when receiving, the quantity received is always 1, not 0. + UI: Show the subscription search form (instead of hidden) Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 16766 [details] [review] [PASSED QA] Bug 5343: Followup: invoicenumber no longer exists, use invoiceid. A previous patch replaces invoicenumber with invoiceid. Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 16767 [details] [review] [PASSED QA] Bug 5343: It is not possible to add a subscription for another supplier If a supplier is defined for a subscription, you cannot order this subscription to another supplier. If no supplier is defined, you can. FIX: If a cancelled order is linked to a subscription, you can order it. Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 16768 [details] [review] [PASSED QA] Bug 5343: Followup: remove useless string on the serials result page Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 16769 [details] [review] [PASSED QA] Bug 5343: Fix non english string Replace "Not orderable" with "Cannot be ordered" Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 16770 [details] [review] [PASSED QA] Bug 5343: Fix non english string Replace "Not orderable" with "Cannot be ordered" and 3 others typos Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> All tests and QA script pass. Testing notes: - Ordered same subscription multiple times - Tried different settings of AcqCreateItem for a full workflow from order to receive - Undid a receipt and checked correct behaviour - Ordered a book in between, to see item creation and receiving still works. Note for documentation: Acquisition details on the subscription only show the last invoice and the last order. You can of course find all orders/invoices using the acquisition search. Overall very nice much needed functionality! Because I have received many requests for this feature from both developers and librarians, these patches have been pushed to master prior to the feature freeze. However, there are no unit tests for the new routines, which is bad. Therefore, if no unit tests have been offered have by March 29, I will revert the feature and it can be reviewed for inclusion in the 3.14 release. (In reply to comment #49) > Because I have received many requests for this feature from both developers > and librarians, these patches have been pushed to master prior to the > feature freeze. However, there are no unit tests for the new routines, which > is bad. Therefore, if no unit tests have been offered have by March 29, I > will revert the feature and it can be reviewed for inclusion in the 3.14 > release. Please reports to bug 9937 for UT. |