Created attachment 6315 [details] [review] patch
Created attachment 6710 [details] [review] Fixed small conflict error Fixed a small conflict error in the original patch. However, I found some incorrect formatting on the table where the vendor and invoice information are now placed. This occurs when there is no information on the vendor or invoice on the specified record. I will attach a screenshot demonstrating this.
Created attachment 6711 [details] Picture of bad table formatting.
Created attachment 6880 [details] [review] patch It's a weird styling issue, ol.bibliodetails. I've opted for not displaying lines if info is missing. Another option is to add a non-breaking space, and always display lines. Please let me know if latter is the preferred one.
Should vendor and invoice number be linked to details in Acquisitions? Assuming the logged-in user has permissions of course?
Created attachment 7766 [details] [review] [SIGNED-OFF] Bug 7235: Adding invoice number and vendor name to the moredetail page Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Should vendor and invoice number be linked to details in Acquisitions? >Assuming the logged-in user has permissions of course? I was thinking about Owen's comment and wrote a follow-up which includes the links when a user has the right permissions. I also noticed a problem with the current way we link to the invoice: When you create items on order, accession date will show a link to the receive page, before the items have been received. There is no invoicenumber in the link and when you go to the page, you can receive skipping the step of entering an invoice number. This will cause problems later. I changed it so the link is only displayed when the item has been received.
Created attachment 7767 [details] [review] Bug 7235: Add order date and checks for permissions - Adds order date in above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received 2) Verify the correct information is shown for each 3) Verify links from the dates work correctly 4) Toggle permissions for the user
Created attachment 7794 [details] [review] Bug 7235: Add order date and checks for permissions - Adds order date above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received - 1 item checked out 2) Verify the correct information is shown for each 3) Verify links on the dates work correctly 4) Toggle permissions for the user
I missed something in my follow up. New patch with updated test plan attached.
Created attachment 7795 [details] [review] Bug 7235: Add order date and checks for permissions - Adds order date above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received - 1 item checked out 2) Verify the correct information is shown for each 3) Verify links on the dates work correctly 4) Toggle permissions for the user
The second patch doesn't apply anymore: Applying: Bug 7235: Adding invoice number and vendor name to the moredetail page Bug 7235: Add order date and checks for permissions Apply? [yn] y Applying: Bug 7235: Add order date and checks for permissions fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7235: Add order date and checks for permissions When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/Bug-7235-Add-order-date-and-checks-for-permissions-JZZp_S.patch
Julian, I am not sure it will change anything, but can you try after git-bz: git am --abort git am -iu3 /tmp/Bug... (the path it shows you) Sometimes it will work then.
Tested what you say, but still the same problem. It seems that `git bz apply` does make a git am -iu3: /usr/local/bin/git-bz (line 1498): process = git.am(filename, **{'_interactive':True, '3':True}) If sometimes this trick works for you, maybe you don't have the last version of git-bz (http://wiki.koha-community.org/wiki/Git_bz_configuration#testing_with_-3_flag_set)
True, I was still referring to the old version of git-bz - the change Paul made is still quite recent and I was waiting for it to be in the repository where I cloned from. (slef's I think).
Created attachment 8258 [details] [review] Bug 7235: Add order date and checks for permissions - Adds order date above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received - 1 item checked out 2) Verify the correct information is shown for each 3) Verify links on the dates work correctly 4) Toggle permissions for the user
Created attachment 8271 [details] [review] [SIGNED-OFF] Bug 7235: Add order date and checks for permissions - Adds order date above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received - 1 item checked out 2) Verify the correct information is shown for each 3) Verify links on the dates work correctly 4) Toggle permissions for the user Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Followed the test plan and all tests pass.
Created attachment 8290 [details] [review] [SIGNED-OFF] Bug 7235: Add order date and checks for permissions - Adds order date above vendor - Reordered fields to reflect history of the item - Order information (order date, vendor) is only shown, when an order exists - Accession date is only linked, when item was received in acquisition - Links to basket and invoice are only shown when user has the correct permission - order date: manage_order - accession date: receive_shipment for invoice - Changes all dates to use the KohaDates TT plugin - Corrects display of rental price, removing additional zeros To test: 1) Create a record with - 1 item created in cataloguing - 1 item ordered - 1 item ordered and received - 1 item checked out 2) Verify the correct information is shown for each 3) Verify links on the dates work correctly 4) Toggle permissions for the user Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Followed the test plan and all tests pass. Signed-off-by: Marijana Glavica <mglavica@ffzg.hr> changed supplierid to booksellerid
Both patches clean, easy to read, primarily template changes (along with removal of format_dates where appropriate). Marking as Passed QA.
patch pushed, with a small follow-up to have uppercases consistent : some were correct (only 1st word uc-ed), some were still not (all words uc-ed)