Koha/circ
Chris Cormack 0c40ff9f98 Merge remote-tracking branch 'kc/master' into merged_5549
Fixed conflicts

Conflicts:
	catalogue/moredetail.pl
	installer/data/mysql/updatedatabase.pl
	koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
2012-03-22 09:36:55 +13:00
..
add_message.pl
billing.pl
bookcount.pl
branchoverdues.pl Bug 5549 : Format date with hh:mm in branchoverdues 2012-03-20 12:35:22 +13:00
branchtransfers.pl Fix for Bug 7123 - barcode should be one word 2011-12-13 17:48:02 +01:00
circulation-home.pl
circulation.pl Bug 5549 : fixed datetime issue so time is shown in output for circulation.pl and moremember.pl 2012-03-20 13:41:25 +13:00
del_message.pl
hold-transfer-slip.pl bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
overdue.pl Merge remote-tracking branch 'kc/master' into merged_5549 2012-03-22 09:36:55 +13:00
pendingreserves.pl Bug 6086 - adding a dynamic filter to pending holds 2012-03-08 18:14:09 +01:00
reserveratios.pl
returns.pl Bug 5549 Followup: fix suspension in days 2012-03-22 09:31:11 +13:00
selectbranchprinter.pl
stats.pl
transfer-slip.pl bug_7001: Issue and Reserve slips are notices. 2012-03-09 10:11:20 +01:00
transferstoreceive.pl
view_holdsqueue.pl bug_7201: Holds reports: add copynumber and enumchron 2012-02-17 10:54:56 +01:00
waitingreserves.pl bug 6039: Cancel All waiting holds button - Addendum: Add redirect to refresh list after canceling all holds. 2012-02-27 15:43:15 +01:00
ypattrodue-attr-search-authvalue.pl
ysearch.pl