[Koha-bugs] [Bug 6934] New report Cash Register Statistics

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Tue Jul 19 23:26:44 CEST 2016


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6934

Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |In Discussion

--- Comment #63 from Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> ---
Hi Bouzid

For me the patch fails in master when apply

>Applying: Bug 6934 New report Cash Register Statistics
>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/reports/reports-home.tt
>CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>Failed to merge in the changes.
>Patch failed at 0001 Bug 6934 New report Cash Register Statistics

Do I need to apply all patches or just few of them?

Regards

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


More information about the Koha-bugs mailing list