Claire Hernandez [Fri, 30 Sep 2011 12:50:51 +0000 (14:50 +0200)]
Merge remote-tracking branch 'remotes/origin/bug/BLO/MT6141' into dev/am123
Stephane Delaye [Thu, 29 Sep 2011 15:41:52 +0000 (17:41 +0200)]
C4::SIP transactions update
Claire Hernandez [Tue, 27 Sep 2011 13:38:53 +0000 (15:38 +0200)]
Merge remote-tracking branch 'origin/master' into dev/am123
Conflicts solved:
circ/overdue.pl
installer/data/mysql/updatedatabase.pl
kohaversion.pl
misc/cronjobs/overdue_notices.pl
Files unmerged (kept am123 version):
misc/translator/po/fr-FR-i-opac-t-prog-v-
3002000.po
misc/translator/po/fr-FR-i-staff-t-prog-v-
3002000.po
Stephane Delaye [Fri, 16 Sep 2011 10:55:13 +0000 (12:55 +0200)]
MT5336 et MT7858 correspondances rcr
Sophie Meynieux [Mon, 26 Sep 2011 07:39:00 +0000 (09:39 +0200)]
Translating : MT7588, MT7857, MT7192, MT7123, MT6771, MT7629, MT7833, MT7960
Sophie Meynieux [Mon, 26 Sep 2011 07:33:21 +0000 (09:33 +0200)]
Merge branch 'MT7958'
Sophie Meynieux [Fri, 23 Sep 2011 14:15:58 +0000 (16:15 +0200)]
Merge branch 'MT6771'
Sophie Meynieux [Fri, 23 Sep 2011 10:31:17 +0000 (12:31 +0200)]
Merge branch 'MT7672'
Sophie Meynieux [Fri, 23 Sep 2011 09:50:26 +0000 (11:50 +0200)]
Merge branch 'MT7538'
Sophie Meynieux [Fri, 23 Sep 2011 08:52:52 +0000 (10:52 +0200)]
Merge branch 'MT7400'
Sophie Meynieux [Thu, 22 Sep 2011 15:56:17 +0000 (17:56 +0200)]
Merge branch 'MT7155'
Sophie Meynieux [Thu, 22 Sep 2011 15:36:04 +0000 (17:36 +0200)]
Merge branch 'MT7123'
Sophie Meynieux [Thu, 22 Sep 2011 15:01:22 +0000 (17:01 +0200)]
Merge branch 'MT7084'
Sophie Meynieux [Thu, 22 Sep 2011 13:55:59 +0000 (15:55 +0200)]
Merge branch 'MT7010'
Sophie Meynieux [Thu, 22 Sep 2011 13:37:22 +0000 (15:37 +0200)]
Merge branch 'MT6949'
Sophie Meynieux [Wed, 21 Sep 2011 21:13:47 +0000 (23:13 +0200)]
MT7958 Adding UseTablesortForCirc syspref to enable/disable tablesorter usage in circ/circulation.pl page. Tablesorter can be very slow on circulation operation if a borrower has many document checked out.
Julian Maurice [Wed, 21 Sep 2011 14:49:33 +0000 (16:49 +0200)]
Merge remote-tracking branch 'origin/am123/ft/MT5316' into dev/am123
Julian Maurice [Tue, 20 Sep 2011 09:15:06 +0000 (11:15 +0200)]
MT5316: Reuse applied filters after a receipt cancellation
Needs MT6138 for this to work, it has no effect without it
Matthias Meusburger [Tue, 20 Sep 2011 07:17:04 +0000 (09:17 +0200)]
MT3846: Adds item branch filter on overdues
Sophie Meynieux [Wed, 14 Sep 2011 13:58:04 +0000 (15:58 +0200)]
Merge branch 'MT7294'
Claire Hernandez [Fri, 2 Sep 2011 12:54:51 +0000 (14:54 +0200)]
Merge remote-tracking branch 'origin/master' into dev/am123
Stéphane Delaye [Fri, 2 Sep 2011 12:52:47 +0000 (14:52 +0200)]
[AM123] Display: French translation
Claire Hernandez [Fri, 2 Sep 2011 11:53:40 +0000 (13:53 +0200)]
MT6138 Filter on basket group in parcel.pl
- Use jQuery.session to keep filters after a receipt
- Clear button clears input fields
Claire Hernandez [Fri, 2 Sep 2011 11:52:37 +0000 (13:52 +0200)]
MT6138 adds jquery json and session files
Christophe Croullebois [Wed, 31 Aug 2011 12:44:41 +0000 (14:44 +0200)]
(MT #7672) Adding french PDF for printing basketgroup
everything is in the title
Stéphane Delaune [Thu, 18 Aug 2011 12:53:39 +0000 (14:53 +0200)]
(MT #7123) add homebranch and holdingbranch of the item filters in overdue.pl
Stéphane Delaune [Thu, 18 Aug 2011 08:44:01 +0000 (10:44 +0200)]
(MT #7538) fix advanced search members
Stéphane Delaune [Wed, 17 Aug 2011 13:20:53 +0000 (15:20 +0200)]
(MT #7084) subject = report_name in misc/cronjobs/runreport.pl
Stéphane Delaune [Wed, 17 Aug 2011 12:17:55 +0000 (14:17 +0200)]
(MT #7010) followup : fix urls in patroncards/members-search.pl
Julian Maurice [Fri, 12 Aug 2011 14:17:06 +0000 (16:17 +0200)]
MT5316: Add possibility to cancel an order receipt
If a received order has a parent order, cancelling receipt is done by adding
the order's quantity to the parent order's quantity and removing the order
line.
If it has no parent, cancelling is done by setting datereceived and
booksellerinvoicenumber to NULL, and quantityreceived to 0.
If AcqCreateItem is set to 'receiving', items linked to this order are
removed.
Jonathan Druart [Thu, 17 Feb 2011 16:14:47 +0000 (17:14 +0100)]
MT5316: Add aqorders.parent_ordernumber
When an order line is partially received, it is splitted. This new field
is to keep a reference to its old order number
Picked from MT5840
(cherry picked from commit
3165c350dc2df4aa6d3a47405c83a779d25d3c32)
(cherry picked from commit
636e4657e2586e6d17fec39d6fb0a81f407d30b6)
(cherry picked from commit
238e3d2e487d554cb1bfa3bc8cfe09503de19e68)
(cherry picked from commit
8e87ab889076e593eb34e15b0ef1b1dd17a1ab71)
Sophie Meynieux [Fri, 12 Aug 2011 22:05:02 +0000 (00:05 +0200)]
MT6949 When several overdues exist, notification is sent only for the oldest one, but the letter only list overdues of the level corresponding to the oldest one. If the oldest is too old, no notification is sent even if newer overdues exist.
Community bug 6292
Alex Arnaud [Fri, 12 Aug 2011 09:48:03 +0000 (11:48 +0200)]
MT7155: replace 'q=au:author name' by 'idx=au&q=author name' in opac-results.tmpl
Problem details: When searching for a title and limits on author and branch, all works well. But when searching
for a title, then clicking on author link a the result, limit on branch does not work.
Julian Maurice [Wed, 10 Aug 2011 08:16:06 +0000 (10:16 +0200)]
MT6771: batchedit.tmpl: Minor template modification
- Change page title
- Add class 'rows' to 3rd fieldset to display it correctly
- Remove an empty TMPL_LOOP
(cherry picked from commit
d6959a7db7c9cf3a749854f70c97640c2d77b8d8)
Claire Hernandez [Wed, 27 Jul 2011 13:23:37 +0000 (15:23 +0200)]
MT6881: Add a groupname search in histsearch.pl
Search by aqbasketgroups.name
(cherry picked from commit
529eda9dd261759e3982e7f80ec71fe21f565106)
Conflicts solved:
C4/Acquisition.pm
acqui/histsearch.pl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
Paul Poulain [Wed, 27 Jul 2011 13:00:39 +0000 (15:00 +0200)]
Merge branch 'bug/CRI/MT5661'
Julian Maurice [Tue, 12 Jul 2011 09:39:43 +0000 (11:39 +0200)]
MT7249: Use budget_expend and budget_encumb
These fields can be used to warn a user when he exceed a fixed amount
for a budget (budget_expend), or a percentage of this budget
(budget_encumb).
(cherry picked from commit
212b94c9c6943686a80937c59716558b58017895)
Claire Hernandez [Wed, 27 Jul 2011 12:59:59 +0000 (14:59 +0200)]
MT7249 Warn if an order will exceed allowed budget
(cherry picked from commit
df146e13756b390715085e1fd482ac25e29976ee)
Conflicts solved:
acqui/addorder.pl
Claire Hernandez [Wed, 27 Jul 2011 12:51:29 +0000 (14:51 +0200)]
Merge remote branch 'origin/master' into am123/wsapogeeharpege
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
kohaversion.pl
- last updatedb version changed because of same existant version (3.2.0.0.68)
Claire Hernandez [Wed, 27 Jul 2011 12:46:22 +0000 (14:46 +0200)]
Merge remote branch 'remotes/origin/bug/MIN/MT7184'
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
Paul Poulain [Wed, 27 Jul 2011 12:19:08 +0000 (14:19 +0200)]
MT5661: error in ISBN decoding (UNIMARC specific)
There is an error is splitting the isbn for country/editor/number/control number
When the 1st number is <=7, the 1st digit is the country.
Before this patch, it was saved as 0 digits as country, which is wrong !
Note that the DisplayISBN sub in C4/Koha.pm is correct
Christophe Croullebois [Wed, 27 Jul 2011 08:31:40 +0000 (10:31 +0200)]
(MT #7400) Default framework in MARCdetail.pl
A bug cleans the screen when you choose "default".
Matthias Meusburger [Tue, 26 Jul 2011 09:29:24 +0000 (11:29 +0200)]
MT7259: items count was missing, preventing from deleting all items
Stéphane Delaune [Fri, 22 Apr 2011 15:15:22 +0000 (17:15 +0200)]
(MT #4843) add C4::Dates->datefortablesorter function to define a correct tablesorter sort date type
Stéphane Delaune [Tue, 19 Jul 2011 09:05:56 +0000 (11:05 +0200)]
(MT #7010) add search on categorycode in SearchMember
Paul Poulain [Tue, 19 Jul 2011 08:58:28 +0000 (10:58 +0200)]
Merge remote-tracking branch 'origin/bug/MIN/MT6413'
Conflicts:
installer/data/mysql/updatedatabase.pl
Stéphane Delaune [Thu, 7 Jul 2011 13:12:32 +0000 (15:12 +0200)]
(MT #6760) add location_description support on opac-basket
Henri-Damien LAURENT [Mon, 18 Jul 2011 10:15:09 +0000 (12:15 +0200)]
MT6918: followup suggestions were displayed 3 times
This fixes a comment on 6918 suggestions were displayed more than once
Christophe Croullebois [Thu, 16 Jun 2011 11:53:08 +0000 (13:53 +0200)]
(MT #6918) Fix broken moremember page due to a lack of a closing tag
all in the title.
Sophie Meynieux [Tue, 19 Apr 2011 12:53:03 +0000 (14:53 +0200)]
MT6342 : longoverdue.pl is limited to 366 days range.
366 end range limit was hardcoded. Added a parameter to give a specif end range, using 366 as a default value
Sophie Meynieux [Fri, 15 Jul 2011 13:19:47 +0000 (15:19 +0200)]
Merge branch 'MT5826'
Sophie Meynieux [Wed, 13 Apr 2011 13:41:39 +0000 (15:41 +0200)]
MT6409 View logs does not display logs even if it is activated
Modify viewlog template to pass right parameters and improve csv file generation
Sophie Meynieux [Wed, 13 Apr 2011 13:34:44 +0000 (15:34 +0200)]
MT6480 comment in updatedatabase does not match action taken
Modify comment for version 3.02.00.061
Sophie Meynieux [Wed, 13 Jul 2011 13:45:27 +0000 (15:45 +0200)]
MT5399 follow-up Removing debug warnings
Sophie Meynieux [Fri, 8 Apr 2011 16:17:41 +0000 (18:17 +0200)]
MT5399 In Overdue letters, code streettype is displais instead of label
Modify parseletter in C4/Letters to get label of streettype
Sophie Meynieux [Wed, 13 Jul 2011 13:18:35 +0000 (15:18 +0200)]
Merge branch 'MT5680'
Sophie Meynieux [Wed, 13 Jul 2011 12:54:58 +0000 (14:54 +0200)]
Merge branch 'MT6033'
Sophie Meynieux [Wed, 13 Jul 2011 09:04:05 +0000 (11:04 +0200)]
Merge branch 'MT5121'
Sophie Meynieux [Wed, 13 Jul 2011 08:23:39 +0000 (10:23 +0200)]
Merge branch 'MT5393'
Sophie Meynieux [Wed, 13 Jul 2011 07:22:30 +0000 (09:22 +0200)]
Merge branch 'MT5066'
Christophe Croullebois [Wed, 6 Jul 2011 09:47:27 +0000 (11:47 +0200)]
(MT #7294) Default value for ddl fail
Just the line : if ( $value eq '' ) replaces : unless ( defined $value)
Claire Hernandez [Tue, 28 Jun 2011 15:50:34 +0000 (17:50 +0200)]
Merge remote branch 'origin/master' into prod/am123
Conflicts solved:
installer/data/mysql/updatedatabase.pl
kohaversion.pl
I kept client version - we should have to try a msgmerge... (1102 conflicts in one file)
misc/translator/po/fr-FR-i-opac-t-prog-v-
3002000.po
misc/translator/po/fr-FR-i-staff-t-prog-v-
3002000.po
Matthias Meusburger [Fri, 24 Jun 2011 08:34:51 +0000 (10:34 +0200)]
MT4076, MT7039: Prevent item data loss while item modification with limited edition permission
Christophe Croullebois [Mon, 27 Jun 2011 11:33:10 +0000 (13:33 +0200)]
(MT #7184) Some bugs in readingrecord
Due to the add of tablesorter and tablesorter.pager the links "Showing All Items" and "Show Last 50 Items Only" are useless.
Some lines in the .pl are useless too.
The sort in the Title column needed a parser due to the <a> tag
I have increased the ddl "entries/page" to allow to see full table.
Paul Poulain [Mon, 27 Jun 2011 08:55:11 +0000 (10:55 +0200)]
Mise à jour VF
Plein de changements :
* reprise de cohérence des termes
* quelques chaines non traduites
* corrections de plein d'erreurs
4H de travail en tout.
Stéphane Delaune [Wed, 22 Jun 2011 09:33:42 +0000 (11:33 +0200)]
(MT #7044) followup : add support of 4 new virtualhost variables for multiple opac
Stéphane Delaune [Thu, 16 Jun 2011 14:47:50 +0000 (16:47 +0200)]
(MT #7044) add support of 4 new virtualhost variables for multiple opac
OPAC_CSS_ABSOLUTE_OVERRIDE to override opac's css file with another defined by an absolute url
OPAC_USER_CSS to use a specific css file defined with an absolute url who will be used at the same place than opacusercss's system preference
OPAC_LIBRARYNAME_OVERRIDE to override the libraryname's system preference
OPAC_LIMIT_NEWS_TO_SERVERNAME to force news to be displayed only with the same servername than the virtualhost
Henri-Damien LAURENT [Tue, 14 Jun 2011 08:59:05 +0000 (10:59 +0200)]
Merge remote branch 'biblibre/bug/BLO/MT6614'
Henri-Damien LAURENT [Tue, 14 Jun 2011 08:57:48 +0000 (10:57 +0200)]
Merge remote branch 'biblibre/bug/MAJ/MT6901'
Henri-Damien LAURENT [Tue, 14 Jun 2011 08:46:53 +0000 (10:46 +0200)]
Merge remote branch 'biblibre/bug/MIN/MT6891'
Paul Poulain [Wed, 18 May 2011 14:54:45 +0000 (16:54 +0200)]
Traductions en francais
Paul Poulain [Mon, 16 May 2011 14:54:39 +0000 (16:54 +0200)]
Renewal date in C4::SIP was not updated after renewal
Paul Poulain [Mon, 16 May 2011 14:14:45 +0000 (16:14 +0200)]
SIP encoding fixes
Messages are utf8 compliants now:
* messages sent to the SIP syslog (ILS and Item)
* messages sent to the SIP device
Alex Arnaud [Mon, 6 Jun 2011 11:49:26 +0000 (13:49 +0200)]
MT6901 Adds the ability to display the current date in overdue letters
koha et zebra [Fri, 3 Jun 2011 10:05:30 +0000 (12:05 +0200)]
[Am123] Display - Translations
- electre
- 4655 "Copie n°"
koha et zebra [Fri, 3 Jun 2011 08:35:09 +0000 (10:35 +0200)]
[Am123] Display - Translations
Claire Hernandez [Fri, 3 Jun 2011 08:33:53 +0000 (10:33 +0200)]
Merge remote branch 'remotes/origin/ft/MOY/MT4736-5781_electre' into am123/wsapogeeharpege
Conflicts solved:
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Sophie Meynieux [Mon, 30 May 2011 12:09:20 +0000 (14:09 +0200)]
MT5668 Librarians who were not superlibrarians were disconnected from koha where using editors plugin
Permissions were wrong in the plugin, causing silent disconnection of the user when searching for an editor if user did not have superlibrarians permissions.
Claire Hernandez [Wed, 1 Jun 2011 14:53:10 +0000 (16:53 +0200)]
[Am123] Logs don't need to be pushed...
Paul Poulain [Tue, 31 May 2011 13:43:39 +0000 (15:43 +0200)]
[Am123] Display - MT6811 URL856 affichage pro
From: Stephane Delaye <stephane.delaye@biblibre.com>
Claire Hernandez [Wed, 1 Jun 2011 14:12:25 +0000 (16:12 +0200)]
Merge remote branch 'origin/am123/ft/MT4655' into am123/wsapogeeharpege
Conflicts solved:
tools/batchMod.pl
Claire Hernandez [Wed, 1 Jun 2011 13:57:33 +0000 (15:57 +0200)]
Merge remote branch 'origin/master' into am123/wsapogeeharpege
Conflicts solved:
tools/inventory.pl
Sophie Meynieux [Wed, 1 Jun 2011 12:20:12 +0000 (14:20 +0200)]
Merge branch 'MT5359'
Sophie Meynieux [Wed, 1 Jun 2011 12:14:18 +0000 (14:14 +0200)]
Merge branch 'MT6614'
Sophie Meynieux [Wed, 1 Jun 2011 12:04:09 +0000 (14:04 +0200)]
Merge branch 'MT6862'
Sophie Meynieux [Wed, 1 Jun 2011 11:58:55 +0000 (13:58 +0200)]
Merge branch 'MT6675'
Sophie Meynieux [Wed, 1 Jun 2011 11:54:41 +0000 (13:54 +0200)]
Merge branch 'MT6223'
Sophie Meynieux [Wed, 1 Jun 2011 11:47:50 +0000 (13:47 +0200)]
Merge branch 'MT6657'
Sophie Meynieux [Wed, 1 Jun 2011 10:36:21 +0000 (12:36 +0200)]
Merge branch 'MT6063'
Stéphane Delaune [Mon, 30 May 2011 07:43:31 +0000 (09:43 +0200)]
(MT #6891)followup : differentiated research when OPAC_SEARCH_LIMIT is set
Stéphane Delaune [Fri, 27 May 2011 14:58:02 +0000 (16:58 +0200)]
(MT #6891) differentiated research when OPAC_SEARCH_LIMIT is set
Matthias Meusburger [Thu, 26 May 2011 15:19:50 +0000 (17:19 +0200)]
MT6892: Buttons are not displayed in catalogue/detail.pl
Sophie Meynieux [Thu, 26 May 2011 13:11:24 +0000 (15:11 +0200)]
MT5359 Overdue fines are not correctly displaid on OPAC user account
Adding 'FU' category for display
Christophe Croullebois [Wed, 25 May 2011 13:38:54 +0000 (15:38 +0200)]
(#MT 6614) Translation for basket.tmpl
Claire Hernandez [Wed, 25 May 2011 11:44:25 +0000 (13:44 +0200)]
Fix broken morememberpage if no patron_attributes
- Buttons were missing
Paul Poulain [Wed, 25 May 2011 09:19:58 +0000 (11:19 +0200)]
MT6675: search error when double space in query
If the user enter 2 or more spaces between words, the buildQuery is confused and build a wrong query
This patch transforms every 2+ spaces into 1 only
Paul Poulain [Mon, 23 May 2011 16:24:09 +0000 (18:24 +0200)]
MT6223 follow-up: deal correctly with status/lost/notforloan flags
The calculation of the SQL was done on the ID of the flag, not on the value itself.
For example: "available" = 0 in notforloan, but has an id=5432
The SQL searched for items.notforloan=5432, which was, obviously, wrong !
Christophe Croullebois [Mon, 23 May 2011 12:45:11 +0000 (14:45 +0200)]
(MT #6614) bug5680 Give the choice to delete biblio with the order
Create a new link to delete the biblio with the order, if the biblio is in others baskets, the link does not appear.
Owen Leonard [Thu, 13 Jan 2011 21:53:51 +0000 (22:53 +0100)]
Fix for Bug 3459, topissues doesn't take care of ccode
- Change conditional to display filter in sidebar without EXPR
- Enhance switch between ccode default and itemtype default searches
- Enable preselect of submitted collection code in filter form,
stealing code from opac-search.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Stephane Delaye [Fri, 13 May 2011 08:22:55 +0000 (10:22 +0200)]
MT6752 OPAC Masquer colonnes