http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 8077 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8077&action=edit Bug 5354: Partial duplication of a subscription A new syspref (SubscriptionDuplicateDroppedInput) contains the list of fields to duplicate when duplicating a subscription. The library will be able to define that, for example, the internal note should not be duplicated Test plan: On the detail subscription page, click Edit > Edit as New (Duplicate): All the information must be copied from the original subscription. Fill the syspref SubscriptionDuplicateDroppedInput with a list of fields you don't want to be duplicated (e.g. location;notes;branchcode). Repeat the duplicate action. Normally, information for these fields are not copied. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 Kristina <khspaces-subscriptions@yahoo.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |khspaces-subscriptions@yaho | |o.de --- Comment #2 from Kristina <khspaces-subscriptions@yahoo.de> --- I tested this patch on the BibLibre sandbox http://pro.test8.biblibre.com/cgi-bin/koha/sandbox.pl and received the following conflict message: <h1>Something went wrong !</h1>Applying: Bug 5354: Partial duplication of a subscription<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging installer/data/mysql/updatedatabase.pl<br/> CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl<br/> Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref<br/> Failed to merge in the changes.<br/> Patch failed at 0001 Bug 5354: Partial duplication of a subscription<br/> When you have resolved this problem run git am --resolved.<br/> If you would prefer to skip this patch, instead run git am --skip.<br/> To restore the original branch and stop patching run git am --abort.<br/> Bug 5354 - Partial duplication of a subscription<br/> -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #5 from Jonathan Druart <jonathan.druart@biblibre.com> --- It's based on the 'id' in the html code. firstacquidate is acqui_date startdate is beginning_date and numberlength is subtype Perhaps I can change this id node but I don't known if to change this id does not break something -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #6 from Laurence Lefaucheur <laurence.lefaucheur@biblibre.com> --- not ok for subtype -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #8 from Kristina Hoeppner <kristina@catalyst.net.nz> --- Sorry, Jonathan. I had a merge conflict again. :-( <h1>Something went wrong !</h1>Applying: Bug 5354: Partial duplication of a subscription<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging installer/data/mysql/updatedatabase.pl<br/> CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl<br/> Failed to merge in the changes.<br/> Patch failed at 0001 Bug 5354: Partial duplication of a subscription<br/> When you have resolved this problem run git am --resolved.<br/> If you would prefer to skip this patch, instead run git am --skip.<br/> To restore the original branch and stop patching run git am --abort.<br/> Bug 5354 - Partial duplication of a subscription<br/> <br/> -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 Kristina Hoeppner <kristina@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8386|0 |1 is obsolete| | --- Comment #10 from Kristina Hoeppner <kristina@catalyst.net.nz> --- Created attachment 8461 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8461&action=edit [SIGNED-OFF] Bug 5354 Partial duplication of a subscription Tested the patch with the following fields (taken from the HTML code input field IDs): branchcode notes location callnumber internalnotes periodicity numberpattern numberingmethod acqui_date beginning_date numberlength aqbooksellerid biblionumber graceperiod staffdisplaycount opacdisplaycount ending_date For aqbooksellerid and aqbooksellerid, the old information is still visible in the greyed-out boxes, but it is not displayed when you attempt to save the record. Left out serialsadditems-yes and serialsadditesm-no as you would always have to set this anyway. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #11 from Kristina Hoeppner <kristina@catalyst.net.nz> --- I meant to write: For aqbooksellerid and biblionumber, the old information is still visible in the greyed-out boxes, but it is not displayed when you attempt to save the record. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #12 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- QA Comment: Without testing the code itself, looks good. Externally tested by more than one individual. Few comments: Name SubscriptionDuplicateDroppedInput confuses me, but no blocker. The description is clear though. The pref should be added to sysprefs.sql. (I tend to forget that too.) If Paul pushes this one, could you add it, Paul? You separate fields with semicolon. Please note that several new prefs separate with |. I do not mind, but we should go for consistency (at least try ;) No blocker, but a followup? Passed QA. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 --- Comment #14 from Paul Poulain <paul.poulain@biblibre.com> --- Jonathan, for an unknown reason, when applying the follow-up, I get a: Applying: Bug 5354: Followup. Change separator fatal: sha1 information is lacking or useless (installer/data/mysql/updatedatabase.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5354: Followup. Change separator When you have resolved this problem run "git am --resolved". anything unusual when formatting your patch ? could you resubmit the follow-up if you have an idea why this one don't work -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5354 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #16 from Paul Poulain <paul.poulain@biblibre.com> --- There was a small bug introduced by the (tiny) follow-up to change the separator, as requested by marcel in comment 12. I've fixed it when pushing -- You are receiving this mail because: You are watching all bug changes.