[Koha-bugs] [Bug 7290] new permission for receiving
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed May 21 10:51:58 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290
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 #23 from Paola Rossi <paola.rossi at cineca.it> ---
I try to apply against master 3.15.00.052
Applying: Bug 7290: More granular permissions for order receiving
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
Auto-merging
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/it-IT/necessari/userpermissions.sql
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
Auto-merging installer/data/mysql/es-ES/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/de-DE/mandatory/userpermissions.sql
Auto-merging acqui/orderreceive.pl
Auto-merging acqui/neworderempty.pl
Auto-merging acqui/finishreceive.pl
Auto-merging C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 7290: More granular permissions for order receiving
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list