[Koha-bugs] [Bug 12993] Add a default tax rate on item types

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

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

Marc Véron <veron at veron.ch> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |veron at veron.ch

--- Comment #23 from Marc Véron <veron at veron.ch> ---
Sorry, did not apply:

Applying: Bug 12993: Add a default tax rate on item types
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/admin/itemtypes.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
Auto-merging admin/itemtypes.pl
Applying: Bug 12993: Select automatically itemtype on neworderempty.pl
Applying: Bug 12993: Add a default tax rate on item types - DB changes
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 12993: Add a default tax rate on item types - DB
changes

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