https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35044
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #53 from David Nind <[email protected]> --- Patches no longer apply 8-(.... git bz apply 35044 Bug 35044 Depends on bug 35197 (Signed Off) Follow? [(y)es, (n)o] y Bug 35197 - Expose additional_field definitions through REST API 159648 - Bug 35197: Add additional_fields REST API endpoint 159649 - Bug 35197: Add tests 159650 - Bug 35197: Field name consistency Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35197: Add additional_fields REST API endpoint Applying: Bug 35197: Add tests Applying: Bug 35197: Field name consistency Bug 35044 - Additional fields: Allow for repeatable fields 160177 - Bug 35044: [DONT PUSH] dbic specific 160178 - Bug 35044: DB changes + atomicupdate file 160179 - Bug 35044: Admin: New additional fields 'repeatable' field 160180 - Bug 35044: Preparation: 160181 - Bug 35044: Update: Order baskets 160182 - Bug 35044: Update: Acquisition orders 160183 - Bug 35044: Update: Invoices 160184 - Bug 35044: Update: Serial subscriptions 160185 - Bug 35044: Update: Serial subscriptions batch edit 160186 - Bug 35044: Update: Manual invoices, manual credits and accountlines 160187 - Bug 35044: Add repetable to REST API spec 160188 - Bug 35044: Add tests 160189 - Bug 35044: (QA Follow-up) Fix atomicupdate Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35044: [DONT PUSH] dbic specific Applying: Bug 35044: DB changes + atomicupdate file Applying: Bug 35044: Admin: New additional fields 'repeatable' field Applying: Bug 35044: Preparation: Applying: Bug 35044: Update: Order baskets Applying: Bug 35044: Update: Acquisition orders Using index info to reconstruct a base tree... M acqui/addorder.pl M acqui/neworderempty.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging acqui/neworderempty.pl Auto-merging acqui/addorder.pl CONFLICT (content): Merge conflict in acqui/addorder.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 35044: Update: Acquisition orders -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
