[Koha-bugs] [Bug 11967] Add support for RMA notices to Acquisitions.

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11967

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |paola.rossi at cineca.it

--- Comment #1 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply against 3.17.00.008 :

Applying: Add RMA support for Acquisitions.
Using index info to reconstruct a base tree...
<stdin>:31: trailing whitespace.
        "select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders 
<stdin>:32: trailing whitespace.
        LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno 
<stdin>:33: trailing whitespace.
        LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber 
<stdin>:34: trailing whitespace.
        LEFT JOIN biblioitems on
aqorders.biblioitemnumber=biblioitems.biblioitemnumber 
<stdin>:333: trailing whitespace.
Certains items de la commande seront retournés : 
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging tools/letter.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
Auto-merging installer/data/mysql/en/mandatory/sample_notices.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/en/mandatory/sample_notices.sql
Auto-merging C4/Letters.pm
Failed to merge in the changes.
Patch failed at 0001 Add RMA support for Acquisitions.

So I pass the patch to "Patch doesn't apply" status.

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.