| Summary: | Add a notes row, and a manager_id to the accountlines table | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Chris Cormack <chris> |
| Component: | Patrons | Assignee: | Kyle M Hall (khall) <kyle> |
| Status: | CLOSED DUPLICATE | QA Contact: | Bugs List <koha-bugs> |
| Severity: | enhancement | ||
| Priority: | PATCH-Sent (DO NOT USE) | CC: | gmcharlt, julian.maurice, nengard, paul.poulain |
| Version: | Main | ||
| Hardware: | All | ||
| OS: | All | ||
| GIT URL: | Initiative type: | --- | |
| Sponsorship status: | --- | Comma delimited list of Sponsors: | |
| Crowdfunding goal: | 0 | Patch complexity: | --- |
| Documentation contact: | Documentation submission: | ||
| Text to go in the release notes: | Version(s) released in: | ||
| Circulation function: | |||
| Bug Depends on: | |||
| Bug Blocks: | 5575 | ||
| Attachments: | Proposed Patch | ||
|
Description
Chris Cormack
2011-02-13 23:25:03 UTC
Created attachment 3141 [details] [review] Proposed Patch This bug is mentioned in: Bug 5752 : Add note and manager_id to accountlines http://lists.koha-community.org/pipermail/koha-patches/2011-February/013845.html Does not apply: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5752 : Add note and manager_id to accountlines Using index info to reconstruct a base tree... <stdin>:29: trailing whitespace. ); <stdin>:263: trailing whitespace. } warning: 2 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging kohaversion.pl CONFLICT (content): Merge conflict in kohaversion.pl Failed to merge in the changes. Patch failed at 0001 Bug 5752 : Add note and manager_id to accountlines 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". nengard@debian:~/kohaclone$ |