- Clik on the "Show analytics" link and check that you get a result list with the two child records you created earlier - Go back to the result list and click on the parent record, so you get the *detail view* - Check that the "Show analytics" link is displayed, and uses the title of the parent record for linking: ?q=Host-item:<Title of parent record> - Clik on the "Show analytics" link and check that you get a result list with the two child records you created earlier - Search for one or both of the child records in such a way that you can see the record(s) in a *result list* - Check that the "In: <Title of parent record>" link is displayed, and that it uses the biblionumber of the parent record for linking: ?q=Control-number:<biblionumber of parent record> - Click on the "In: <Title of parent record>" link, and check that the parent record is displayed - Go back to the result list and click on the child record, so you get the *detail view* - Check that the "In: <Title of parent record>" link is displayed, and that it uses the biblionumber of the parent record for linking: ?q=Control-number:<biblionumber of parent record> - Click on the "In: <Title of parent record>" link, and check that the parent record is displayed - Now edit the parent record and put it's biblionumber in 001. Repeat the steps above, and check that everything still works, but that the links are different: - The "Show analytics" link on the parent record should look like this: ?q=rcn:<biblionumber of parent record>+and+(bib-level:a+or+bib-level:b) - The "In: <Title of parent record>" link on the child records should be the same as it was earlier - Now set UseControlNumber = "Don't use" and repeat all of the steps above - All of the links should still be displayed and work, of course - The "In: <Title of parent record>" link on the child records should look like this: ?q=ti,phr:<Title of parent record> - The "Show analytics" link on the parent record should look like this: ?q=Host-item:<Title of parent record> - Change LDR/07 to "s" and repeat all of the steps above - Do all of this both for GRS-1 indexing and for DOM indexing... Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: .../normarc/biblios/biblio-zebra-indexdefs.xml | 132 +++++++++++--------- .../normarc/biblios/biblio-zebra-indexdefs.xsl | 21 +++ etc/zebradb/marc_defs/normarc/biblios/record.abs | 3 + .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 66 ++++++++++ .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 68 ++++++++++- .../prog/en/xslt/NORMARCslimUtils.xsl | 19 +++ .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 66 ++++++++++ .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 67 ++++++++++ .../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 19 +++ 9 files changed, 400 insertions(+), 61 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 12:14:32 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 10:14:32 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-18-g43e6791 Message-ID: <E1UUwie-0001TN-0r@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 43e679156a5250e79de0accca960e4836aa55385 (commit) via 24f42ba74ce0fe24b267ab9f6d8bd8064897b172 (commit) via ebd666c4d2ee07dd60c11513e1bcc1441c01c177 (commit) via 6655d6e2d02df18fe29ece1865929684fa276265 (commit) via 8146604253622783a26093e1decc57cf14828a36 (commit) via 26038d897ebdda32f2bdf2435f82d15efb70c0c7 (commit) from 6002812a220115d9b5b7b083ec931d9098f7af11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 43e679156a5250e79de0accca960e4836aa55385 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Wed Feb 27 15:37:39 2013 +0100 Bug 9720 : uninitialized value warnings in circulation (followup 1) This patch corrects several uninitialized value errors. Test plan: - Edit a borrower - Enter a surname using lowercase (it will be displayed uppercase by CSS) and save => Borrower surname is uppercase - Edit an organisation (depends on borrower category) - Enter a surname using lowercase (it will be displayed uppercase by CSS) and save => Borrower surname is uppercase - Go to a borrower page who has today issues - Click on More/Export today's checked in barcodes => You get a file to dowload Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 24f42ba74ce0fe24b267ab9f6d8bd8064897b172 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Wed Feb 27 15:02:49 2013 +0100 Bug 9720 : uninitialized value warnings in circulation This patch corrects several uninitialized value errors. Test plan: - Go to check out page - Check that issues and old issues are in different tables - Check that author is diplayed if exists - Check that patron address is displayed if exists - Perform a checkout Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> commit ebd666c4d2ee07dd60c11513e1bcc1441c01c177 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Mar 7 11:54:57 2013 +0100 Bug 9759: last subfield can be deleted In authorities and biblios editors, a repeatable subfield can be deleted (small icon next to input). Clone subfields are really deleted but last existing subfield is just set empty instead of deleted. But when same field is repeated, the last subfield can be deleted. This patch corrects this, last subfield of a field, even repeated, can not be deleted. Test plan : - Edit a biblio - Choose a repeatable field with a repeatable subfield : ie 600 and $x - Edit 600, enter a text in $x : ie "subA" - Clone $x - Delete second $x => second $x is deleted - Delete first $x => $x is not deleted but set empty - Edit 600, enter a text in $x : ie "subA" - Clone 600 - Edit second 600, enter a text in $x : ie "subB" - Clone $x of second 600 - Delete second $x of second 600 => second $x of second 600 is deleted - Delete first $x of second 600 => with this patch : first $x of second 600 is set empty => without this patch : first $x of second 600 is deleted, second 600 has no $x anymore Perform same test plan on an authority. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 6655d6e2d02df18fe29ece1865929684fa276265 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Mar 21 16:05:27 2013 +0100 Bug 7241, follow-up: viewlog link for circulation Fixes a few things about the CIRC link in viewlogs: - "itemnumber=" instead of "item=" - anchor #item was filled with the wrong field - tooltip now indicates "item" instead of "biblio" Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 8146604253622783a26093e1decc57cf14828a36 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Mar 21 14:30:46 2013 +0100 Bug 7241 follow-up: DB changes Reset timestamp modification on update after patch application. Give more information about the log history fix. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 26038d897ebdda32f2bdf2435f82d15efb70c0c7 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Tue Jan 22 14:46:38 2013 +0100 Bug 7241: circulation action logs record biblionumber instead of item number Issue log and and circulation logs are incorrectly recording biblionumber instead of item number, creating incorrect logs. This patch corrects this, and modifies the action_logs table in two ways: - the timestamp is not updated anymore with UPDATES (but still automatically filled when INSERTing) - to partially correct the broken logs, the log history is filled with the first found item for each biblio Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 4 ++-- circ/circulation.pl | 20 ++++++++++++-------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- members/memberentry.pl | 4 ++-- members/readingrec.pl | 3 ++- 7 files changed, 30 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 14:51:59 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 12:51:59 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10023 created. v3.12.00-beta1-299-g2cc3334 Message-ID: <E1UUzB1-0002Gg-HB@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10023 has been created at 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd (commit) - Log ----------------------------------------------------------------- commit 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:48:30 2013 -0400 Bug 10023 follow-up: Remove the last occurrences of N[degree sign] commit 7d3d347774cf44c02ca133798ead8c99849699ed Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:29:40 2013 +0200 Bug 10023: Change degree notation for number to No. This patch changes N<little circle> to No. in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled No. 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Signed-off-by: Owen Leonard <oleonard at myacpl.org> I prefer "No." over "#" and my survey of the templates shows that "No." appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3b45b745cf5a2a0392b9817e60de8461037feb6a Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:57:03 2013 +0200 Bug 10023: Change degree notation for number to # This patch changes N<little circle> to # in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled # 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:05:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:05:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9903 created. v3.12.00-beta1-302-ga8eb99b Message-ID: <E1UUzOH-0002KW-Ou@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9903 has been created at a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 (commit) - Log ----------------------------------------------------------------- commit a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 24 10:31:19 2013 +0200 Bug 9903: Followup: use the KohaDates T::T plugin to display dates. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 0c76032738ffd4c18e5a90e68a27b46c9d82a37a Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 08:55:45 2013 -0400 Bug 9903 - Sort by date broken on patron detail page When the patron detail page switched to DataTables no accommodation was made for metric date formats in sorting. This patch adds sorting based on data in a span's title attribute, and thus requires that the patch for Bug 9887 be applied. To test, view the detail page for a patron who has assorted checkouts, relatives' checkouts, and holds. Sorting of date columns should be correct with the dateformat preference set to any value. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Nice improvement. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c396d731ec72c8b68228ff4f9c648c17cf20c773 Merge: 06b8876 2cc3334 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:57:42 2013 -0400 Merge branch 'bug_10023' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:10:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:10:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9804 created. v3.12.00-beta1-304-g6e4851f Message-ID: <E1UUzSh-0002Ly-4Y@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9804 has been created at 6e4851fa406eb7b5c831c158faa5f83caf723c2a (commit) - Log ----------------------------------------------------------------- commit 6e4851fa406eb7b5c831c158faa5f83caf723c2a Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 54abf192f882f92601f23fe8696368509faab641 Merge: c396d73 a8eb99b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 09:11:22 2013 -0400 Merge branch 'bug_9903' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:29:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:29:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-305-gf5709c0 Message-ID: <E1UUzld-0002TJ-98@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via f5709c00988bfd8c401d07d52b5925c105a61072 (commit) via 6e4851fa406eb7b5c831c158faa5f83caf723c2a (commit) via 54abf192f882f92601f23fe8696368509faab641 (commit) via a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 (commit) via 0c76032738ffd4c18e5a90e68a27b46c9d82a37a (commit) via c396d731ec72c8b68228ff4f9c648c17cf20c773 (commit) via 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd (commit) via 7d3d347774cf44c02ca133798ead8c99849699ed (commit) via 3b45b745cf5a2a0392b9817e60de8461037feb6a (commit) from 06b887630b8ebca124e88579fe6c0a586daaad47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f5709c00988bfd8c401d07d52b5925c105a61072 Merge: 54abf19 6e4851f Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 09:16:20 2013 -0400 Merge branch 'bug_9804' into 3.14-master ----------------------------------------------------------------------- Summary of changes: acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 6 +++--- ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/members/moremember.tt | 20 +++++++++++++------- members/moremember.pl | 4 +--- 6 files changed, 19 insertions(+), 15 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:29:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:29:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-260-g11f8ba9 Message-ID: <E1UUzlc-0002Sp-18@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 11f8ba92b2f87581a980e18033353ec98b45c0cf (commit) via 5a5200562a8a0b39b95f254d8a5467a9a5629cd8 (commit) via 005ff0e54353c28aba4ce60eeb5c43ba2a8edeab (commit) via e03e3a15068243f8fb490f72b68841e068dd5a8d (commit) via 3726ce6c6208f89cd70e59e01e081fba59744605 (commit) via 66fcf69032e9a01aa18fbbc2f86bcc973d4afda3 (commit) from 1de8e7cb1e978e7c72bd6de81be996514755bd0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 11f8ba92b2f87581a980e18033353ec98b45c0cf Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6e4851fa406eb7b5c831c158faa5f83caf723c2a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5a5200562a8a0b39b95f254d8a5467a9a5629cd8 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 24 10:31:19 2013 +0200 Bug 9903: Followup: use the KohaDates T::T plugin to display dates. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit a8eb99b8ff9aa01479e26665ba8edd1f00c39a53) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 005ff0e54353c28aba4ce60eeb5c43ba2a8edeab Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 08:55:45 2013 -0400 Bug 9903 - Sort by date broken on patron detail page When the patron detail page switched to DataTables no accommodation was made for metric date formats in sorting. This patch adds sorting based on data in a span's title attribute, and thus requires that the patch for Bug 9887 be applied. To test, view the detail page for a patron who has assorted checkouts, relatives' checkouts, and holds. Sorting of date columns should be correct with the dateformat preference set to any value. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Nice improvement. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0c76032738ffd4c18e5a90e68a27b46c9d82a37a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit e03e3a15068243f8fb490f72b68841e068dd5a8d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:48:30 2013 -0400 Bug 10023 follow-up: Remove the last occurrences of N[degree sign] (cherry picked from commit 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3726ce6c6208f89cd70e59e01e081fba59744605 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:29:40 2013 +0200 Bug 10023: Change degree notation for number to No. This patch changes N<little circle> to No. in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled No. 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Signed-off-by: Owen Leonard <oleonard at myacpl.org> I prefer "No." over "#" and my survey of the templates shows that "No." appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 7d3d347774cf44c02ca133798ead8c99849699ed) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 66fcf69032e9a01aa18fbbc2f86bcc973d4afda3 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:57:03 2013 +0200 Bug 10023: Change degree notation for number to # This patch changes N<little circle> to # in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled # 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 3b45b745cf5a2a0392b9817e60de8461037feb6a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 6 +++--- ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/members/moremember.tt | 20 +++++++++++++------- members/moremember.pl | 4 +--- 6 files changed, 19 insertions(+), 15 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 23:20:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 21:20:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-20-g074a71e Message-ID: <E1UV776-0004mg-K4@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 074a71e61c51fa65e9d9ffb75035c815e940d168 (commit) via 7b28feafacd46b496be7aed67f2f63bac7966e91 (commit) from 43e679156a5250e79de0accca960e4836aa55385 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 074a71e61c51fa65e9d9ffb75035c815e940d168 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Sep 13 10:20:56 2012 +0200 Bug 8508: Followup: Simplify the separateData js function I think this patch does the same job as previously. + It replaces tabulation characters with 4 spaces Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 7b28feafacd46b496be7aed67f2f63bac7966e91 Author: David Cook <dcook at prosentient.com.au> Date: Tue Sep 11 07:18:54 2012 +1000 Bug 8508 - Holds to Pull : Library dropdown options are erroneously concatenated by br tags This patch introduces a new javascript function that breaks apart option strings that are erroneously concatenated by br tags. The split strings are then checked against non-concatenated option strings, and pushed into the option array if there is no duplication. This function is nestled into the JQuery datatable function for populating the drop-down menu. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/circ/pendingreserves.tt | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 00:06:14 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 22:06:14 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-24-gdb7011c Message-ID: <E1UV7pO-0004yU-Bs@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via db7011c58c88e32c9cda3a1ae1a5adf315f261f1 (commit) via 449a0cb1d00d3a448c2853565d860c090a0e44ff (commit) via d892aa49d14b794b9336c4d6076fe9d048c6b437 (commit) via 2ab1400702b3602106e1291cc95b22a2d8e09710 (commit) from 074a71e61c51fa65e9d9ffb75035c815e940d168 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit db7011c58c88e32c9cda3a1ae1a5adf315f261f1 Author: Liz Rea <liz at catalyst.net.nz> Date: Wed Mar 27 16:14:43 2013 +1300 bug 4862 - Change label of Browse by subject or author to Authority search Replicate: Load the OPAC You should see "Browse by Subject or Author right below the search box To test: Apply patch Load the OPAC You should see "Authority search" where "Browse by Subject or Author" was . Signed-off-by: Mason James <mtj at kohaaloha.com> Amended patch: change strings in opac-authorities-home.tt Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 449a0cb1d00d3a448c2853565d860c090a0e44ff Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Fri Mar 22 09:52:18 2013 +0100 Bug 9479: FIX conflict with Bug 9014 3rd parameters of output_pref is already used Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Checked sorting and display on notices page with various settings for dateformat and TimeFormat system preferences. Also checked other pages for correct display: - List of checkouts in patron account - Order search result list - Basket list in vendor search - Staff detail page Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit d892aa49d14b794b9336c4d6076fe9d048c6b437 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Jan 24 11:50:08 2013 +0100 Bug 9479: The member notices page doesn't display dates in the syspref format In order to let the KohaDates plugin display a datetime, this patch modify this plugin. Now it uses Koha::DateUtils instead of C4::Dates. Test plan: - check that the date format on the member notices page (members/notices.pl) is displayed according your syspref dateformat. - check that existing dates are always in the good format (without the hours) e.g. acqui/histsearch.pl, acqui/basket.pl, etc. - Modify your syspref and recheck the previous pages Signed-off-by: Owen Leonard <oleonard at myacpl.org> This is a nice addition, and works according to the test plan. A nice follow-up would be to create a system pref for formatting times (12/24hr). Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Fixed a tab in notices.tt to make QA script happy. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 2ab1400702b3602106e1291cc95b22a2d8e09710 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Jan 24 17:11:31 2013 +0100 Bug 9484: userid not generated consistently (different editing pages) When modifying a patron through different pages, the userid generation does not behave always the same way; this patch corrects this: - when firstname and surname are present in the form, they are used for the generation; - if there are not in the form, the firstname and surname in database are used instead. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No errors. Test This patch lacks a test plan, so I do the following 1) New user, empty userid, autocompleted 2) Edit user, change userid, saved correctly 3) Edit user, main edit window, emptied userid, autocompleted 4) Edit user, Detail > Library use, emptied userid, not autocomplete (not even a dot) 5) Applied patch 6) Repeated 1-3, same behavior 7) Repeated 4), now autocompletes with same userid as 3) So, works as described. No koha-qa errors. NOTE: It's impossible now to delete userid from interface. Off-topic: tried an userid in Arabic, works very well. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/KohaDates.pm | 23 ++++++++++++------- .../prog/en/modules/members/notices.tt | 3 +- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 2 +- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +- .../prog/en/modules/opac-authorities-home.tt | 4 +- members/memberentry.pl | 13 ++++++++++- 6 files changed, 32 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 00:07:12 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 22:07:12 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-2-gc3acf92 Message-ID: <E1UV7qK-0004zL-2O@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via c3acf92ac8d105b2a063067a76ec01ed20bbfb0e (commit) from 2f2ec10b467d705c3333e02d61215e6d937e4305 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3acf92ac8d105b2a063067a76ec01ed20bbfb0e Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Jan 24 17:11:31 2013 +0100 Bug 9484: userid not generated consistently (different editing pages) When modifying a patron through different pages, the userid generation does not behave always the same way; this patch corrects this: - when firstname and surname are present in the form, they are used for the generation; - if there are not in the form, the firstname and surname in database are used instead. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No errors. Test This patch lacks a test plan, so I do the following 1) New user, empty userid, autocompleted 2) Edit user, change userid, saved correctly 3) Edit user, main edit window, emptied userid, autocompleted 4) Edit user, Detail > Library use, emptied userid, not autocomplete (not even a dot) 5) Applied patch 6) Repeated 1-3, same behavior 7) Repeated 4), now autocompletes with same userid as 3) So, works as described. No koha-qa errors. NOTE: It's impossible now to delete userid from interface. Off-topic: tried an userid in Arabic, works very well. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: members/memberentry.pl | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 08:00:21 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 25 Apr 2013 06:00:21 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-3-gf559384 Message-ID: <E1UVFED-0008VT-BC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via f5593842dc99211192955a4e70818de18b6204b5 (commit) from c3acf92ac8d105b2a063067a76ec01ed20bbfb0e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f5593842dc99211192955a4e70818de18b6204b5 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Mar 13 14:24:20 2013 -0300 Bug 9812 - Forbid access to several files through the browser This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser. Specifically "xlst", "modules" and "includes" dirs and its contents. This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: etc/koha-httpd.conf | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 08:00:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 25 Apr 2013 06:00:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-28-gf15bc76 Message-ID: <E1UVFEV-0008WG-Rz@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via f15bc76f298c66ba68195066e27efb93618072eb (commit) via e0ffef4a84da00e9fd79bc3a46c09fdd9f090ff0 (commit) via c0c8a46be7b61539cd920e1cf51791e38c99813b (commit) via 4a1f2f70bb8264f37c31fc041350571cbb718d80 (commit) from db7011c58c88e32c9cda3a1ae1a5adf315f261f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f15bc76f298c66ba68195066e27efb93618072eb Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Apr 3 13:05:52 2013 -0400 Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits If a lost item fee is owed and partially paid off when an item is returned and a refund is processed, Koha tries to pay off existing fees before adding any leftover balance as a credit on the account. However, those fee payments aren't actually processed, due to a bug where the accountnumber was quoted as a string literal, and thus the for the fee payment would fail. This did not result in an DB error, as the query was still valid SQL. Checking the return value of the query would have revealed that the accountline had not been updated. History: This bug was introduced on April 23, 2007 with the commit 'reintroducing fixaccountforlostandreturned as requested by rosalie'. Commit id 111d590e9cdaf801256822e23f170bfc2365338f On July 30, 2009 the error was flagged with a FIXME and remained in that state until now. Commit id 51e8fc2cb6a0cf79f19206c822a4361aeca6f63f Test plan: 1) Create a test patron 2) Check out an item to that patron and give it a due date in the past 3) Run fines.pl to generate the fine for the item 4) Mark the item long overdue on the item tab (not in edit items) 5) Pay for the lost item 6) Check the item back in 7) Note the incorrect fines. Only the lost fee balance due is refunded, not the entire lost fee, but no other fees are paid off. 8) Apply the patch 9) Repeat steps 1-6, then not the fines are paid correctly Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Totel due is correct after applying the patch. All tests and QA script pass. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit e0ffef4a84da00e9fd79bc3a46c09fdd9f090ff0 Author: Corey Fuimaono <agent.075 at gmail.com> Date: Wed Jan 16 10:48:03 2013 +1300 bug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility) [Returning Items] {REVISION 1.1} testing procedure: 1. Check in Invalid Item 2. See that new header has been added. "Can't Check in" Signed-off-by: Liz Rea <liz at catalyst.net.nz> A followup may come that makes this text invisible, but this helps accessibility a great dea, and passes validation. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Amended patch: replace "Can't Check in" with "Cannot check in" and delete a h3 element with the same text in order to avoid duplicated messages. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit c0c8a46be7b61539cd920e1cf51791e38c99813b Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Mar 13 14:24:20 2013 -0300 Bug 9812 - Forbid access to several files through the browser This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser. Specifically "xlst", "modules" and "includes" dirs and its contents. This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 4a1f2f70bb8264f37c31fc041350571cbb718d80 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Mar 26 10:19:58 2013 -0400 Bug 9981: Handle sort1 field when duplicating patron It is noted in Bug 5432 that during a duplicate operation one field, 'Sort1' does not automatically clear when the cursor moves into it. This patch corrects this. Edit a patron record to have data in the Sort1 and Sort2 fields. Perform a duplicate operation on this patron and confirm that the Sort1 and Sort2 fields show the information from the original patron record. When you click on each field the contents should disappear. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- etc/koha-httpd.conf | 20 ++++++++++++++++++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 6 +++++- 4 files changed, 27 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 02:29:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 00:29:27 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10070 created. v3.12.00-beta1-306-g52db043 Message-ID: <E1UVWXX-0005fq-Bx@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10070 has been created at 52db043347016e106033c4c372bd9ec34cf8dee1 (commit) - Log ----------------------------------------------------------------- commit 52db043347016e106033c4c372bd9ec34cf8dee1 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 17 15:37:57 2013 +0200 Bug 10070: Anonymous search history is not being set in the cookie Test plan: 1 - turn on EnableOpacSearchHistory 2 - launch some searches at the opac 3 - go to your search history 4 - there is no history! 5 - apply this patch 6 - retry steps 1 to 3 7 - your history search is available! Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> This does fix the bug, but does undo the change to make the cookie utf-8 safe, however I think that change was done in the wrong way so I am happy to sign this off Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Wondering if the comment line should be deleted now too. Patch fixes the problem. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:16:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:16:55 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10050 created. v3.12.00-beta1-310-gd8d4d99 Message-ID: <E1UVXHT-00067i-4c@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10050 has been created at d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca (commit) - Log ----------------------------------------------------------------- commit d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 23:28:41 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Language settings Activate German and English for OPAC and intranet by default. To test: - Run the German web installer - Check that when logging into Koha the German interface is shown and you can switch between English and German using the links at the bottom of the page - Check language relevant settings in the system preferences are correctly set Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 60db9a9e244e1a93522384bf3b715fcfea364927 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:56:30 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Optional This patch updates the German web installer files from the optional directory. This includes: - Adding the bridge/reference.gif to the REF itemtype - Updating currency rates and setting EUR to active - Adding branchcode MPL to the sample holidays - Updating a few strings on the patroncard samples - Fixing typos and rephrasing To test: - Run the web installer with German installed - Verify all optional SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 40cd834c74d0a8b5b1d92941c0ec651655630103 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:14:50 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Mandatory This patch updates the German web installer files from the mandatory directory. This includes: - CalendarFirstDayOfWeek defaults to Monday - gist rates default to 0.07|0.19|0.00 - RoutlingListNote default text translation - uniqueitemfields default set to barcode stocknumber - Translation of new user flags and permissions - Corrections to existing translations and typo corrections To test: - Run the web installer with German installed - Verify all mandatory SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 21786fb71e5b7e0cf0c58d8a9b18a79af56063ef Merge: f5709c0 52db043 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 20:35:25 2013 -0400 Merge branch 'bug_10070' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:27:32 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:27:32 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9925 created. v3.12.00-beta1-312-gaadcdf7 Message-ID: <E1UVXRk-0006Bt-H7@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9925 has been created at aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 (commit) - Log ----------------------------------------------------------------- commit aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 09:29:32 2013 -0400 Bug 9925 - Remove unused table-pager include While the tablesorter plugin has not been completely eliminated from the staff client yet, there are no more instances where it requires the include file for showing paging controls. table-pager.inc can be safely removed. To test, apply the patch and confirm that the file is gone. A search of Koha templates for references to table-pager.inc should return no results. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 7d5c915e3cd9f4cbfb64d610b16c9c4e2168588b Merge: 21786fb d8d4d99 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:22:16 2013 -0400 Merge branch 'bug_10050' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:44:10 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:44:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9850 updated. v3.12.00-beta1-200-g68e8f72 Message-ID: <E1UVXhq-0006IC-FR@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9850 has been updated via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) from f6b936d50c6c46c2e427ae60a109a65522f66763 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:49:15 2013 -0400 Bug 9850: Fix Patron statistics link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 38421614a43d5aebbd3403ae8ee543e0e6dca07e Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:48:03 2013 -0400 Bug 9850: Fix patron routing lists link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:47:01 2013 -0400 Bug 9850: Fix patron files link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8b574a02ba194c07d15104bb185c331993770880 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 23:16:42 2013 -0400 Bug 9850: Update Lists Help This updates the manual link in the lists help file. To test: Visit lists pages in the staff client, view the help and confirm link goes to the right place. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 23:14:16 2013 -0400 Bug 9850: Update holds help file This updates the manual link on the holds help file. To test: Visit the holds tab on any bib record and click the Help link. Make sure it goes to the right place. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit f2071b351e99a67108cc4a59ed5dc921f4470c55 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 22:35:30 2013 -0400 Bug 9850: Add missing tags help file This patch adds a help file to the listing of titles that use a tag in the tag moderation tool. To test: * Visit the Tag Moderation Tool * Click on a accepted tag * Check that the help file loads on the list and that the text and links are right. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 595ac425b86864c2d52ca093bdc865a4804c033a Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 22:31:57 2013 -0400 Bug 9850: Update Tags & Comments Help This patch updates the text and links for the Tag and Comment moderation tools. To test: Visit the help on the tags and comments tools and confirm that text and links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit e6ebc86a07dee5843f7fffae3605fc3d00a183c8 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 14:41:05 2013 -0400 Bug 9850: Catalogue help files This patch updates the help files in the catalogue folder. To test: Visit the help on the search, detail pages, item details and item history pages and confirm text and links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3cac78bdb83b0a510f062e683698f5f253014296 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 12:49:05 2013 -0400 Bug 9850: Acq Help Files for 3.12 This patch updates the manual links and some text in the acq help files. To test: Visit help on all acq pages and make sure links and text are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit a7cfa33058c7b469869bedb8cb8dc838b37135da Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sun Mar 24 01:14:58 2013 -0400 Bug 9850: Update Admin Help Files for 3.12 This patch updates the links to the manual and the text of the admin help files. To test: Visit the help files on all admin pages and make sure the links and text are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c4629aaffed8afb1dab2a812e16dddd6dbf1acce Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 19:53:14 2013 -0400 Bug 9850: Update Patron Help Files for 3.12 This patch updates all the help files in the members folder. It also adds a missing help file for approving patron account changes. To Test: Visit the help on every patron page and make sure the text and manual links are all right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Fixed 2 obvious typos mentioned on the bug report. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:46:38 2013 -0400 Bug 9850: Update Patron Card Help Files This patch updates the links to the manual in the patron card creator help files. There were no other changes. To test: Visit help on the patron card creator tool and make sure the links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 418d5706a1e474a4d06377cf685563199064490a Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:42:12 2013 -0400 Bug 9850: Update Label Help Files This patch updates the manual links in the label creator help files. There were not other string changes. To test: Visit the help on the label creator and make sure that the links go to the 3.12 manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit bec43ed6404a629d5a4384b38531842f1209897d Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:17:00 2013 -0400 Bug 9850: Update Authority Help Files This patch just updates the links to the manual in the Authority help files. To Test: Visit the help on all authority pages and click the manual link in the help pop up. It should go to the 3.12 manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:09:39 2013 -0400 Bug 9850: Update Stray Help Files This patch updates the help files which do not have a module folder. To test: Visit About Koha, Koha Home, and the No Help Found pages and check links to the manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++++-- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 +++++++++++++------- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 ++ .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 ++ .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- 98 files changed, 300 insertions(+), 177 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:47:34 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:47:34 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9818 created. v3.12.00-beta1-330-g44a8ed7 Message-ID: <E1UVXl8-0006KQ-5j@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9818 has been created at 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 (commit) - Log ----------------------------------------------------------------- commit 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 4b1749c170a534f315b17093c21b188837844868 Merge: dbb7a1e 68e8f72 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:49:41 2013 -0400 Merge branch 'bug_9850' into 3.14-master commit dbb7a1e08a02d6ec1e201b98cf8f9152a464a0b3 Merge: 7d5c915 aadcdf7 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:33:37 2013 -0400 Merge branch 'bug_9925' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:50:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:50:49 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9766 created. v3.12.00-beta1-332-g28518a0 Message-ID: <E1UVXoH-0006Mk-H2@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9766 has been created at 28518a033bf9a1b3f86270cfab438b5b9cdee8be (commit) - Log ----------------------------------------------------------------- commit 28518a033bf9a1b3f86270cfab438b5b9cdee8be Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Mar 7 16:07:16 2013 -0500 Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system The budget planning table previously used a YUI menu as part of a system for hiding and showing table columns. Instead of trying to convert that sytem to Bootstrap I have used code from the batch modification/deletion pages which uses a list of checkboxes to show and hide table columns. This has the advantage of giving the user visual feedback of what columns are hidden and of offering the user an interface which is familiar from other pages. This patch also moves CSS from a batch-operations-specific CSS file into the main CSS file. Batch modification templates have been modified accordingly. To test, view the budget planning page and choose different "plan by" options (by month, by library, by item type). Test the show/hide action on each individual column and using the "show all" and "hide all" checkboxes. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 1d1cd09456e263218befea64c023124fe4ce1e51 Merge: 4b1749c 44a8ed7 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:53:43 2013 -0400 Merge branch 'bug_9818' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:00:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:00:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_8068 created. v3.12.00-beta1-334-g8e222dc Message-ID: <E1UVXxP-0006RF-Hh@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_8068 has been created at 8e222dcdcc1f4aad9147f584df9d2f983f803a48 (commit) - Log ----------------------------------------------------------------- commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 17:44:43 2013 +0200 Bug 8068: Standardize terms used on acquisitions statistics branch > library budget > fund bookseller, supplier > vendor and capitalization To test: 1) Go to Reports > Acquisitions statistics 2) Check the labels and options of the form for correctness. 3) Run a few test searches to make sure functionality is unchanged. Unfortunately, some strings are from the .pl file, so a follow up moving those to the templates is needed. To make the changes consistent I have changed them in the .pl file. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 0b21236d2e7690bd3b499634fdb8fede249b4ff2 Merge: 1d1cd09 28518a0 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:56:51 2013 -0400 Merge branch 'bug_9766' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:02:25 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:02:25 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10106 created. v3.12.00-beta1-336-gfc34239 Message-ID: <E1UVXzV-0006TJ-JE@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10106 has been created at fc34239c7d161b82d923dbf318537d6a22e7ed9f (commit) - Log ----------------------------------------------------------------- commit fc34239c7d161b82d923dbf318537d6a22e7ed9f Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 24 08:52:12 2013 -0400 Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen A misplaced closing </li> causes the "reopen" checkbox to be misplaced if you're editing the a closed invoice. This patch puts the </li> in its proper place. To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and confirm that the "reopen" checkbox is correctly placed. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Problem easy to spot, patch fixes it perfectly. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8ffd35d8c1d3cb940b56b5702fac88f593e8f416 Merge: 0b21236 8e222dc Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:06:12 2013 -0400 Merge branch 'bug_8068' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:07:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:07:19 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9831 created. v3.12.00-beta1-340-g5959154 Message-ID: <E1UVY4F-0006W8-PC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9831 has been created at 5959154bc140a60164dd8652dd4285e2ec51f5d3 (commit) - Log ----------------------------------------------------------------- commit 5959154bc140a60164dd8652dd4285e2ec51f5d3 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit fe85af6929c0ad0ce9fdc7817a69286cb53f2a38 Merge: 8f40b04 cd14dae Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:11:23 2013 -0400 Merge branch 'bug_10045' into 3.14-master commit cd14dae7720b93f1ed101cd6383828885237aa02 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 18:02:43 2013 +0200 Bug 10045: Switch budget to fund in suggestions Labels are budget, but should be fund. To test: 1) Check the table on the suggestions page. 2) Check the suggestion edit form. 3) Check the suggestion display. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8f40b04dcc55c10420b79ec7050028399b73131f Merge: 8ffd35d fc34239 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:08:33 2013 -0400 Merge branch 'bug_10106' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:08:17 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:08:17 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10006 created. v3.12.00-beta1-342-g0942cac Message-ID: <E1UVY5B-0006Ww-2G@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10006 has been created at 0942cac72e8910b3ed6e557c42f6665060c14bd0 (commit) - Log ----------------------------------------------------------------- commit 0942cac72e8910b3ed6e557c42f6665060c14bd0 Author: Liz Rea <liz at catalyst.net.nz> Date: Tue Apr 9 13:20:09 2013 +1200 Bug 10006 - holding branch is not available to XSLT display To test: Use attached XSLT stylesheet for OPAC Results * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file. * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem. Verify that the OPAC results now show the holding branch instead of the home branch. Possible fail states: * no branch is shown (only call numbers, if given) * the wrong branch is shown Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 141048bd9759689a7927895f3a50cf2c1dae5d23 Merge: fe85af6 5959154 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:13:28 2013 -0400 Merge branch 'bug_9831' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:10 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10045 created. v3.12.00-beta1-338-gcd14dae Message-ID: <E1UVY62-0006Ye-5j@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10045 has been created at cd14dae7720b93f1ed101cd6383828885237aa02 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-288-g6edaffc Message-ID: <E1UVY6I-0006ZP-4H@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 (commit) via 74a458b85335d70d1068b9f1491df52e92ac5d66 (commit) via 3054241585e614c9423210ea4fad8d5bf1f0c897 (commit) via c124e48057b5960a8c0ba82281e47d6e23e3b97a (commit) via c8f91111c0e36d3bc867653a84958408d7a45c05 (commit) via 9d612da96b5790179d954f2a0b8f191a38f75a26 (commit) via 37cd791fd9fa7921f4a8bac19f03b8b3e02ef5e8 (commit) via 8110875a61174e62605a753b35b013e570730875 (commit) via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) via 1fc5771dca0bc12f6f6b54440b110db1031e17f6 (commit) via 6363306c10c119a2d362a11082eadf0d84c53f15 (commit) via 3ae673410231bbd19249fba8390948ef31dc51a3 (commit) via 6aa20670113dcb0e4dfa9b60bd8756172ad8a949 (commit) via 8b3f379b9273f192c9cbe24ad936e1d8f04a6b3d (commit) from 11f8ba92b2f87581a980e18033353ec98b45c0cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 Author: Liz Rea <liz at catalyst.net.nz> Date: Tue Apr 9 13:20:09 2013 +1200 Bug 10006 - holding branch is not available to XSLT display To test: Use attached XSLT stylesheet for OPAC Results * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file. * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem. Verify that the OPAC results now show the holding branch instead of the home branch. Possible fail states: * no branch is shown (only call numbers, if given) * the wrong branch is shown Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0942cac72e8910b3ed6e557c42f6665060c14bd0) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 74a458b85335d70d1068b9f1491df52e92ac5d66 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 5959154bc140a60164dd8652dd4285e2ec51f5d3) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3054241585e614c9423210ea4fad8d5bf1f0c897 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 18:02:43 2013 +0200 Bug 10045: Switch budget to fund in suggestions Labels are budget, but should be fund. To test: 1) Check the table on the suggestions page. 2) Check the suggestion edit form. 3) Check the suggestion display. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit cd14dae7720b93f1ed101cd6383828885237aa02) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c124e48057b5960a8c0ba82281e47d6e23e3b97a Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 24 08:52:12 2013 -0400 Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen A misplaced closing </li> causes the "reopen" checkbox to be misplaced if you're editing the a closed invoice. This patch puts the </li> in its proper place. To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and confirm that the "reopen" checkbox is correctly placed. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Problem easy to spot, patch fixes it perfectly. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit fc34239c7d161b82d923dbf318537d6a22e7ed9f) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c8f91111c0e36d3bc867653a84958408d7a45c05 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 17:44:43 2013 +0200 Bug 8068: Standardize terms used on acquisitions statistics branch > library budget > fund bookseller, supplier > vendor and capitalization To test: 1) Go to Reports > Acquisitions statistics 2) Check the labels and options of the form for correctness. 3) Run a few test searches to make sure functionality is unchanged. Unfortunately, some strings are from the .pl file, so a follow up moving those to the templates is needed. To make the changes consistent I have changed them in the .pl file. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9d612da96b5790179d954f2a0b8f191a38f75a26 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Mar 7 16:07:16 2013 -0500 Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system The budget planning table previously used a YUI menu as part of a system for hiding and showing table columns. Instead of trying to convert that sytem to Bootstrap I have used code from the batch modification/deletion pages which uses a list of checkboxes to show and hide table columns. This has the advantage of giving the user visual feedback of what columns are hidden and of offering the user an interface which is familiar from other pages. This patch also moves CSS from a batch-operations-specific CSS file into the main CSS file. Batch modification templates have been modified accordingly. To test, view the budget planning page and choose different "plan by" options (by month, by library, by item type). Test the show/hide action on each individual column and using the "show all" and "hide all" checkboxes. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 28518a033bf9a1b3f86270cfab438b5b9cdee8be) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 37cd791fd9fa7921f4a8bac19f03b8b3e02ef5e8 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 44a8ed7dec205dd264797ecf2638fea7f1ea67c8) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8110875a61174e62605a753b35b013e570730875 Merge: 1fc5771 68e8f72 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:50:02 2013 -0400 Merge branch 'bug_9850' into 3.12-master commit 1fc5771dca0bc12f6f6b54440b110db1031e17f6 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 09:29:32 2013 -0400 Bug 9925 - Remove unused table-pager include While the tablesorter plugin has not been completely eliminated from the staff client yet, there are no more instances where it requires the include file for showing paging controls. table-pager.inc can be safely removed. To test, apply the patch and confirm that the file is gone. A search of Koha templates for references to table-pager.inc should return no results. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit aadcdf7c7e4c254edea4f2c96229add6ec8c74b1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6363306c10c119a2d362a11082eadf0d84c53f15 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 23:28:41 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Language settings Activate German and English for OPAC and intranet by default. To test: - Run the German web installer - Check that when logging into Koha the German interface is shown and you can switch between English and German using the links at the bottom of the page - Check language relevant settings in the system preferences are correctly set Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3ae673410231bbd19249fba8390948ef31dc51a3 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:56:30 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Optional This patch updates the German web installer files from the optional directory. This includes: - Adding the bridge/reference.gif to the REF itemtype - Updating currency rates and setting EUR to active - Adding branchcode MPL to the sample holidays - Updating a few strings on the patroncard samples - Fixing typos and rephrasing To test: - Run the web installer with German installed - Verify all optional SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 60db9a9e244e1a93522384bf3b715fcfea364927) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6aa20670113dcb0e4dfa9b60bd8756172ad8a949 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:14:50 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Mandatory This patch updates the German web installer files from the mandatory directory. This includes: - CalendarFirstDayOfWeek defaults to Monday - gist rates default to 0.07|0.19|0.00 - RoutlingListNote default text translation - uniqueitemfields default set to barcode stocknumber - Translation of new user flags and permissions - Corrections to existing translations and typo corrections To test: - Run the web installer with German installed - Verify all mandatory SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 40cd834c74d0a8b5b1d92941c0ec651655630103) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8b3f379b9273f192c9cbe24ad936e1d8f04a6b3d Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 17 15:37:57 2013 +0200 Bug 10070: Anonymous search history is not being set in the cookie Test plan: 1 - turn on EnableOpacSearchHistory 2 - launch some searches at the opac 3 - go to your search history 4 - there is no history! 5 - apply this patch 6 - retry steps 1 to 3 7 - your history search is available! Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> This does fix the bug, but does undo the change to make the cookie utf-8 safe, however I think that change was done in the wrong way so I am happy to sign this off Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Wondering if the comment line should be deleted now too. Patch fixes the problem. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 52db043347016e106033c4c372bd9ec34cf8dee1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 + .../data/mysql/de-DE/mandatory/class_sources.txt | 2 +- .../de-DE/mandatory/message_transport_types.txt | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- .../sample_notices_message_attributes.txt | 3 +- .../sample_notices_message_transports.txt | 4 +- .../mysql/de-DE/mandatory/system_preferences.sql | 13 +- .../mysql/de-DE/mandatory/system_preferences.txt | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 14 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 12 +- .../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +- installer/data/mysql/de-DE/optional/auth_val.txt | 4 +- .../optional/marc21_holdings_coded_values.txt | 2 +- installer/data/mysql/de-DE/optional/parameters.sql | 10 +- installer/data/mysql/de-DE/optional/parameters.txt | 2 +- .../mysql/de-DE/optional/patron_categories.sql | 2 +- .../mysql/de-DE/optional/patron_categories.txt | 19 +- .../mysql/de-DE/optional/sample_creator_data.sql | 4 +- .../mysql/de-DE/optional/sample_creator_data.txt | 2 +- .../data/mysql/de-DE/optional/sample_holidays.sql | 10 +- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 2 +- .../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +- .../data/mysql/de-DE/optional/sample_libraries.sql | 4 - .../data/mysql/de-DE/optional/sample_news.sql | 4 +- .../data/mysql/de-DE/optional/sample_patrons.txt | 2 +- .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../intranet-tmpl/prog/en/css/pages/batchMod.css | 7 - .../intranet-tmpl/prog/en/css/staff-global.css | 8 + .../intranet-tmpl/prog/en/includes/table-pager.inc | 17 - koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 80 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 102 ++-- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 ++++-- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 + .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 + .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 14 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../prog/en/modules/tools/batchMod-del.tt | 1 - .../prog/en/modules/tools/batchMod-edit.tt | 1 - opac/opac-search.pl | 2 +- reports/acquisitions_stats.pl | 4 +- 137 files changed, 910 insertions(+), 528 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/batchMod.css delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-343-gc98d65a Message-ID: <E1UVY6J-0006aD-Ql@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via c98d65adf742ab0cadacd1ae0811a83d4d711c27 (commit) via 0942cac72e8910b3ed6e557c42f6665060c14bd0 (commit) via 141048bd9759689a7927895f3a50cf2c1dae5d23 (commit) via 5959154bc140a60164dd8652dd4285e2ec51f5d3 (commit) via fe85af6929c0ad0ce9fdc7817a69286cb53f2a38 (commit) via cd14dae7720b93f1ed101cd6383828885237aa02 (commit) via 8f40b04dcc55c10420b79ec7050028399b73131f (commit) via fc34239c7d161b82d923dbf318537d6a22e7ed9f (commit) via 8ffd35d8c1d3cb940b56b5702fac88f593e8f416 (commit) via 8e222dcdcc1f4aad9147f584df9d2f983f803a48 (commit) via 0b21236d2e7690bd3b499634fdb8fede249b4ff2 (commit) via 28518a033bf9a1b3f86270cfab438b5b9cdee8be (commit) via 1d1cd09456e263218befea64c023124fe4ce1e51 (commit) via 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 (commit) via 4b1749c170a534f315b17093c21b188837844868 (commit) via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) via dbb7a1e08a02d6ec1e201b98cf8f9152a464a0b3 (commit) via aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 (commit) via 7d5c915e3cd9f4cbfb64d610b16c9c4e2168588b (commit) via d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca (commit) via 60db9a9e244e1a93522384bf3b715fcfea364927 (commit) via 40cd834c74d0a8b5b1d92941c0ec651655630103 (commit) via 21786fb71e5b7e0cf0c58d8a9b18a79af56063ef (commit) via 52db043347016e106033c4c372bd9ec34cf8dee1 (commit) from f5709c00988bfd8c401d07d52b5925c105a61072 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c98d65adf742ab0cadacd1ae0811a83d4d711c27 Merge: 141048b 0942cac Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:14:26 2013 -0400 Merge branch 'bug_10006' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 + .../data/mysql/de-DE/mandatory/class_sources.txt | 2 +- .../de-DE/mandatory/message_transport_types.txt | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- .../sample_notices_message_attributes.txt | 3 +- .../sample_notices_message_transports.txt | 4 +- .../mysql/de-DE/mandatory/system_preferences.sql | 13 +- .../mysql/de-DE/mandatory/system_preferences.txt | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 14 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 12 +- .../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +- installer/data/mysql/de-DE/optional/auth_val.txt | 4 +- .../optional/marc21_holdings_coded_values.txt | 2 +- installer/data/mysql/de-DE/optional/parameters.sql | 10 +- installer/data/mysql/de-DE/optional/parameters.txt | 2 +- .../mysql/de-DE/optional/patron_categories.sql | 2 +- .../mysql/de-DE/optional/patron_categories.txt | 19 +- .../mysql/de-DE/optional/sample_creator_data.sql | 4 +- .../mysql/de-DE/optional/sample_creator_data.txt | 2 +- .../data/mysql/de-DE/optional/sample_holidays.sql | 10 +- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 2 +- .../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +- .../data/mysql/de-DE/optional/sample_libraries.sql | 4 - .../data/mysql/de-DE/optional/sample_news.sql | 4 +- .../data/mysql/de-DE/optional/sample_patrons.txt | 2 +- .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../intranet-tmpl/prog/en/css/pages/batchMod.css | 7 - .../intranet-tmpl/prog/en/css/staff-global.css | 8 + .../intranet-tmpl/prog/en/includes/table-pager.inc | 17 - koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 80 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 102 ++-- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 ++++-- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 + .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 + .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 14 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../prog/en/modules/tools/batchMod-del.tt | 1 - .../prog/en/modules/tools/batchMod-edit.tt | 1 - opac/opac-search.pl | 2 +- reports/acquisitions_stats.pl | 4 +- 137 files changed, 910 insertions(+), 528 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/batchMod.css delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:33:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:33:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-296-g0d59169 Message-ID: <E1UVYTT-0006v4-7v@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 (commit) via 90756506f9326d885dc854ce3ff8507c1b023b32 (commit) via a0ede79720fef1f7f2aa54e90061ba90ee5ba83d (commit) via abb1b2839cc0e7bb7937a628bf265b90d84c7bc2 (commit) via 86409db5d9141ff4a4036bf5bcd61dda0ed580cb (commit) via 7f7c80a1507c1fdf6c877a7f1d5658d07f77d763 (commit) via b54f971beb834421f0eca19793e59f4b1a793700 (commit) via 4dc5411423ed597d3887101e7fd3ac6ce5b41fba (commit) from 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:37:54 2013 -0400 Revert "Merge branch 'bug_6554' into 3.12-master" This reverts commit 9c0b2e408b496b999cdbede92e651f3aef588209, reversing changes made to 65ea963e5217b1e955e404ea1c09928f6b259110. 6554 considered harmful Conflicts: opac/opac-search.pl commit 90756506f9326d885dc854ce3ff8507c1b023b32 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:33:19 2013 -0400 Revert "Bug 6554 Fix error caused by modifying $_ in a map" This reverts commit 32a0703092172e9dc92624bbc8a5649e05a79929. 6554 considered harmful. commit a0ede79720fef1f7f2aa54e90061ba90ee5ba83d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:57 2013 -0400 Revert "Bug 10074 - Encoding problems at login time" This reverts commit 1ee3892529a0d920c555f357330316fdaff50e08. 6554 considered harmful. commit abb1b2839cc0e7bb7937a628bf265b90d84c7bc2 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:43 2013 -0400 Revert "Bug 10074 - Encoding problems for installer" This reverts commit 362d399e48a89e2903a48f189d593ace0e82b88f. 6554 considered harmful. commit 86409db5d9141ff4a4036bf5bcd61dda0ed580cb Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:26 2013 -0400 Revert "Bug 10074: QA Followup for InstallAuth.pm" This reverts commit c509ea3f18e71d230b634ba88291f3b32f446345. 6554 considered harmful. commit 7f7c80a1507c1fdf6c877a7f1d5658d07f77d763 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:13 2013 -0400 Revert "Bug 10019: Fix for userid containing UTF8 chars" This reverts commit 678884ba389251849c69a40435a15f43f1bbb277. 6554 considered harmful. commit b54f971beb834421f0eca19793e59f4b1a793700 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:31:49 2013 -0400 Revert "Bug 9951: Followup for Tools" This reverts commit 22c88aa4cdfbe7389133d393199f57b5946e6605. 6554 considered harmful. commit 4dc5411423ed597d3887101e7fd3ac6ce5b41fba Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:31:21 2013 -0400 Revert "Bug 9951: Followup for tools/viewlog.pl" This reverts commit 5c4c680fa69c2af8643a61268b5568c57401e5b1. 6554 considered harmful. ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 15 +++++++------ C4/Context.pm | 17 +-------------- C4/ItemType.pm | 2 +- C4/Output.pm | 6 ++++- C4/Search.pm | 25 +++++++++------------ C4/Templates.pm | 44 +++++++++++++++++++++++++++++++++++++- C4/XSLT.pm | 3 +- acqui/booksellers.pl | 1 - acqui/histsearch.pl | 9 -------- admin/preferences.pl | 5 +--- admin/z3950servers.pl | 2 +- authorities/authorities-home.pl | 2 +- catalogue/search.pl | 2 +- cataloguing/addbiblio.pl | 2 +- cataloguing/additem.pl | 2 +- cataloguing/z3950_search.pl | 2 +- circ/circulation.pl | 2 - installer/InstallAuth.pm | 9 +++++-- members/member.pl | 2 +- opac/opac-search.pl | 2 +- patroncards/members-search.pl | 1 - reports/guided_reports.pl | 2 +- reserve/renewscript.pl | 2 +- serials/routing-preview.pl | 2 +- serials/routing.pl | 2 +- serials/serials-search.pl | 3 -- tags/review.pl | 2 +- tools/viewlog.pl | 2 +- 28 files changed, 90 insertions(+), 80 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 13:48:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 11:48:05 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10115 created. v3.12.00-beta1-344-gf8130fb Message-ID: <E1UVh8H-00019E-30@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10115 has been created at f8130fb8486a3bb840d37006ddfbf046cb9b161a (commit) - Log ----------------------------------------------------------------- commit f8130fb8486a3bb840d37006ddfbf046cb9b161a Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Apr 25 08:49:51 2013 -0400 Bug 10115 - Hiding advanced search in Orders search tab removes plus button The logic of the JavaScript for showing and hiding additional options in the orders search form wasn't quite right, resulting in the +/- control being hidden incorrectly. This patch corrects and simplifies the JS in order to fix the problem. To test: - Open any page in Acquisitions which shows the orders search form in the header search bar (for instance, Acquisitions home). - Open the orders search tab and click on the "+" to show more options. - Click the "-" to hide the additional options. The additional options should now be hidden and the "+" displayed. Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net> Works as expected Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 13:49:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 11:49:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10107 created. v3.12.00-beta1-346-g545573d Message-ID: <E1UVh9p-0001Ak-C3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10107 has been created at 545573d33318a37e5f58f053acc3a5cf09a9260c (commit) - Log ----------------------------------------------------------------- commit 545573d33318a37e5f58f053acc3a5cf09a9260c Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9e70efd11049b12f672b0fdbbe22d23a6e304d1c Merge: c98d65a f8130fb Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 07:54:13 2013 -0400 Merge branch 'bug_10115' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:04:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:04:11 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9659 created. v3.12.00-beta1-350-g1f9145b Message-ID: <E1UVhNr-0001Ni-0b@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9659 has been created at 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 (commit) - Log ----------------------------------------------------------------- commit 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:08:07 2013 -0400 Bug 9659: Move new unit test to db-dependent directory C4::Reports::Guided requires a koha-conf.xml file to be in place in order to load. This means that any test which uses it has to go in t/db_dependent Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6110375307845778f74d6e5a214d63ab69cc5330 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 10 15:50:50 2013 -0300 Bug 9659 - QA Follow up: Unit tests Added some tests against the methods added by this patch. To test, prove -v - t/Koha.t - t/ReportsGuided.t Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Works quite nicely! All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit cdc5e11159c6c3dba8ae371094633feb5e64b57d Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Tue Feb 19 15:58:53 2013 -0300 Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports A user might create a SQL report that relies on non-existent authorised value categories. Because of a typo, or just because they copy&pasted the report from the Wiki. Use cases are: - The user creates a report from SQL a) Uses bad authorised values b) Clicks 'Save Report' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Save Report' - The user edits an already saved report (Update SQL) a) Uses bad authorised values b) Clicks 'Update SQL' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Update SQL' - The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things. To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'): SELECT * FROM itemtypes WHERE hola=<<Test branch1|branchee>> AND hola2=<<Test branch2|brancha>> Regards To+ Notes: - I added several comments on the code. - Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it). - Added the following methods - C4::Reports::Guided::GetReservedAuthorisedValues - C4::Reports::Guided::GetParametersFromSQL - C4::Reports::Guided::IsAuthorisedValueValid - C4::Reports::Guided::ValidateSQLParameters - C4::Koha::IsAuthorisedValueCategory - Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D. - Fixed some trivial perlcritic -5 errors - Removed some debugging stuff left by mistake - Fixed some POD problems - Optimal SQL-driven IsAuthorisedValueCategory method - Thanks to Owen and Jared for their patience heh. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No koha-qa errors. Test: Tried with examples (from help and test plan) reports, correctly identifies invalid authorized values, and no problem with authorized ones. NOTE: Online help for this does not states that partial values need to be between '%' in a SQLish way. Perhaps this could be addressed inserting % in values or adding a checkbox (partial|exact). Or changing help. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b60a81111048a03591c455134b2b311c644d8754 Merge: 9e70efd 545573d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 07:55:53 2013 -0400 Merge branch 'bug_10107' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:12:56 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:12:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9219 created. v3.12.00-beta1-352-g6385cfd Message-ID: <E1UVhWK-0001Qh-Tv@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9219 has been created at 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 (commit) - Log ----------------------------------------------------------------- commit 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Dec 5 13:55:00 2012 -0500 Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl This patch adds the lost and damaged status for an issued item to the table of issued items on circulation.pl to make it align more closely to the same table on moremember.pl Test Plan: 1) Apply patch 2) Issue an item 3) Set the item's damaged status 4) Verify the status is showing near the date due on circulation.pl 5) Clear the damaged status and set the lost status again 6) Repeat step 4 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I could only test this with the DAMAGED value, because currently lost items are removed from the patron account when you set the status. I know there is a patch somewhere to make it optional and the change looks alright. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 48161f3c8abd4f01f4915b9d42515d128e70de81 Merge: b60a811 1f9145b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:09:23 2013 -0400 Merge branch 'bug_9659' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:24:50 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:24:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-353-g03b4dfe Message-ID: <E1UVhhq-0001XT-38@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 03b4dfe846047f233d7de84d8987f6622ee24129 (commit) via 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 (commit) via 48161f3c8abd4f01f4915b9d42515d128e70de81 (commit) via 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 (commit) via 6110375307845778f74d6e5a214d63ab69cc5330 (commit) via cdc5e11159c6c3dba8ae371094633feb5e64b57d (commit) via b60a81111048a03591c455134b2b311c644d8754 (commit) via 545573d33318a37e5f58f053acc3a5cf09a9260c (commit) via 9e70efd11049b12f672b0fdbbe22d23a6e304d1c (commit) via f8130fb8486a3bb840d37006ddfbf046cb9b161a (commit) from c98d65adf742ab0cadacd1ae0811a83d4d711c27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03b4dfe846047f233d7de84d8987f6622ee24129 Merge: 48161f3 6385cfd Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:18:59 2013 -0400 Merge branch 'bug_9219' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 23 +++ C4/Reports/Guided.pm | 127 +++++++++++++--- .../prog/en/includes/acquisitions-search.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 22 +++ .../en/modules/reports/guided_reports_start.tt | 87 +++++++++-- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- reports/guided_reports.pl | 170 ++++++++++++++------ t/Koha.t | 36 ++++- t/db_dependent/ReportsGuided.t | 110 +++++++++++++ 9 files changed, 497 insertions(+), 84 deletions(-) create mode 100755 t/db_dependent/ReportsGuided.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:24:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:24:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-302-ga80ef2b Message-ID: <E1UVhho-0001X1-Fa@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d (commit) via 9522316ce2e7382ced1f70f4d462f14d8b0bbaa2 (commit) via 041beaa1d4932b022ea34de7789e74b2ae586977 (commit) via f4c72bbc2aa660ba2c72a06fe7c3f9a3ff6ded15 (commit) via b391e79c2e30b7feaa984c0fd835f97ac88b6221 (commit) via 5bff5aa448c921fb67879924a54b3704f5485eb1 (commit) from 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Dec 5 13:55:00 2012 -0500 Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl This patch adds the lost and damaged status for an issued item to the table of issued items on circulation.pl to make it align more closely to the same table on moremember.pl Test Plan: 1) Apply patch 2) Issue an item 3) Set the item's damaged status 4) Verify the status is showing near the date due on circulation.pl 5) Clear the damaged status and set the lost status again 6) Repeat step 4 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I could only test this with the DAMAGED value, because currently lost items are removed from the patron account when you set the status. I know there is a patch somewhere to make it optional and the change looks alright. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9522316ce2e7382ced1f70f4d462f14d8b0bbaa2 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:08:07 2013 -0400 Bug 9659: Move new unit test to db-dependent directory C4::Reports::Guided requires a koha-conf.xml file to be in place in order to load. This means that any test which uses it has to go in t/db_dependent Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 041beaa1d4932b022ea34de7789e74b2ae586977 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 10 15:50:50 2013 -0300 Bug 9659 - QA Follow up: Unit tests Added some tests against the methods added by this patch. To test, prove -v - t/Koha.t - t/ReportsGuided.t Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Works quite nicely! All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6110375307845778f74d6e5a214d63ab69cc5330) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit f4c72bbc2aa660ba2c72a06fe7c3f9a3ff6ded15 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Tue Feb 19 15:58:53 2013 -0300 Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports A user might create a SQL report that relies on non-existent authorised value categories. Because of a typo, or just because they copy&pasted the report from the Wiki. Use cases are: - The user creates a report from SQL a) Uses bad authorised values b) Clicks 'Save Report' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Save Report' - The user edits an already saved report (Update SQL) a) Uses bad authorised values b) Clicks 'Update SQL' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Update SQL' - The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things. To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'): SELECT * FROM itemtypes WHERE hola=<<Test branch1|branchee>> AND hola2=<<Test branch2|brancha>> Regards To+ Notes: - I added several comments on the code. - Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it). - Added the following methods - C4::Reports::Guided::GetReservedAuthorisedValues - C4::Reports::Guided::GetParametersFromSQL - C4::Reports::Guided::IsAuthorisedValueValid - C4::Reports::Guided::ValidateSQLParameters - C4::Koha::IsAuthorisedValueCategory - Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D. - Fixed some trivial perlcritic -5 errors - Removed some debugging stuff left by mistake - Fixed some POD problems - Optimal SQL-driven IsAuthorisedValueCategory method - Thanks to Owen and Jared for their patience heh. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No koha-qa errors. Test: Tried with examples (from help and test plan) reports, correctly identifies invalid authorized values, and no problem with authorized ones. NOTE: Online help for this does not states that partial values need to be between '%' in a SQLish way. Perhaps this could be addressed inserting % in values or adding a checkbox (partial|exact). Or changing help. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit cdc5e11159c6c3dba8ae371094633feb5e64b57d) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b391e79c2e30b7feaa984c0fd835f97ac88b6221 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 545573d33318a37e5f58f053acc3a5cf09a9260c) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5bff5aa448c921fb67879924a54b3704f5485eb1 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Apr 25 08:49:51 2013 -0400 Bug 10115 - Hiding advanced search in Orders search tab removes plus button The logic of the JavaScript for showing and hiding additional options in the orders search form wasn't quite right, resulting in the +/- control being hidden incorrectly. This patch corrects and simplifies the JS in order to fix the problem. To test: - Open any page in Acquisitions which shows the orders search form in the header search bar (for instance, Acquisitions home). - Open the orders search tab and click on the "+" to show more options. - Click the "-" to hide the additional options. The additional options should now be hidden and the "+" displayed. Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net> Works as expected Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit f8130fb8486a3bb840d37006ddfbf046cb9b161a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 23 +++ C4/Reports/Guided.pm | 127 +++++++++++++--- .../prog/en/includes/acquisitions-search.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 22 +++ .../en/modules/reports/guided_reports_start.tt | 87 +++++++++-- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- reports/guided_reports.pl | 170 ++++++++++++++------ t/Koha.t | 36 ++++- t/db_dependent/ReportsGuided.t | 110 +++++++++++++ 9 files changed, 497 insertions(+), 84 deletions(-) create mode 100755 t/db_dependent/ReportsGuided.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:23:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:23:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-6-g69231a2 Message-ID: <E1UVq6p-0004D5-LJ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 69231a29cedd0b15f403afe71004b40df5ddaa12 (commit) via 642fb2b85b8cdc39e81f7fe19b05608d4b4a4ea2 (commit) via c8c80a8e787ff04cf167dbeae7602a484e22f977 (commit) from f5593842dc99211192955a4e70818de18b6204b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 69231a29cedd0b15f403afe71004b40df5ddaa12 Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:27:12 2013 +1200 Revert "Bug 9812 - Forbid access to several files through the browser" This reverts commit f5593842dc99211192955a4e70818de18b6204b5. Revert at author's request commit 642fb2b85b8cdc39e81f7fe19b05608d4b4a4ea2 Merge: c8c80a8 f559384 Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:26:44 2013 +1200 Merge remote-tracking branch 'origin/3.8.x' into 3.8.x commit c8c80a8e787ff04cf167dbeae7602a484e22f977 Author: Marc Veron <veron at veron.ch> Date: Wed Oct 10 07:49:36 2012 +0200 Bug 8895 - Warning in systempreferences.pl: Use of uninitialized value in length... Clicking on Local use tab in system preferences results in warning in log file: systempreferences.pl: Use of uninitialized value in length at (...)/admin/systempreferences.pl line 456 Reason: content field "value" in table "systempreferences" can be NULL (and is tested for length). Added test for "defined" at to places. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: admin/systempreferences.pl | 2 ++ etc/koha-httpd.conf | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:46:35 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:46:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-7-ged0faee Message-ID: <E1UVqTT-0004Jr-Q3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via ed0faee2e3eb81c32612807ec935d99d06a93814 (commit) from 69231a29cedd0b15f403afe71004b40df5ddaa12 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed0faee2e3eb81c32612807ec935d99d06a93814 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Sat Apr 13 21:31:14 2013 -0300 Bug 10042 - Minor typo ("Communnity") in packages docs VERY trivial string patch. Couldn't help sending it. To+ Signed-off-by: Magnus Enger <magnus at enger.priv.no> Thanks for fixing my typo! I did not test by building packages etc, but by grepping for "Communnity". The patch removes all occurences of the typo. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-common.xml | 2 +- debian/docs/koha-create-dirs.xml | 2 +- debian/docs/koha-create.xml | 2 +- debian/docs/koha-disable.xml | 2 +- debian/docs/koha-dump-defaults.xml | 2 +- debian/docs/koha-dump.xml | 2 +- debian/docs/koha-email-disable.xml | 2 +- debian/docs/koha-email-enable.xml | 2 +- debian/docs/koha-enable.xml | 2 +- debian/docs/koha-foreach.xml | 2 +- debian/docs/koha-list.xml | 2 +- debian/docs/koha-mysql.xml | 2 +- debian/docs/koha-rebuild-zebra.xml | 2 +- debian/docs/koha-remove.xml | 2 +- debian/docs/koha-reset-passwd.xml | 2 +- debian/docs/koha-restart-zebra.xml | 2 +- debian/docs/koha-restore.xml | 2 +- debian/docs/koha-run-backups.xml | 2 +- debian/docs/koha-start-zebra.xml | 2 +- debian/docs/koha-stop-zebra.xml | 2 +- debian/docs/koha-upgrade-schema.xml | 2 +- debian/docs/koha-upgrade-to-3.4.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:46:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:46:49 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-31-g951092b Message-ID: <E1UVqTh-0004Kf-QN@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 951092bc3137c63dcae5dac1facfa7a7eef5b233 (commit) via 77e66cb814c5c203a3b94c303394bf0f37b3a94a (commit) via 2a7fa64bdfacec7411f06b6d35d30154c9f53d2a (commit) from f15bc76f298c66ba68195066e27efb93618072eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 951092bc3137c63dcae5dac1facfa7a7eef5b233 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Sat Apr 13 21:31:14 2013 -0300 Bug 10042 - Minor typo ("Communnity") in packages docs VERY trivial string patch. Couldn't help sending it. To+ Signed-off-by: Magnus Enger <magnus at enger.priv.no> Thanks for fixing my typo! I did not test by building packages etc, but by grepping for "Communnity". The patch removes all occurences of the typo. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 77e66cb814c5c203a3b94c303394bf0f37b3a94a Author: David Cook <dcook at prosentient.com.au> Date: Fri Mar 1 13:22:33 2013 +1100 Bug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists The current problem: When the verify_images() function runs from amazonimages.js, it loops through every img element and selects the elements that come from Amazon sources. However, if the height/width is 1 (i.e. Amazon passes off a blank image) or if the img element's complete property is null or non-existent, then it searches for the parent node and re-writes the HTML with the "No Cover Image Available" (NO_AMAZON_IMAGE) text, even though that parent node might contain other img elements that have images available (from Google, local images, etc)! Proposed fix: Wrap the Amazon image in a span tag (as we do with the Google and local covers), so that it re-writes the HTML within that parent span, rather than the parent anchor which contains all the other images. To test: 1) Turn on the OPACAmazonCoverImages, GoogleJackets, and OPACLocalCoverImages system preferences 2) Replace the ISBN in one of your records with 9780615352435 3) Now load a local cover image for that record 4) Search for that record (but make sure you're vague enough to have multiple search results) 5) For a split second, you may notice the local cover image appears before being replaced by a "No Cover Image Available". Now apply this patch 6) Refresh your search results page 7) You should now see your local cover image, PLUS the "No Cover Image Available" for the Amazon image, and whatever other graphics/"no cover image available" "graphics" for the Google Jackets. To be comprehensive, try the same set of steps using the OPAC Lists rather than the OPAC Search Results Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 2a7fa64bdfacec7411f06b6d35d30154c9f53d2a Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:25:31 2013 +1200 Revert "Bug 9812 - Forbid access to several files through the browser" This reverts commit c0c8a46be7b61539cd920e1cf51791e38c99813b. Reverted at Authors request ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-common.xml | 2 +- debian/docs/koha-create-dirs.xml | 2 +- debian/docs/koha-create.xml | 2 +- debian/docs/koha-disable.xml | 2 +- debian/docs/koha-dump-defaults.xml | 2 +- debian/docs/koha-dump.xml | 2 +- debian/docs/koha-email-disable.xml | 2 +- debian/docs/koha-email-enable.xml | 2 +- debian/docs/koha-enable.xml | 2 +- debian/docs/koha-foreach.xml | 2 +- debian/docs/koha-list.xml | 2 +- debian/docs/koha-mysql.xml | 2 +- debian/docs/koha-rebuild-zebra.xml | 2 +- debian/docs/koha-remove.xml | 2 +- debian/docs/koha-reset-passwd.xml | 2 +- debian/docs/koha-restart-zebra.xml | 2 +- debian/docs/koha-restore.xml | 2 +- debian/docs/koha-run-backups.xml | 2 +- debian/docs/koha-start-zebra.xml | 2 +- debian/docs/koha-stop-zebra.xml | 2 +- debian/docs/koha-upgrade-schema.xml | 2 +- debian/docs/koha-upgrade-to-3.4.xml | 2 +- etc/koha-httpd.conf | 20 -------------------- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 +++--- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 6 +++--- 25 files changed, 28 insertions(+), 48 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:09:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:09:19 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-303-g393b226 Message-ID: <E1UVqpT-0004QQ-Fr@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 393b226aca948e5136f69a2abb65467c61a78323 (commit) from a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 393b226aca948e5136f69a2abb65467c61a78323 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:15:19 2013 -0400 Revert "Merge branch 'bug_9812' into 3.12-master" This reverts commit 761c6213f4d813e7eef00781867521dc1faabead, reversing changes made to c007557f24d6deff086f4c024f4a5c3dc25d721a. Reverted at request of author. ----------------------------------------------------------------------- Summary of changes: etc/koha-httpd.conf | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:11:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:11:57 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10103 created. v3.12.00-beta1-354-gfaa93af Message-ID: <E1UVqs1-0004Sf-AV@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10103 has been created at faa93aff62a5bc381134720177918f09987ea61a (commit) - Log ----------------------------------------------------------------- commit faa93aff62a5bc381134720177918f09987ea61a Author: Mirko Tietgen <mirko at abunchofthings.net> Date: Tue Apr 23 18:05:22 2013 +0200 Bug 10103 UniqueItemFields is missing from sysprefs.sql Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql. Also fixes an unrelated missing semicolon in sysprefs.sql Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:25:02 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:25:02 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10073 created. v3.12.00-beta1-356-gab5c3ec Message-ID: <E1UVr4g-0004X1-L6@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10073 has been created at ab5c3eccf4a7e874f8b654c199caeeae9a98128f (commit) - Log ----------------------------------------------------------------- commit ab5c3eccf4a7e874f8b654c199caeeae9a98128f Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 18 10:03:38 2013 +0200 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT If you do not have ccode or location governed by authorized value (you can release this default connection in the marc structure), these item values are not passed through in the items section, created by buildKohaItemsNamespace for XSLTParse4Display. This simple patch checks if the authorized value hash on ccode or location returns something and passes the original value in otherwise. Test plan: Temporarily disconnect ccode and location from authorized values in MARC structure. Edit an item, put some values in location and ccode. Look at this record via opac search (XSLT enabled). Toggle the value of OPACItemLocation to show ccode or location before call number. Restore authorized values-connection when applicable. Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful to apply these patches when testing this. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> This works as described for the XSLT result list. The text is shown when OpacItemLocation is set to show collection or location. Note: Displaying location and collection without using authorised values doesn't work in other places like the detail page item table. So this will need more work to be fully functional. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9f8a7baa50bcb4ebcf096570d5c76ad15748dba7 Merge: 03b4dfe faa93af Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:17:09 2013 -0400 Merge branch 'bug_10103' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:26:56 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:26:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10040 created. v3.12.00-beta1-358-g0f2945d Message-ID: <E1UVr6W-0004YP-HF@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10040 has been created at 0f2945d768753b92c7014830efc31345d3ce7e87 (commit) - Log ----------------------------------------------------------------- commit 0f2945d768753b92c7014830efc31345d3ce7e87 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 20:59:08 2013 +0200 Bug 10040: Capitalization wrong when deleting subfields from authority Confirmation message for deleting subfields from an authority framework has wrong capitalization. To reproduce: 1) Go to Administration > Authority types 2) Click on MARC structure for one of the authority types 3) Click on the subfields link for one of the fields 4) Delete one of the subfields Signed-off-by: Owen Leonard <oleonard at myacpl.org> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit ff1567000846e41362424e69a6de686261e0f5f0 Merge: 9f8a7ba ab5c3ec Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:31:13 2013 -0400 Merge branch 'bug_10073' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:29:44 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:29:44 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9671 created. v3.12.00-beta1-360-g109f316 Message-ID: <E1UVr9E-0004Zz-MU@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9671 has been created at 109f316efb49287e92f56164f819d2ced03536c1 (commit) - Log ----------------------------------------------------------------- commit 109f316efb49287e92f56164f819d2ced03536c1 Author: Aaron Wells <aaronw at catalyst.net.nz> Date: Mon Mar 25 16:56:24 2013 +1300 Bug 9671: Make fines.pl help text more accurate To test: run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Documentation change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 86f3175a0dc6e22edff3d25ffbc39b561d5d9b70 Merge: ff15670 0f2945d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:33:03 2013 -0400 Merge branch 'bug_10040' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:31:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:31:22 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9886 created. v3.12.00-beta1-362-g4b1c71e Message-ID: <E1UVrAo-0004cN-7n@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9886 has been created at 4b1c71e91a19fcf37e302bba66019807b18cb307 (commit) - Log ----------------------------------------------------------------- commit 4b1c71e91a19fcf37e302bba66019807b18cb307 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Mar 21 13:56:01 2013 +0100 Bug 9886: ParseLetter removes too often punctuation characters from fields This patch makes ParseLetter somewhat more restrictive in removing punctuation characters from the end of a table field. Based on the assumption that we want to remove punctuation from fields in biblio and biblioitems (like ISBD). ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still removes e.g. a colon (:) at the end of a title. Removed an unneeded global and lookahead from the regex. Test plan: 1) Add a colon (:) to the end of a title. 2) Add a colon to the end of item copynumber. 3) Place a hold on that item. Check it in. Confirm hold. 4) Check the email or print notice generated. There should be no colon at the end of the title, but the colon in the copynumber should still be there. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I compared checkout notices with lots of different fields before and after applying the patch. For example the ) at the end of a field in branches is now longer removed. Other fields looked ok before and after. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 12fd63da99b5d217e4537e3f346f1730997ec084 Merge: 86f3175 109f316 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:35:56 2013 -0400 Merge branch 'bug_9671' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:39:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:39:05 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-308-g5e89a7e Message-ID: <E1UVrIH-0004fJ-Pc@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 5e89a7e09866dcb88e45d5e69761f0854b15b775 (commit) via 6089118225d8f7520f960bd30a31057ca159a36b (commit) via cb2fb765efb4009dc13be5b4ca0da997313c3363 (commit) via 86e0a34bb1340806536a50da99a03c79a966bde5 (commit) via 5a086cfed7e43e2ccfaf5a4833e0ede945d26ddf (commit) from 393b226aca948e5136f69a2abb65467c61a78323 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5e89a7e09866dcb88e45d5e69761f0854b15b775 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Mar 21 13:56:01 2013 +0100 Bug 9886: ParseLetter removes too often punctuation characters from fields This patch makes ParseLetter somewhat more restrictive in removing punctuation characters from the end of a table field. Based on the assumption that we want to remove punctuation from fields in biblio and biblioitems (like ISBD). ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still removes e.g. a colon (:) at the end of a title. Removed an unneeded global and lookahead from the regex. Test plan: 1) Add a colon (:) to the end of a title. 2) Add a colon to the end of item copynumber. 3) Place a hold on that item. Check it in. Confirm hold. 4) Check the email or print notice generated. There should be no colon at the end of the title, but the colon in the copynumber should still be there. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I compared checkout notices with lots of different fields before and after applying the patch. For example the ) at the end of a field in branches is now longer removed. Other fields looked ok before and after. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 4b1c71e91a19fcf37e302bba66019807b18cb307) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6089118225d8f7520f960bd30a31057ca159a36b Author: Aaron Wells <aaronw at catalyst.net.nz> Date: Mon Mar 25 16:56:24 2013 +1300 Bug 9671: Make fines.pl help text more accurate To test: run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Documentation change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 109f316efb49287e92f56164f819d2ced03536c1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit cb2fb765efb4009dc13be5b4ca0da997313c3363 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 20:59:08 2013 +0200 Bug 10040: Capitalization wrong when deleting subfields from authority Confirmation message for deleting subfields from an authority framework has wrong capitalization. To reproduce: 1) Go to Administration > Authority types 2) Click on MARC structure for one of the authority types 3) Click on the subfields link for one of the fields 4) Delete one of the subfields Signed-off-by: Owen Leonard <oleonard at myacpl.org> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0f2945d768753b92c7014830efc31345d3ce7e87) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 86e0a34bb1340806536a50da99a03c79a966bde5 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 18 10:03:38 2013 +0200 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT If you do not have ccode or location governed by authorized value (you can release this default connection in the marc structure), these item values are not passed through in the items section, created by buildKohaItemsNamespace for XSLTParse4Display. This simple patch checks if the authorized value hash on ccode or location returns something and passes the original value in otherwise. Test plan: Temporarily disconnect ccode and location from authorized values in MARC structure. Edit an item, put some values in location and ccode. Look at this record via opac search (XSLT enabled). Toggle the value of OPACItemLocation to show ccode or location before call number. Restore authorized values-connection when applicable. Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful to apply these patches when testing this. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> This works as described for the XSLT result list. The text is shown when OpacItemLocation is set to show collection or location. Note: Displaying location and collection without using authorised values doesn't work in other places like the detail page item table. So this will need more work to be fully functional. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit ab5c3eccf4a7e874f8b654c199caeeae9a98128f) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5a086cfed7e43e2ccfaf5a4833e0ede945d26ddf Author: Mirko Tietgen <mirko at abunchofthings.net> Date: Tue Apr 23 18:05:22 2013 +0200 Bug 10103 UniqueItemFields is missing from sysprefs.sql Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql. Also fixes an unrelated missing semicolon in sysprefs.sql Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit faa93aff62a5bc381134720177918f09987ea61a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 6 +++++- C4/XSLT.pm | 4 ++-- installer/data/mysql/sysprefs.sql | 3 ++- .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- misc/cronjobs/fines.pl | 7 +++---- 5 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:39:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:39:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-363-g9fbdc7b Message-ID: <E1UVrII-0004fk-Uy@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9fbdc7b1d6edb9a49d21beccaaa38770119e396f (commit) via 4b1c71e91a19fcf37e302bba66019807b18cb307 (commit) via 12fd63da99b5d217e4537e3f346f1730997ec084 (commit) via 109f316efb49287e92f56164f819d2ced03536c1 (commit) via 86f3175a0dc6e22edff3d25ffbc39b561d5d9b70 (commit) via 0f2945d768753b92c7014830efc31345d3ce7e87 (commit) via ff1567000846e41362424e69a6de686261e0f5f0 (commit) via ab5c3eccf4a7e874f8b654c199caeeae9a98128f (commit) via 9f8a7baa50bcb4ebcf096570d5c76ad15748dba7 (commit) via faa93aff62a5bc381134720177918f09987ea61a (commit) from 03b4dfe846047f233d7de84d8987f6622ee24129 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9fbdc7b1d6edb9a49d21beccaaa38770119e396f Merge: 12fd63d 4b1c71e Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:37:35 2013 -0400 Merge branch 'bug_9886' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 6 +++++- C4/XSLT.pm | 4 ++-- installer/data/mysql/sysprefs.sql | 3 ++- .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- misc/cronjobs/fines.pl | 7 +++---- 5 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 03:27:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 01:27:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-309-g00895ba Message-ID: <E1UVtvE-0006cj-NC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 00895bab836e2698223c1e081868ef0932542d50 (commit) from 5e89a7e09866dcb88e45d5e69761f0854b15b775 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 00895bab836e2698223c1e081868ef0932542d50 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 21:32:49 2013 -0400 Bug 9659 follow-up: correct syntax for older Perl A construction that was a syntax error in older versions of Perl was causing problems for jenkins. This patch fixes it. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/ReportsGuided.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 03:27:29 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 01:27:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-364-g906bf78 Message-ID: <E1UVtvF-0006d5-Pc@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c (commit) from 9fbdc7b1d6edb9a49d21beccaaa38770119e396f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 21:32:49 2013 -0400 Bug 9659 follow-up: correct syntax for older Perl A construction that was a syntax error in older versions of Perl was causing problems for jenkins. This patch fixes it. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/ReportsGuided.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 07:14:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 05:14:45 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-33-g7afc07b Message-ID: <E1UVxTA-0007ZK-Tk@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 7afc07bfaae3b508a043ec426f161bbe0cd87f8d (commit) via c31ebb9a3383432ce460ac8f98e9e9b6e2f902dd (commit) from 951092bc3137c63dcae5dac1facfa7a7eef5b233 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7afc07bfaae3b508a043ec426f161bbe0cd87f8d Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Mar 7 12:17:33 2013 -0500 Bug 6898 - circulation librarians can't run overdues without reports permissions followup Better update database. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit c31ebb9a3383432ce460ac8f98e9e9b6e2f902dd Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Fri Feb 10 10:43:29 2012 -0500 Bug 6898 - circulation librarians can't run overdues without reports permissions This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items report, rather than requiring full reports permissions. Test plan : With a user with permissions circulate_remaining_permissions : - Add overdues_report permission to user - Go to circulation home => you see "Overdues" link - Clik on it => you are allowed to access and use this page - Remove overdues_report permission to user - Go to circulation home => you do not see "Overdues" link - Edit URL : <server>/cgi-bin/koha/circ/overdue.pl => you are not allowed to access this page - Go to main page => you don't have access to reports module Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> ----------------------------------------------------------------------- Summary of changes: circ/overdue.pl | 2 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++ .../prog/en/modules/circ/circulation-home.tt | 2 +- 12 files changed, 29 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:00:20 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:00:20 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-8-g63ff9d8 Message-ID: <E1UVyBI-0007mg-EQ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 63ff9d849db148f35393fee80997da5864141cd6 (commit) from ed0faee2e3eb81c32612807ec935d99d06a93814 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 63ff9d849db148f35393fee80997da5864141cd6 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Feb 14 14:23:30 2013 +0100 Bug 9613: items namespace missing in XSLT In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined. This patch add this namespace where missing. Also corrects a koha.org, instead of koha-community.org, in one namespace URL. Test plan : - Enable XSLT on search results - Perform a search => Look at error logs to check that there is no xsl error like : [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> With comment on Bugzilla. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslimUtils.xsl | 1 + .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:00:34 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:00:34 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-40-g75334ca Message-ID: <E1UVyBW-0007nX-R3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 75334ca55de4f15484cc524ad827d5862aa99ccd (commit) via 4a83dde8bf4b1f5110671c978b6cb4da38104cce (commit) via 49e363a4c571a22eb487082f5f1dbda01321525f (commit) via 74b4355cfda5008578e9b787e8f37171c4b28526 (commit) via 6da83232d242da58a3cee9ce50f11a50611e1f9b (commit) via aee438607062ea89e708644433990094954b0f06 (commit) via c7a722ea068c993c7cb351d77d0f8d0103030062 (commit) from 7afc07bfaae3b508a043ec426f161bbe0cd87f8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75334ca55de4f15484cc524ad827d5862aa99ccd Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Mar 27 13:57:01 2013 -0400 Bug 9839 - when importing MARC records, item record not created even when set to "always add" Test Plan: 1) Catalog a new record with an ISBN 2) Add some items to the record 3) Download the record as MARCXML 4) Delete the itemnumbers from the 952 fields in the record, Change the barcode fields to unused barcodes 5) Use xml2marc to save as a standard MARC file 6) Import the record using the 'Stage MARC for import' tool Use the settings: Record matching rule: ISBN Action if matching record found: ignore Action if no match found: ignore Item processing: always_add Check for embedded item record data?: Yes How to process items: Always add items 7) Import, note the bib is ignored, and the items are not processed 8) Undo import into catalog 8) Apply this patch 9) Import this batch into the catalog 10) Note the items were processed and are now added to the matching record Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Tested with UNIMARC record. I followed the test plan, just changing 952 by 995 Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 4a83dde8bf4b1f5110671c978b6cb4da38104cce Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Feb 14 14:23:30 2013 +0100 Bug 9613: items namespace missing in XSLT In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined. This patch add this namespace where missing. Also corrects a koha.org, instead of koha-community.org, in one namespace URL. Test plan : - Enable XSLT on search results - Perform a search => Look at error logs to check that there is no xsl error like : [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> With comment on Bugzilla. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 49e363a4c571a22eb487082f5f1dbda01321525f Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Apr 8 10:13:11 2013 -0400 Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned The fix for Bug 9397 moved the "cannot check in" heading from within the one conditional where it should have been displayed to the top of all check-in errors/messages. "Cannot check in" is still only valid if the item is withdrawn and BlockReturnOfWithdrawnItems is ON. In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this patch puts "cannot check in" back into the correct conditional and adds a generic heading to check in messages for accessibility purposes. To test, check in items which will trigger a variety of errors including: - item must be returned to home library - item is lost - item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off) - item is overdue ...as well as items which should check in normally. Messages should display correctly. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 74b4355cfda5008578e9b787e8f37171c4b28526 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Apr 17 14:07:55 2013 -0400 Bug 10072 - "my suggestions" always says "There are no pending purchase suggestions." Test Plan: 1) Switch off the IndependantBranches syspref 2) Log into the OPAC 3) Place a suggestions 4) Instead of seeing your suggestion, you will see "There are no pending purchase suggestions." 5) Apply this patch 6) Reload the page 7) You should now see your suggestions Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 6da83232d242da58a3cee9ce50f11a50611e1f9b Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 21:56:53 2013 +0200 Bug 10058 - Fix unapi for NORMARC This patch uses a lot of MARC21 XSLT to transform NORMARC records to desired formats. Since NORMARC is mostly a subset of MARC21, I think this should give passable results. And better results than no unapi-support at all for NORMARC! To reproduce: - Make sure you have marcflavour = NORMARC - Visit /cgi-bin/koha/unapi in a browser - Observe the empty <formats></formats> element To test: - Apply the patch - Visit /cgi-bin/koha/unapi in a browser - Observe the the list of formats in the <formats></formats> element - Import the provided sample NORMARC record and make a note of its biblionumber - View the record at /cgi-bin/koha/unapi?id=koha:biblionumber:x&format=y where x = the biblionumber of the sample record and y = one of the formats marcxml, marcxml-full, mods, mods-full, mods3, mods3-full, oai_dc, rdfdc, rss2, rss2-full and srw_dc - Check that the transformed records make some kind of superficial sense Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit aee438607062ea89e708644433990094954b0f06 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 15:44:45 2013 -0400 Bug 10002 - Don't include line breaks in strings that are translated Several JS alert messages contain "\n" which is problematic for translation. This patch removes those instances (a line break is not strictly necessary anyway). Also corrected: two instances of "holds(s)" To test, place a hold on a title with items. From the biblio detail page choose Edit -> Delete all items and Edit -> Delete record. In each case you should see error messages with no line breaks and no misspellings. Delete all items attached to the record with holds from the item edit page. Go back to the detail page and choose Edit -> Delete record. You should see an error message about existing hold(s) with no line breaks or misspellings. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Harmless change, fixes misspellings and makes translations easier Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit c7a722ea068c993c7cb351d77d0f8d0103030062 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Apr 8 10:26:06 2013 -0400 Bug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip This patch removes the extra i in "sliip." To test, go to Tools -> Notices & Slips and view the help file. The last bulleted item on the page should contain no typo. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Can't resist to sign Bug 10000!! Work as described. No errors. Signed-off-by: Galen Charlton <gmc at esilibrary.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Can't resist to QA - All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 1 + C4/Suggestions.pm | 4 ---- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++- .../prog/en/modules/help/tools/letter.tt | 4 ++-- .../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslimUtils.xsl | 1 + .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 1 + opac/unapi | 13 +++++++++++++ 9 files changed, 25 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:04:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:04:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-42-g61d8236 Message-ID: <E1UVyFD-0007pq-KJ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 61d82360beae443b21ca439b97fe033bb5920173 (commit) via 9e2b58b582531859fbdede3b327c18b5f7db8e6e (commit) from 75334ca55de4f15484cc524ad827d5862aa99ccd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 61d82360beae443b21ca439b97fe033bb5920173 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 19 22:52:07 2013 -0400 Bug 10085: unapi does not function under Plack The following errors appear when trying to use unapi under Plack (among others): Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160. Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173. Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174. Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185. To test: 1) Try to view /cgi-bin/koha/unapi under Plack 2) There is no step 2. Plack crashes. 3) Apply patch. 4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> I'm puzzled how this ever worked anyway, accidentally i'm guessing, this tidies up some lazy coding Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 9e2b58b582531859fbdede3b327c18b5f7db8e6e Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Feb 7 09:57:47 2013 -0500 Bug 9523: importing staged bib records hangs if a matched bib has been deleted Test Plan: 1) Stage a MARC record file that will have matches with existing records 2) Delete the bib from Koha that was matched on 3) Attempt to import the records into Koha, the import will hang 4) Apply the patch 5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed. Signed-off-by: Galen Charlton <gmc at esilibrary.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 1 + opac/unapi | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:09:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:09:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10110 created. v3.12.00-beta1-368-g8084a70 Message-ID: <E1UW30j-0000mq-AY@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10110 has been created at 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 (commit) - Log ----------------------------------------------------------------- commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3d589018e75c71999d308c587f1fcaf63cc81be5 Merge: 906bf78 5b6f897 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:08:15 2013 -0400 Merge branch 'bug_9684' into 3.14-master commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:10:09 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:10:09 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9684 created. v3.12.00-beta1-365-g5b6f897 Message-ID: <E1UW317-0000na-5X@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9684 has been created at 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:15:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:15:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10093 created. v3.12.00-beta1-371-g97596d9 Message-ID: <E1UW36X-0000pi-Ha@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10093 has been created at 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 (commit) - Log ----------------------------------------------------------------- commit 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:25 2013 -0400 Add Stefano Bargioni to the history Welcome, Stefano, you are the 209th developer with a patch in Koha! Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2 Author: Stefano Bargioni <bargioni at pusc.it> Date: Fri Apr 26 11:18:52 2013 +0200 Bug 10093 - Typo in marc21_leader.tt fixed a typo in marc 21 leader builder about the value 'b', Serial component part Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Good catch. Template change only. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit df4b4435970285f2303214e49f390c16e16a01e2 Merge: 3d58901 8084a70 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:15:38 2013 -0400 Merge branch 'bug_10110' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:06:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:06:26 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_2046 created. v3.12.00-beta1-374-ge1ecd7a Message-ID: <E1UW3ta-000174-Nn@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_2046 has been created at e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 (commit) - Log ----------------------------------------------------------------- commit e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:11:39 2013 -0400 Bug 2046: Increment version number Database update for bug 2046 has been given version 3.11.00.203 commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5 Author: Kristina D.C. Hoeppner <kristina at catalyst.net.nz> Date: Fri Mar 29 15:04:42 2013 +1300 Bug 2046 - Suggestions: Title Field too small Increase both on staff and OPAC interface from 80 to 255 characters to be saved in the database. Shown will be 80 characters. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Clean patch, workes as described. To test: - Apply patch and run database update - Check that the column in the database is now varchar(255) - Enter a new suggestion in the OPAC - Edit this suggestion in staff - Confirm form has the new max value set Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit eae18676cc7057c4d521685a3c1ab20912e2cbf1 Merge: df4b443 97596d9 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:50 2013 -0400 Merge branch 'bug_10093' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:17:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:17:22 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10088 created. v3.12.00-beta1-376-gf2e4471 Message-ID: <E1UW44A-0001Ca-4F@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10088 has been created at f2e44716f60578b9663862d7b2ba3b16f7067143 (commit) - Log ----------------------------------------------------------------- commit f2e44716f60578b9663862d7b2ba3b16f7067143 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Apr 25 09:47:53 2013 +0200 Bug 10088: FIX adding an order from a staged file. Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay routine. The existence of $defaulvalue hashref should be tested before getting to the branchcode key. Test plan: Before applying the patch, an error occurred when you try to create an order from a staged file. After applying the patch, the error does not appear anymore. Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5c529f2339a3033c26f20890e18ab2284357c6a1 Merge: eae1867 e1ecd7a Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:12:18 2013 -0400 Merge branch 'bug_2046' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:18:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:18:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-317-ga8ee942 Message-ID: <E1UW44x-0001Dl-AH@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a8ee942442d42e7ae4f42567eba22f33725188a5 (commit) via 59ce0cd4a6863770e1cc6b956512e5698f94e06b (commit) via 8bb6bafbeb827cef15922ce497a7a73ebbfc3a6e (commit) via 2dbe9386065567f0f535188d843dfe12765f5fed (commit) via 239d37cb7e6d34fecd0050eadd5ac771c9ff5bda (commit) via b247b2c5217be18cc4f2fdd96877bac9b6eb9eab (commit) via 79a9b11a7937bab8397ec526114b0c072b253b17 (commit) via c48be8b905efa9ba4e472dbcbcea6ee15a92e075 (commit) from 00895bab836e2698223c1e081868ef0932542d50 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a8ee942442d42e7ae4f42567eba22f33725188a5 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Apr 25 09:47:53 2013 +0200 Bug 10088: FIX adding an order from a staged file. Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay routine. The existence of $defaulvalue hashref should be tested before getting to the branchcode key. Test plan: Before applying the patch, an error occurred when you try to create an order from a staged file. After applying the patch, the error does not appear anymore. Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 59ce0cd4a6863770e1cc6b956512e5698f94e06b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:11:39 2013 -0400 Bug 2046: Increment version number Database update for bug 2046 has been given version 3.11.00.203 (cherry picked from commit e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8bb6bafbeb827cef15922ce497a7a73ebbfc3a6e Author: Kristina D.C. Hoeppner <kristina at catalyst.net.nz> Date: Fri Mar 29 15:04:42 2013 +1300 Bug 2046 - Suggestions: Title Field too small Increase both on staff and OPAC interface from 80 to 255 characters to be saved in the database. Shown will be 80 characters. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Clean patch, workes as described. To test: - Apply patch and run database update - Check that the column in the database is now varchar(255) - Enter a new suggestion in the OPAC - Edit this suggestion in staff - Confirm form has the new max value set Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 2dbe9386065567f0f535188d843dfe12765f5fed Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:25 2013 -0400 Add Stefano Bargioni to the history Welcome, Stefano, you are the 209th developer with a patch in Koha! Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 97596d94982ce8c7ea4f2e8a29f724cb97cc1613) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 239d37cb7e6d34fecd0050eadd5ac771c9ff5bda Author: Stefano Bargioni <bargioni at pusc.it> Date: Fri Apr 26 11:18:52 2013 +0200 Bug 10093 - Typo in marc21_leader.tt fixed a typo in marc 21 leader builder about the value 'b', Serial component part Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Good catch. Template change only. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b247b2c5217be18cc4f2fdd96877bac9b6eb9eab Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 79a9b11a7937bab8397ec526114b0c072b253b17 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c48be8b905efa9ba4e472dbcbcea6ee15a92e075 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ C4/Items.pm | 6 +++++- catalogue/showmarc.pl | 7 +++++-- docs/history.txt | 1 + installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../cataloguing/value_builder/marc21_leader.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +- kohaversion.pl | 2 +- reports/guided_reports.pl | 15 ++++++++++----- 11 files changed, 36 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:18:12 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:18:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-377-g9c79f18 Message-ID: <E1UW44y-0001EF-Gl@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9c79f183174d710f37b414c8dfa0b94ea2b8036a (commit) via f2e44716f60578b9663862d7b2ba3b16f7067143 (commit) via 5c529f2339a3033c26f20890e18ab2284357c6a1 (commit) via e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 (commit) via 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5 (commit) via eae18676cc7057c4d521685a3c1ab20912e2cbf1 (commit) via 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 (commit) via 9a449ce16ce00d667ff12ec262dc02e973a21cc2 (commit) via df4b4435970285f2303214e49f390c16e16a01e2 (commit) via 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 (commit) via d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9 (commit) via 3d589018e75c71999d308c587f1fcaf63cc81be5 (commit) via 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 (commit) from 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c79f183174d710f37b414c8dfa0b94ea2b8036a Merge: 5c529f2 f2e4471 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:23:34 2013 -0400 Merge branch 'bug_10088' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ C4/Items.pm | 6 +++++- catalogue/showmarc.pl | 7 +++++-- docs/history.txt | 1 + installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../cataloguing/value_builder/marc21_leader.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +- kohaversion.pl | 2 +- reports/guided_reports.pl | 15 ++++++++++----- 11 files changed, 36 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:27:42 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:27:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-10-g5ad048b Message-ID: <E1UWCek-00040E-A8@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 5ad048bb78b560ca821f4531e62c545d76999855 (commit) via b7cdee156e47617ff79849321b178f66ec7058e6 (commit) from 63ff9d849db148f35393fee80997da5864141cd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ad048bb78b560ca821f4531e62c545d76999855 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit b7cdee156e47617ff79849321b178f66ec7058e6 Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:28:04 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:28:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-48-g31a6b22 Message-ID: <E1UWCf6-000412-N4@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 31a6b2265315a9ac376887a64c6f532b94a28cce (commit) via a43c5d0bdd2413d6a125b10710deab6e38026404 (commit) via 042012cfe2d87cea0b569dad37dba6f12c1107d7 (commit) via 958e7626f16d46c9e1e8c81e8c9614364966deec (commit) via 575f8ed4425a7de45765ef10866569ff52645e6b (commit) via 652f01bdb32e2bff665add37c6d4863c679ec96a (commit) from 61d82360beae443b21ca439b97fe033bb5920173 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31a6b2265315a9ac376887a64c6f532b94a28cce Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit a43c5d0bdd2413d6a125b10710deab6e38026404 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 042012cfe2d87cea0b569dad37dba6f12c1107d7 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 958e7626f16d46c9e1e8c81e8c9614364966deec Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 575f8ed4425a7de45765ef10866569ff52645e6b Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 10 14:24:16 2013 -0400 Bug 10026 - OPAC cart not showing location anymore When Bug 7570 added availability information to the cart it switched which subroutine was used to get item information, and thus changed how the information was being returned. This patch makes accommodations for this change by adding processing of item location information to the script in a way that will match the existing template variables. To test, add items to the cart in the OPAC some of which include shelving location information. When you view the cart you should see the shelving location displayed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 652f01bdb32e2bff665add37c6d4863c679ec96a Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 19:29:13 2013 +0200 Bug 8294: Fix display of serial enumeration for OPAC holds It turns out that this was not a missing but a broken feature. This patch corrects the template variables to make enumchron show up on the item table for item level holds in the OPAC. To test: Try to place item level holds on 1) a record where at least one item 2) a record where none of the items has items.enumchron information. The column with enumchron should only show for 1), but not for 2). Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 4 +- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- opac/opac-basket.pl | 4 + 6 files changed, 454 insertions(+), 145 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:53:47 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:53:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-51-g70f32c0 Message-ID: <E1UWD3z-0004DV-PT@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 70f32c0d3f0883167359242a9d54492e612f3f49 (commit) via 0159cab8767bec0f48d5a43dc11da9ef22315203 (commit) via f06fff86051e9ab15048382185e6379cb17d0396 (commit) from 31a6b2265315a9ac376887a64c6f532b94a28cce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70f32c0d3f0883167359242a9d54492e612f3f49 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 0159cab8767bec0f48d5a43dc11da9ef22315203 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit f06fff86051e9ab15048382185e6379cb17d0396 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ catalogue/showmarc.pl | 7 +++++-- reports/guided_reports.pl | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 30 00:12:03 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 29 Apr 2013 22:12:03 +0000 Subject: [koha-commits] main Koha release repository branch new/bug6554_reverts created. v3.12.00-beta1-390-g16753c7 Message-ID: <E1UWwIl-0001Is-AY@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug6554_reverts has been created at 16753c750d97385ad243329aa6a1328352749bb1 (commit) - Log ----------------------------------------------------------------- commit 16753c750d97385ad243329aa6a1328352749bb1 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:39 2013 -0700 Revert "Bug 6554 Followup for circulation patron search" This reverts commit f257944d10c2660e7d7297768af314985c80a1c7. Rolling back bug 6554 work until we have more comprehensive tests. commit 5e47f766a2b5fc85e766e1fc67b054e971185de7 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:31 2013 -0700 Revert "Bug 6554: Followup for preferences.pl" This reverts commit c78b905811ed4869a4a69f60272e1b7787026f6e. Rolling back bug 6554 work until we have more comprehensive tests. commit 7459297a3a4500cf0115962a81366a42a398be8f Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:24 2013 -0700 Revert "Bug 6554: Followup for acquisitions" This reverts commit b2b003adea685acf3f590ed00baf7abec734341f. Rolling back bug 6554 work until we have more comprehensive tests. commit 7c6e4f5a8d6e101377f949e1967bce8ae017ea4e Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:18 2013 -0700 Revert "Bug 6554: Followup for serial search" This reverts commit c18cd930eb3d15e20c642b2788116cc2abb30538. Rolling back bug 6554 work until we have more comprehensive tests. commit 94508a5c3d712f03d25ef63c40830b0c147140c5 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:06 2013 -0700 Revert "Bug 6554 QA Followup" This reverts commit 686fdae32c2377b8748f71c534b5f32a2a83e850. Rolling back bug 6554 work until we have more comprehensive tests. commit a7eb34f2c8a281ef83f711e581079a2232296c88 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:12:32 2013 -0700 Revert "Bug 6554 - make Koha internally utf-8 clean" This reverts commit d542740ab8877234d043c8a11cb19a6004e72656. Rolling back bug 6554 work until we have more comprehensive tests. Conflicts: opac/opac-search.pl commit 4ba31d2e2802183d8b1d1de466e9219107c7f061 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:10:45 2013 -0700 Revert "Bug 6554 Fix error caused by modifying $_ in a map" This reverts commit e98fe7e32244fa11d218b4d2a1006eea547e70d8. Rolling back bug 6554 work until we have more comprehensive tests. commit 3536b10acf223b33819153532841494c816d6375 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:10:23 2013 -0700 Revert "Bug 10074 - Encoding problems at login time" This reverts commit 5805b5f363bd657d3dac6aeba225438bf80cae9b. Rolling back bug 6554 work until we have more comprehensive tests. commit abe349ed6cc0b2296634b66d71de703fcd99a5a4 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:09:48 2013 -0700 Revert "Bug 10074 - Encoding problems for installer" This reverts commit d0c6e09429d2af711f911b57601a02f17591d441. Rolling back bug 6554 work until we have more comprehensive tests. commit ad5e44bcde5948f73effb0732f79f8ceec2abf99 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:06:12 2013 -0700 Revert "Bug 10074: QA Followup for InstallAuth.pm" This reverts commit e848d89e45d3e6610c3e9d246bd3672636dd63fb. Rolling back bug 6554 work until we have more comprehensive tests. commit 327b6c6ce31942963efcc03d5aea2981250360f2 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:05:22 2013 -0700 Revert "Bug 10019: Fix for userid containing UTF8 chars" This reverts commit 7e90e1524f7e586dac0f98241ace430e5cbeac7f. Rolling back bug 6554 work until we have more comprehensive tests. commit 11b62318f445ca514d8c55d8c2973b45bdaa6295 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:04:38 2013 -0700 Revert "Bug 9951: Followup for Tools" This reverts commit 252568aa8babdcc9508d3b3c7626543bfa648d99. Rolling back bug 6554 work until we have more comprehensive tests. commit 5948badf43bd30e5a6c52f30f440f400bcdbb51c Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:03:45 2013 -0700 Revert "Bug 9951: Followup for tools/viewlog.pl" This reverts commit de7ba790fd2533bcf44ad7fd2f1255514ed9313c. Rolling back bug 6554 work until we have more comprehensive tests. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository

which carries the background gradient CSS. This patch adds the missing markup to the checkin search header include file and 6 others. To test, view the following pages and confirm that the normal gradient background appears behind the header search form: - Checkin - Contracts administration - Currencies administration - Notices and slips - Printers administration (admin/printers.pl) - Stop words administration (admin/stopwords.pl) - Adding an order to a basket from a suggestions (Acquisitions -> Basket -> Add order to basket -> From a suggestions). Signed-off-by: Nicole C. Engard Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack commit 4b9a3061195a05dc9a31ba17b8b0bbfb350b497e Author: Kyle M Hall Date: Tue Feb 5 08:51:21 2013 -0500 Bug 5790 - Prevent deletion of records with holds - QA Followup Signed-off-by: Liz Rea fixes qa concerns, feature still works Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack commit 2e757c4b78d75f02881a654b9f40a73aba2ce368 Author: Kyle M Hall Date: Wed Jan 30 11:36:38 2013 -0500 Bug 5790 - Prevent deletion of records with holds Test Plan: 1) Apply patch 2) Create a record 3) Create an item for the record 3) Place a hold on the bib 4) Attempt to 'Delete all items', you should recieve an error message stating to delete all holds before deleting all items. Also, it is possible to get into a situation where a record has holds but no items. In this situation, it is not possible to view/delete the holds without adding an item back to the record. In this case, attempting to delete the bib causes a warning, but does not prevent deletion. Signed-off-by: Liz Rea Passes tests - do note that it was a design decision to leave the delete links clickable even though they are grey. The reasoning is that librarians will want to be able to know *why* they cannot delete a given item or bib - I like this. Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack commit 5cadea611423181099506938e9f206743766a88d Author: Fridolyn SOMERS Date: Tue Jan 15 09:24:25 2013 +0100 Bug 9392: confirmation does not appear for negative notforloan items issues When checking-out an item marked "not for loan" with a positive value, you get a message to forbid or confirm issue (depending on AllowNotForLoanOverride syspref). For an item with a negative value (usually during acquisition process), the issue is made without forbid or confirm message. This patch simply changes the test notforloan > 0 into notforloan != 0. Test plan : - Checkout an item with items.notforloan = 0 => The item is issued without message - Checkout an item with items.notforloan > 0 => A message forbids or asks confirmation to override - Checkout an item with items.notforloan < 0 (e.g., on order) => A message forbids or asks confirmation to override Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer Checked with AllowNotForLoanOverride on and off. All tests and QA script pass. Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 5 +- catalogue/ISBDdetail.pl | 4 + catalogue/MARCdetail.pl | 3 + catalogue/detail.pl | 7 +- catalogue/imageviewer.pl | 3 + catalogue/labeledMARCdetail.pl | 3 + catalogue/moredetail.pl | 5 ++ .../intranet-tmpl/prog/en/css/staff-global.css | 3 + .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 60 +++++++++++--------- .../prog/en/includes/checkin-search.inc | 4 +- .../prog/en/includes/contracts-admin-search.inc | 3 +- .../prog/en/includes/currencies-admin-search.inc | 3 +- .../prog/en/includes/letters-search.inc | 3 +- .../prog/en/includes/printers-admin-search.inc | 3 +- .../prog/en/includes/stopwords-admin-search.inc | 3 +- .../prog/en/includes/suggestions-add-search.inc | 3 +- .../prog/en/modules/patroncards/manage.tt | 2 +- 17 files changed, 75 insertions(+), 42 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 11:09:03 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 09:09:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-11-gc1ae7e3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via c1ae7e3765ffb226bb9f5b058a32568b9672edd6 (commit) via ba6dc6c200bb880f4a4634596283b8ed2f0c4d5c (commit) from c06d15c9f2020a2821a76a4c1bdf462f0f1b3390 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1ae7e3765ffb226bb9f5b058a32568b9672edd6 Author: Julian Maurice Date: Wed Nov 7 10:51:49 2012 +0100 Bug 9019: Return item fields in ILS-DI GetRecords Signed-off-by: Srikanth Dhondi Signed-off-by: Katrin Fischer 1) Activate ILS-DI in system preferencs 2) Access http://.../cgi-bin/koha/ilsdi.pl to see documentation 3) Try http://.../cgi-bin/koha/ilsdi.pl?service=GetRecords&id=12+14 with various valid biblionumbers for your system 4) Verify 952 is included in the and all other data displays correctly All tests pass. Signed-off-by: Chris Cormack commit ba6dc6c200bb880f4a4634596283b8ed2f0c4d5c Author: Robin Sheat Date: Fri Mar 8 14:29:39 2013 +1300 Bug 9035 - delete bulkauthimport.pl Then bulkauthimport.pl? bulkauthimport should not be used ever. it probably should be deleted It should be. Signed-off-by: David Cook I've poked around in bulkmarcimport.pl and it certainly seems to have the functionality that Mason (and Jared and Robin) mention. Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 6 ++ misc/migration_tools/bulkauthimport.pl | 154 -------------------------------- 2 files changed, 6 insertions(+), 154 deletions(-) delete mode 100755 misc/migration_tools/bulkauthimport.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 11:09:13 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 09:09:13 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-1-g2f2ec10 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 2f2ec10b467d705c3333e02d61215e6d937e4305 (commit) from d38d7696821b4c6642e53ddf896d4ac5f1525075 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2f2ec10b467d705c3333e02d61215e6d937e4305 Author: Julian Maurice Date: Wed Nov 7 10:51:49 2012 +0100 Bug 9019: Return item fields in ILS-DI GetRecords Signed-off-by: Srikanth Dhondi Signed-off-by: Katrin Fischer 1) Activate ILS-DI in system preferencs 2) Access http://.../cgi-bin/koha/ilsdi.pl to see documentation 3) Try http://.../cgi-bin/koha/ilsdi.pl?service=GetRecords&id=12+14 with various valid biblionumbers for your system 4) Verify 952 is included in the and all other data displays correctly All tests pass. Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 11:15:18 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 09:15:18 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-12-g6002812 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 6002812a220115d9b5b7b083ec931d9098f7af11 (commit) from c1ae7e3765ffb226bb9f5b058a32568b9672edd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6002812a220115d9b5b7b083ec931d9098f7af11 Author: Magnus Enger Date: Thu Jan 24 23:17:45 2013 +0100 Bug 9213 - Implement analytics for NORMARC XSLT Problem: Links between anaytics records were not being displayed for NORMARC setups. What this patch does: 1. Add indexing for 773 subfield a, w and 9; both for GRS-1 and DOM indexing (The DOM indexing config was generated from the GRS-1 record.abs) 2. Add "analytics links" to NORMARC XSLT files, both for OPAC and intranet To test: - Make sure you have a NORMARC installation - Set UseControlNumber = Use - Create a parent record with LDR/07=c. Leave 001 empty. - In the "Normal" view, do New > New child record and create another record. Do this twice (so you get a list of hits when you click on the "Show anaytics" links later on). - Do the following steps both in the OPAC and the Intranet: - Search for the parent record in such a way that you can see the record in a *result list* - Check that the "Show analytics" link is displayed, and uses the title of the parent record for linking: ?q=Host-item: - Clik on the "Show analytics" link and check that you get a result list with the two child records you created earlier - Go back to the result list and click on the parent record, so you get the *detail view* - Check that the "Show analytics" link is displayed, and uses the title of the parent record for linking: ?q=Host-item:<Title of parent record> - Clik on the "Show analytics" link and check that you get a result list with the two child records you created earlier - Search for one or both of the child records in such a way that you can see the record(s) in a *result list* - Check that the "In: <Title of parent record>" link is displayed, and that it uses the biblionumber of the parent record for linking: ?q=Control-number:<biblionumber of parent record> - Click on the "In: <Title of parent record>" link, and check that the parent record is displayed - Go back to the result list and click on the child record, so you get the *detail view* - Check that the "In: <Title of parent record>" link is displayed, and that it uses the biblionumber of the parent record for linking: ?q=Control-number:<biblionumber of parent record> - Click on the "In: <Title of parent record>" link, and check that the parent record is displayed - Now edit the parent record and put it's biblionumber in 001. Repeat the steps above, and check that everything still works, but that the links are different: - The "Show analytics" link on the parent record should look like this: ?q=rcn:<biblionumber of parent record>+and+(bib-level:a+or+bib-level:b) - The "In: <Title of parent record>" link on the child records should be the same as it was earlier - Now set UseControlNumber = "Don't use" and repeat all of the steps above - All of the links should still be displayed and work, of course - The "In: <Title of parent record>" link on the child records should look like this: ?q=ti,phr:<Title of parent record> - The "Show analytics" link on the parent record should look like this: ?q=Host-item:<Title of parent record> - Change LDR/07 to "s" and repeat all of the steps above - Do all of this both for GRS-1 indexing and for DOM indexing... Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: .../normarc/biblios/biblio-zebra-indexdefs.xml | 132 +++++++++++--------- .../normarc/biblios/biblio-zebra-indexdefs.xsl | 21 +++ etc/zebradb/marc_defs/normarc/biblios/record.abs | 3 + .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 66 ++++++++++ .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 68 ++++++++++- .../prog/en/xslt/NORMARCslimUtils.xsl | 19 +++ .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 66 ++++++++++ .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 67 ++++++++++ .../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 19 +++ 9 files changed, 400 insertions(+), 61 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 12:14:32 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 10:14:32 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-18-g43e6791 Message-ID: <E1UUwie-0001TN-0r@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 43e679156a5250e79de0accca960e4836aa55385 (commit) via 24f42ba74ce0fe24b267ab9f6d8bd8064897b172 (commit) via ebd666c4d2ee07dd60c11513e1bcc1441c01c177 (commit) via 6655d6e2d02df18fe29ece1865929684fa276265 (commit) via 8146604253622783a26093e1decc57cf14828a36 (commit) via 26038d897ebdda32f2bdf2435f82d15efb70c0c7 (commit) from 6002812a220115d9b5b7b083ec931d9098f7af11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 43e679156a5250e79de0accca960e4836aa55385 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Wed Feb 27 15:37:39 2013 +0100 Bug 9720 : uninitialized value warnings in circulation (followup 1) This patch corrects several uninitialized value errors. Test plan: - Edit a borrower - Enter a surname using lowercase (it will be displayed uppercase by CSS) and save => Borrower surname is uppercase - Edit an organisation (depends on borrower category) - Enter a surname using lowercase (it will be displayed uppercase by CSS) and save => Borrower surname is uppercase - Go to a borrower page who has today issues - Click on More/Export today's checked in barcodes => You get a file to dowload Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 24f42ba74ce0fe24b267ab9f6d8bd8064897b172 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Wed Feb 27 15:02:49 2013 +0100 Bug 9720 : uninitialized value warnings in circulation This patch corrects several uninitialized value errors. Test plan: - Go to check out page - Check that issues and old issues are in different tables - Check that author is diplayed if exists - Check that patron address is displayed if exists - Perform a checkout Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> commit ebd666c4d2ee07dd60c11513e1bcc1441c01c177 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Mar 7 11:54:57 2013 +0100 Bug 9759: last subfield can be deleted In authorities and biblios editors, a repeatable subfield can be deleted (small icon next to input). Clone subfields are really deleted but last existing subfield is just set empty instead of deleted. But when same field is repeated, the last subfield can be deleted. This patch corrects this, last subfield of a field, even repeated, can not be deleted. Test plan : - Edit a biblio - Choose a repeatable field with a repeatable subfield : ie 600 and $x - Edit 600, enter a text in $x : ie "subA" - Clone $x - Delete second $x => second $x is deleted - Delete first $x => $x is not deleted but set empty - Edit 600, enter a text in $x : ie "subA" - Clone 600 - Edit second 600, enter a text in $x : ie "subB" - Clone $x of second 600 - Delete second $x of second 600 => second $x of second 600 is deleted - Delete first $x of second 600 => with this patch : first $x of second 600 is set empty => without this patch : first $x of second 600 is deleted, second 600 has no $x anymore Perform same test plan on an authority. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 6655d6e2d02df18fe29ece1865929684fa276265 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Mar 21 16:05:27 2013 +0100 Bug 7241, follow-up: viewlog link for circulation Fixes a few things about the CIRC link in viewlogs: - "itemnumber=" instead of "item=" - anchor #item was filled with the wrong field - tooltip now indicates "item" instead of "biblio" Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 8146604253622783a26093e1decc57cf14828a36 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Mar 21 14:30:46 2013 +0100 Bug 7241 follow-up: DB changes Reset timestamp modification on update after patch application. Give more information about the log history fix. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 26038d897ebdda32f2bdf2435f82d15efb70c0c7 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Tue Jan 22 14:46:38 2013 +0100 Bug 7241: circulation action logs record biblionumber instead of item number Issue log and and circulation logs are incorrectly recording biblionumber instead of item number, creating incorrect logs. This patch corrects this, and modifies the action_logs table in two ways: - the timestamp is not updated anymore with UPDATES (but still automatically filled when INSERTing) - to partially correct the broken logs, the log history is filled with the first found item for each biblio Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 4 ++-- circ/circulation.pl | 20 ++++++++++++-------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- members/memberentry.pl | 4 ++-- members/readingrec.pl | 3 ++- 7 files changed, 30 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 14:51:59 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 12:51:59 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10023 created. v3.12.00-beta1-299-g2cc3334 Message-ID: <E1UUzB1-0002Gg-HB@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10023 has been created at 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd (commit) - Log ----------------------------------------------------------------- commit 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:48:30 2013 -0400 Bug 10023 follow-up: Remove the last occurrences of N[degree sign] commit 7d3d347774cf44c02ca133798ead8c99849699ed Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:29:40 2013 +0200 Bug 10023: Change degree notation for number to No. This patch changes N<little circle> to No. in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled No. 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Signed-off-by: Owen Leonard <oleonard at myacpl.org> I prefer "No." over "#" and my survey of the templates shows that "No." appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3b45b745cf5a2a0392b9817e60de8461037feb6a Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:57:03 2013 +0200 Bug 10023: Change degree notation for number to # This patch changes N<little circle> to # in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled # 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:05:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:05:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9903 created. v3.12.00-beta1-302-ga8eb99b Message-ID: <E1UUzOH-0002KW-Ou@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9903 has been created at a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 (commit) - Log ----------------------------------------------------------------- commit a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 24 10:31:19 2013 +0200 Bug 9903: Followup: use the KohaDates T::T plugin to display dates. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 0c76032738ffd4c18e5a90e68a27b46c9d82a37a Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 08:55:45 2013 -0400 Bug 9903 - Sort by date broken on patron detail page When the patron detail page switched to DataTables no accommodation was made for metric date formats in sorting. This patch adds sorting based on data in a span's title attribute, and thus requires that the patch for Bug 9887 be applied. To test, view the detail page for a patron who has assorted checkouts, relatives' checkouts, and holds. Sorting of date columns should be correct with the dateformat preference set to any value. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Nice improvement. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c396d731ec72c8b68228ff4f9c648c17cf20c773 Merge: 06b8876 2cc3334 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:57:42 2013 -0400 Merge branch 'bug_10023' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:10:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:10:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9804 created. v3.12.00-beta1-304-g6e4851f Message-ID: <E1UUzSh-0002Ly-4Y@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9804 has been created at 6e4851fa406eb7b5c831c158faa5f83caf723c2a (commit) - Log ----------------------------------------------------------------- commit 6e4851fa406eb7b5c831c158faa5f83caf723c2a Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 54abf192f882f92601f23fe8696368509faab641 Merge: c396d73 a8eb99b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 09:11:22 2013 -0400 Merge branch 'bug_9903' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:29:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:29:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-305-gf5709c0 Message-ID: <E1UUzld-0002TJ-98@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via f5709c00988bfd8c401d07d52b5925c105a61072 (commit) via 6e4851fa406eb7b5c831c158faa5f83caf723c2a (commit) via 54abf192f882f92601f23fe8696368509faab641 (commit) via a8eb99b8ff9aa01479e26665ba8edd1f00c39a53 (commit) via 0c76032738ffd4c18e5a90e68a27b46c9d82a37a (commit) via c396d731ec72c8b68228ff4f9c648c17cf20c773 (commit) via 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd (commit) via 7d3d347774cf44c02ca133798ead8c99849699ed (commit) via 3b45b745cf5a2a0392b9817e60de8461037feb6a (commit) from 06b887630b8ebca124e88579fe6c0a586daaad47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f5709c00988bfd8c401d07d52b5925c105a61072 Merge: 54abf19 6e4851f Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 09:16:20 2013 -0400 Merge branch 'bug_9804' into 3.14-master ----------------------------------------------------------------------- Summary of changes: acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 6 +++--- ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/members/moremember.tt | 20 +++++++++++++------- members/moremember.pl | 4 +--- 6 files changed, 19 insertions(+), 15 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 15:29:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 13:29:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-260-g11f8ba9 Message-ID: <E1UUzlc-0002Sp-18@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 11f8ba92b2f87581a980e18033353ec98b45c0cf (commit) via 5a5200562a8a0b39b95f254d8a5467a9a5629cd8 (commit) via 005ff0e54353c28aba4ce60eeb5c43ba2a8edeab (commit) via e03e3a15068243f8fb490f72b68841e068dd5a8d (commit) via 3726ce6c6208f89cd70e59e01e081fba59744605 (commit) via 66fcf69032e9a01aa18fbbc2f86bcc973d4afda3 (commit) from 1de8e7cb1e978e7c72bd6de81be996514755bd0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 11f8ba92b2f87581a980e18033353ec98b45c0cf Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6e4851fa406eb7b5c831c158faa5f83caf723c2a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5a5200562a8a0b39b95f254d8a5467a9a5629cd8 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 24 10:31:19 2013 +0200 Bug 9903: Followup: use the KohaDates T::T plugin to display dates. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit a8eb99b8ff9aa01479e26665ba8edd1f00c39a53) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 005ff0e54353c28aba4ce60eeb5c43ba2a8edeab Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 08:55:45 2013 -0400 Bug 9903 - Sort by date broken on patron detail page When the patron detail page switched to DataTables no accommodation was made for metric date formats in sorting. This patch adds sorting based on data in a span's title attribute, and thus requires that the patch for Bug 9887 be applied. To test, view the detail page for a patron who has assorted checkouts, relatives' checkouts, and holds. Sorting of date columns should be correct with the dateformat preference set to any value. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Nice improvement. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0c76032738ffd4c18e5a90e68a27b46c9d82a37a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit e03e3a15068243f8fb490f72b68841e068dd5a8d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Wed Apr 24 08:48:30 2013 -0400 Bug 10023 follow-up: Remove the last occurrences of N[degree sign] (cherry picked from commit 2cc3334a5c2d09a5efd5480b0eb0577e6b7a88cd) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3726ce6c6208f89cd70e59e01e081fba59744605 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:29:40 2013 +0200 Bug 10023: Change degree notation for number to No. This patch changes N<little circle> to No. in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled No. 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Signed-off-by: Owen Leonard <oleonard at myacpl.org> I prefer "No." over "#" and my survey of the templates shows that "No." appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 7d3d347774cf44c02ca133798ead8c99849699ed) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 66fcf69032e9a01aa18fbbc2f86bcc973d4afda3 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 16:57:03 2013 +0200 Bug 10023: Change degree notation for number to # This patch changes N<little circle> to # in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled # 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 3b45b745cf5a2a0392b9817e60de8461037feb6a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 6 +++--- ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/members/moremember.tt | 20 +++++++++++++------- members/moremember.pl | 4 +--- 6 files changed, 19 insertions(+), 15 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 24 23:20:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 21:20:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-20-g074a71e Message-ID: <E1UV776-0004mg-K4@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 074a71e61c51fa65e9d9ffb75035c815e940d168 (commit) via 7b28feafacd46b496be7aed67f2f63bac7966e91 (commit) from 43e679156a5250e79de0accca960e4836aa55385 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 074a71e61c51fa65e9d9ffb75035c815e940d168 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Sep 13 10:20:56 2012 +0200 Bug 8508: Followup: Simplify the separateData js function I think this patch does the same job as previously. + It replaces tabulation characters with 4 spaces Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 7b28feafacd46b496be7aed67f2f63bac7966e91 Author: David Cook <dcook at prosentient.com.au> Date: Tue Sep 11 07:18:54 2012 +1000 Bug 8508 - Holds to Pull : Library dropdown options are erroneously concatenated by br tags This patch introduces a new javascript function that breaks apart option strings that are erroneously concatenated by br tags. The split strings are then checked against non-concatenated option strings, and pushed into the option array if there is no duplication. This function is nestled into the JQuery datatable function for populating the drop-down menu. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/circ/pendingreserves.tt | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 00:06:14 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 22:06:14 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-24-gdb7011c Message-ID: <E1UV7pO-0004yU-Bs@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via db7011c58c88e32c9cda3a1ae1a5adf315f261f1 (commit) via 449a0cb1d00d3a448c2853565d860c090a0e44ff (commit) via d892aa49d14b794b9336c4d6076fe9d048c6b437 (commit) via 2ab1400702b3602106e1291cc95b22a2d8e09710 (commit) from 074a71e61c51fa65e9d9ffb75035c815e940d168 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit db7011c58c88e32c9cda3a1ae1a5adf315f261f1 Author: Liz Rea <liz at catalyst.net.nz> Date: Wed Mar 27 16:14:43 2013 +1300 bug 4862 - Change label of Browse by subject or author to Authority search Replicate: Load the OPAC You should see "Browse by Subject or Author right below the search box To test: Apply patch Load the OPAC You should see "Authority search" where "Browse by Subject or Author" was . Signed-off-by: Mason James <mtj at kohaaloha.com> Amended patch: change strings in opac-authorities-home.tt Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 449a0cb1d00d3a448c2853565d860c090a0e44ff Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Fri Mar 22 09:52:18 2013 +0100 Bug 9479: FIX conflict with Bug 9014 3rd parameters of output_pref is already used Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> All tests and QA script pass. Checked sorting and display on notices page with various settings for dateformat and TimeFormat system preferences. Also checked other pages for correct display: - List of checkouts in patron account - Order search result list - Basket list in vendor search - Staff detail page Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit d892aa49d14b794b9336c4d6076fe9d048c6b437 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Jan 24 11:50:08 2013 +0100 Bug 9479: The member notices page doesn't display dates in the syspref format In order to let the KohaDates plugin display a datetime, this patch modify this plugin. Now it uses Koha::DateUtils instead of C4::Dates. Test plan: - check that the date format on the member notices page (members/notices.pl) is displayed according your syspref dateformat. - check that existing dates are always in the good format (without the hours) e.g. acqui/histsearch.pl, acqui/basket.pl, etc. - Modify your syspref and recheck the previous pages Signed-off-by: Owen Leonard <oleonard at myacpl.org> This is a nice addition, and works according to the test plan. A nice follow-up would be to create a system pref for formatting times (12/24hr). Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Fixed a tab in notices.tt to make QA script happy. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 2ab1400702b3602106e1291cc95b22a2d8e09710 Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Jan 24 17:11:31 2013 +0100 Bug 9484: userid not generated consistently (different editing pages) When modifying a patron through different pages, the userid generation does not behave always the same way; this patch corrects this: - when firstname and surname are present in the form, they are used for the generation; - if there are not in the form, the firstname and surname in database are used instead. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No errors. Test This patch lacks a test plan, so I do the following 1) New user, empty userid, autocompleted 2) Edit user, change userid, saved correctly 3) Edit user, main edit window, emptied userid, autocompleted 4) Edit user, Detail > Library use, emptied userid, not autocomplete (not even a dot) 5) Applied patch 6) Repeated 1-3, same behavior 7) Repeated 4), now autocompletes with same userid as 3) So, works as described. No koha-qa errors. NOTE: It's impossible now to delete userid from interface. Off-topic: tried an userid in Arabic, works very well. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/KohaDates.pm | 23 ++++++++++++------- .../prog/en/modules/members/notices.tt | 3 +- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 2 +- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +- .../prog/en/modules/opac-authorities-home.tt | 4 +- members/memberentry.pl | 13 ++++++++++- 6 files changed, 32 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 00:07:12 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 24 Apr 2013 22:07:12 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-2-gc3acf92 Message-ID: <E1UV7qK-0004zL-2O@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via c3acf92ac8d105b2a063067a76ec01ed20bbfb0e (commit) from 2f2ec10b467d705c3333e02d61215e6d937e4305 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3acf92ac8d105b2a063067a76ec01ed20bbfb0e Author: Adrien Saurat <adrien.saurat at biblibre.com> Date: Thu Jan 24 17:11:31 2013 +0100 Bug 9484: userid not generated consistently (different editing pages) When modifying a patron through different pages, the userid generation does not behave always the same way; this patch corrects this: - when firstname and surname are present in the form, they are used for the generation; - if there are not in the form, the firstname and surname in database are used instead. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No errors. Test This patch lacks a test plan, so I do the following 1) New user, empty userid, autocompleted 2) Edit user, change userid, saved correctly 3) Edit user, main edit window, emptied userid, autocompleted 4) Edit user, Detail > Library use, emptied userid, not autocomplete (not even a dot) 5) Applied patch 6) Repeated 1-3, same behavior 7) Repeated 4), now autocompletes with same userid as 3) So, works as described. No koha-qa errors. NOTE: It's impossible now to delete userid from interface. Off-topic: tried an userid in Arabic, works very well. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: members/memberentry.pl | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 08:00:21 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 25 Apr 2013 06:00:21 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-3-gf559384 Message-ID: <E1UVFED-0008VT-BC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via f5593842dc99211192955a4e70818de18b6204b5 (commit) from c3acf92ac8d105b2a063067a76ec01ed20bbfb0e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f5593842dc99211192955a4e70818de18b6204b5 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Mar 13 14:24:20 2013 -0300 Bug 9812 - Forbid access to several files through the browser This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser. Specifically "xlst", "modules" and "includes" dirs and its contents. This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: etc/koha-httpd.conf | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 25 08:00:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 25 Apr 2013 06:00:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-28-gf15bc76 Message-ID: <E1UVFEV-0008WG-Rz@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via f15bc76f298c66ba68195066e27efb93618072eb (commit) via e0ffef4a84da00e9fd79bc3a46c09fdd9f090ff0 (commit) via c0c8a46be7b61539cd920e1cf51791e38c99813b (commit) via 4a1f2f70bb8264f37c31fc041350571cbb718d80 (commit) from db7011c58c88e32c9cda3a1ae1a5adf315f261f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f15bc76f298c66ba68195066e27efb93618072eb Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Apr 3 13:05:52 2013 -0400 Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits If a lost item fee is owed and partially paid off when an item is returned and a refund is processed, Koha tries to pay off existing fees before adding any leftover balance as a credit on the account. However, those fee payments aren't actually processed, due to a bug where the accountnumber was quoted as a string literal, and thus the for the fee payment would fail. This did not result in an DB error, as the query was still valid SQL. Checking the return value of the query would have revealed that the accountline had not been updated. History: This bug was introduced on April 23, 2007 with the commit 'reintroducing fixaccountforlostandreturned as requested by rosalie'. Commit id 111d590e9cdaf801256822e23f170bfc2365338f On July 30, 2009 the error was flagged with a FIXME and remained in that state until now. Commit id 51e8fc2cb6a0cf79f19206c822a4361aeca6f63f Test plan: 1) Create a test patron 2) Check out an item to that patron and give it a due date in the past 3) Run fines.pl to generate the fine for the item 4) Mark the item long overdue on the item tab (not in edit items) 5) Pay for the lost item 6) Check the item back in 7) Note the incorrect fines. Only the lost fee balance due is refunded, not the entire lost fee, but no other fees are paid off. 8) Apply the patch 9) Repeat steps 1-6, then not the fines are paid correctly Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Totel due is correct after applying the patch. All tests and QA script pass. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit e0ffef4a84da00e9fd79bc3a46c09fdd9f090ff0 Author: Corey Fuimaono <agent.075 at gmail.com> Date: Wed Jan 16 10:48:03 2013 +1300 bug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility) [Returning Items] {REVISION 1.1} testing procedure: 1. Check in Invalid Item 2. See that new header has been added. "Can't Check in" Signed-off-by: Liz Rea <liz at catalyst.net.nz> A followup may come that makes this text invisible, but this helps accessibility a great dea, and passes validation. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Amended patch: replace "Can't Check in" with "Cannot check in" and delete a h3 element with the same text in order to avoid duplicated messages. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit c0c8a46be7b61539cd920e1cf51791e38c99813b Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Mar 13 14:24:20 2013 -0300 Bug 9812 - Forbid access to several files through the browser This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser. Specifically "xlst", "modules" and "includes" dirs and its contents. This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> commit 4a1f2f70bb8264f37c31fc041350571cbb718d80 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Mar 26 10:19:58 2013 -0400 Bug 9981: Handle sort1 field when duplicating patron It is noted in Bug 5432 that during a duplicate operation one field, 'Sort1' does not automatically clear when the cursor moves into it. This patch corrects this. Edit a patron record to have data in the Sort1 and Sort2 fields. Perform a duplicate operation on this patron and confirm that the Sort1 and Sort2 fields show the information from the original patron record. When you click on each field the contents should disappear. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- etc/koha-httpd.conf | 20 ++++++++++++++++++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 6 +++++- 4 files changed, 27 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 02:29:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 00:29:27 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10070 created. v3.12.00-beta1-306-g52db043 Message-ID: <E1UVWXX-0005fq-Bx@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10070 has been created at 52db043347016e106033c4c372bd9ec34cf8dee1 (commit) - Log ----------------------------------------------------------------- commit 52db043347016e106033c4c372bd9ec34cf8dee1 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 17 15:37:57 2013 +0200 Bug 10070: Anonymous search history is not being set in the cookie Test plan: 1 - turn on EnableOpacSearchHistory 2 - launch some searches at the opac 3 - go to your search history 4 - there is no history! 5 - apply this patch 6 - retry steps 1 to 3 7 - your history search is available! Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> This does fix the bug, but does undo the change to make the cookie utf-8 safe, however I think that change was done in the wrong way so I am happy to sign this off Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Wondering if the comment line should be deleted now too. Patch fixes the problem. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:16:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:16:55 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10050 created. v3.12.00-beta1-310-gd8d4d99 Message-ID: <E1UVXHT-00067i-4c@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10050 has been created at d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca (commit) - Log ----------------------------------------------------------------- commit d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 23:28:41 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Language settings Activate German and English for OPAC and intranet by default. To test: - Run the German web installer - Check that when logging into Koha the German interface is shown and you can switch between English and German using the links at the bottom of the page - Check language relevant settings in the system preferences are correctly set Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 60db9a9e244e1a93522384bf3b715fcfea364927 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:56:30 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Optional This patch updates the German web installer files from the optional directory. This includes: - Adding the bridge/reference.gif to the REF itemtype - Updating currency rates and setting EUR to active - Adding branchcode MPL to the sample holidays - Updating a few strings on the patroncard samples - Fixing typos and rephrasing To test: - Run the web installer with German installed - Verify all optional SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 40cd834c74d0a8b5b1d92941c0ec651655630103 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:14:50 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Mandatory This patch updates the German web installer files from the mandatory directory. This includes: - CalendarFirstDayOfWeek defaults to Monday - gist rates default to 0.07|0.19|0.00 - RoutlingListNote default text translation - uniqueitemfields default set to barcode stocknumber - Translation of new user flags and permissions - Corrections to existing translations and typo corrections To test: - Run the web installer with German installed - Verify all mandatory SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 21786fb71e5b7e0cf0c58d8a9b18a79af56063ef Merge: f5709c0 52db043 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 20:35:25 2013 -0400 Merge branch 'bug_10070' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:27:32 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:27:32 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9925 created. v3.12.00-beta1-312-gaadcdf7 Message-ID: <E1UVXRk-0006Bt-H7@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9925 has been created at aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 (commit) - Log ----------------------------------------------------------------- commit aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 09:29:32 2013 -0400 Bug 9925 - Remove unused table-pager include While the tablesorter plugin has not been completely eliminated from the staff client yet, there are no more instances where it requires the include file for showing paging controls. table-pager.inc can be safely removed. To test, apply the patch and confirm that the file is gone. A search of Koha templates for references to table-pager.inc should return no results. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 7d5c915e3cd9f4cbfb64d610b16c9c4e2168588b Merge: 21786fb d8d4d99 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:22:16 2013 -0400 Merge branch 'bug_10050' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:44:10 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:44:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9850 updated. v3.12.00-beta1-200-g68e8f72 Message-ID: <E1UVXhq-0006IC-FR@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9850 has been updated via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) from f6b936d50c6c46c2e427ae60a109a65522f66763 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:49:15 2013 -0400 Bug 9850: Fix Patron statistics link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 38421614a43d5aebbd3403ae8ee543e0e6dca07e Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:48:03 2013 -0400 Bug 9850: Fix patron routing lists link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:47:01 2013 -0400 Bug 9850: Fix patron files link Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8b574a02ba194c07d15104bb185c331993770880 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 23:16:42 2013 -0400 Bug 9850: Update Lists Help This updates the manual link in the lists help file. To test: Visit lists pages in the staff client, view the help and confirm link goes to the right place. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 23:14:16 2013 -0400 Bug 9850: Update holds help file This updates the manual link on the holds help file. To test: Visit the holds tab on any bib record and click the Help link. Make sure it goes to the right place. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit f2071b351e99a67108cc4a59ed5dc921f4470c55 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 22:35:30 2013 -0400 Bug 9850: Add missing tags help file This patch adds a help file to the listing of titles that use a tag in the tag moderation tool. To test: * Visit the Tag Moderation Tool * Click on a accepted tag * Check that the help file loads on the list and that the text and links are right. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 595ac425b86864c2d52ca093bdc865a4804c033a Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 22:31:57 2013 -0400 Bug 9850: Update Tags & Comments Help This patch updates the text and links for the Tag and Comment moderation tools. To test: Visit the help on the tags and comments tools and confirm that text and links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit e6ebc86a07dee5843f7fffae3605fc3d00a183c8 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 14:41:05 2013 -0400 Bug 9850: Catalogue help files This patch updates the help files in the catalogue folder. To test: Visit the help on the search, detail pages, item details and item history pages and confirm text and links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3cac78bdb83b0a510f062e683698f5f253014296 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Wed Mar 27 12:49:05 2013 -0400 Bug 9850: Acq Help Files for 3.12 This patch updates the manual links and some text in the acq help files. To test: Visit help on all acq pages and make sure links and text are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit a7cfa33058c7b469869bedb8cb8dc838b37135da Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sun Mar 24 01:14:58 2013 -0400 Bug 9850: Update Admin Help Files for 3.12 This patch updates the links to the manual and the text of the admin help files. To test: Visit the help files on all admin pages and make sure the links and text are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c4629aaffed8afb1dab2a812e16dddd6dbf1acce Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 19:53:14 2013 -0400 Bug 9850: Update Patron Help Files for 3.12 This patch updates all the help files in the members folder. It also adds a missing help file for approving patron account changes. To Test: Visit the help on every patron page and make sure the text and manual links are all right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Fixed 2 obvious typos mentioned on the bug report. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:46:38 2013 -0400 Bug 9850: Update Patron Card Help Files This patch updates the links to the manual in the patron card creator help files. There were no other changes. To test: Visit help on the patron card creator tool and make sure the links are right. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 418d5706a1e474a4d06377cf685563199064490a Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:42:12 2013 -0400 Bug 9850: Update Label Help Files This patch updates the manual links in the label creator help files. There were not other string changes. To test: Visit the help on the label creator and make sure that the links go to the 3.12 manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit bec43ed6404a629d5a4384b38531842f1209897d Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:17:00 2013 -0400 Bug 9850: Update Authority Help Files This patch just updates the links to the manual in the Authority help files. To Test: Visit the help on all authority pages and click the manual link in the help pop up. It should go to the 3.12 manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab Author: Nicole C. Engard <nengard at bywatersolutions.com> Date: Sat Mar 23 09:09:39 2013 -0400 Bug 9850: Update Stray Help Files This patch updates the help files which do not have a module folder. To test: Visit About Koha, Koha Home, and the No Help Found pages and check links to the manual. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++++-- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 +++++++++++++------- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 ++ .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 ++ .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- 98 files changed, 300 insertions(+), 177 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:47:34 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:47:34 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9818 created. v3.12.00-beta1-330-g44a8ed7 Message-ID: <E1UVXl8-0006KQ-5j@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9818 has been created at 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 (commit) - Log ----------------------------------------------------------------- commit 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 4b1749c170a534f315b17093c21b188837844868 Merge: dbb7a1e 68e8f72 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:49:41 2013 -0400 Merge branch 'bug_9850' into 3.14-master commit dbb7a1e08a02d6ec1e201b98cf8f9152a464a0b3 Merge: 7d5c915 aadcdf7 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:33:37 2013 -0400 Merge branch 'bug_9925' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 03:50:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 01:50:49 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9766 created. v3.12.00-beta1-332-g28518a0 Message-ID: <E1UVXoH-0006Mk-H2@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9766 has been created at 28518a033bf9a1b3f86270cfab438b5b9cdee8be (commit) - Log ----------------------------------------------------------------- commit 28518a033bf9a1b3f86270cfab438b5b9cdee8be Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Mar 7 16:07:16 2013 -0500 Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system The budget planning table previously used a YUI menu as part of a system for hiding and showing table columns. Instead of trying to convert that sytem to Bootstrap I have used code from the batch modification/deletion pages which uses a list of checkboxes to show and hide table columns. This has the advantage of giving the user visual feedback of what columns are hidden and of offering the user an interface which is familiar from other pages. This patch also moves CSS from a batch-operations-specific CSS file into the main CSS file. Batch modification templates have been modified accordingly. To test, view the budget planning page and choose different "plan by" options (by month, by library, by item type). Test the show/hide action on each individual column and using the "show all" and "hide all" checkboxes. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 1d1cd09456e263218befea64c023124fe4ce1e51 Merge: 4b1749c 44a8ed7 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:53:43 2013 -0400 Merge branch 'bug_9818' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:00:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:00:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_8068 created. v3.12.00-beta1-334-g8e222dc Message-ID: <E1UVXxP-0006RF-Hh@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_8068 has been created at 8e222dcdcc1f4aad9147f584df9d2f983f803a48 (commit) - Log ----------------------------------------------------------------- commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 17:44:43 2013 +0200 Bug 8068: Standardize terms used on acquisitions statistics branch > library budget > fund bookseller, supplier > vendor and capitalization To test: 1) Go to Reports > Acquisitions statistics 2) Check the labels and options of the form for correctness. 3) Run a few test searches to make sure functionality is unchanged. Unfortunately, some strings are from the .pl file, so a follow up moving those to the templates is needed. To make the changes consistent I have changed them in the .pl file. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 0b21236d2e7690bd3b499634fdb8fede249b4ff2 Merge: 1d1cd09 28518a0 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:56:51 2013 -0400 Merge branch 'bug_9766' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:02:25 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:02:25 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10106 created. v3.12.00-beta1-336-gfc34239 Message-ID: <E1UVXzV-0006TJ-JE@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10106 has been created at fc34239c7d161b82d923dbf318537d6a22e7ed9f (commit) - Log ----------------------------------------------------------------- commit fc34239c7d161b82d923dbf318537d6a22e7ed9f Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 24 08:52:12 2013 -0400 Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen A misplaced closing </li> causes the "reopen" checkbox to be misplaced if you're editing the a closed invoice. This patch puts the </li> in its proper place. To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and confirm that the "reopen" checkbox is correctly placed. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Problem easy to spot, patch fixes it perfectly. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8ffd35d8c1d3cb940b56b5702fac88f593e8f416 Merge: 0b21236 8e222dc Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:06:12 2013 -0400 Merge branch 'bug_8068' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:07:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:07:19 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9831 created. v3.12.00-beta1-340-g5959154 Message-ID: <E1UVY4F-0006W8-PC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9831 has been created at 5959154bc140a60164dd8652dd4285e2ec51f5d3 (commit) - Log ----------------------------------------------------------------- commit 5959154bc140a60164dd8652dd4285e2ec51f5d3 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit fe85af6929c0ad0ce9fdc7817a69286cb53f2a38 Merge: 8f40b04 cd14dae Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:11:23 2013 -0400 Merge branch 'bug_10045' into 3.14-master commit cd14dae7720b93f1ed101cd6383828885237aa02 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 18:02:43 2013 +0200 Bug 10045: Switch budget to fund in suggestions Labels are budget, but should be fund. To test: 1) Check the table on the suggestions page. 2) Check the suggestion edit form. 3) Check the suggestion display. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8f40b04dcc55c10420b79ec7050028399b73131f Merge: 8ffd35d fc34239 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:08:33 2013 -0400 Merge branch 'bug_10106' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:08:17 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:08:17 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10006 created. v3.12.00-beta1-342-g0942cac Message-ID: <E1UVY5B-0006Ww-2G@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10006 has been created at 0942cac72e8910b3ed6e557c42f6665060c14bd0 (commit) - Log ----------------------------------------------------------------- commit 0942cac72e8910b3ed6e557c42f6665060c14bd0 Author: Liz Rea <liz at catalyst.net.nz> Date: Tue Apr 9 13:20:09 2013 +1200 Bug 10006 - holding branch is not available to XSLT display To test: Use attached XSLT stylesheet for OPAC Results * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file. * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem. Verify that the OPAC results now show the holding branch instead of the home branch. Possible fail states: * no branch is shown (only call numbers, if given) * the wrong branch is shown Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 141048bd9759689a7927895f3a50cf2c1dae5d23 Merge: fe85af6 5959154 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:13:28 2013 -0400 Merge branch 'bug_9831' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:10 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10045 created. v3.12.00-beta1-338-gcd14dae Message-ID: <E1UVY62-0006Ye-5j@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10045 has been created at cd14dae7720b93f1ed101cd6383828885237aa02 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-288-g6edaffc Message-ID: <E1UVY6I-0006ZP-4H@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 (commit) via 74a458b85335d70d1068b9f1491df52e92ac5d66 (commit) via 3054241585e614c9423210ea4fad8d5bf1f0c897 (commit) via c124e48057b5960a8c0ba82281e47d6e23e3b97a (commit) via c8f91111c0e36d3bc867653a84958408d7a45c05 (commit) via 9d612da96b5790179d954f2a0b8f191a38f75a26 (commit) via 37cd791fd9fa7921f4a8bac19f03b8b3e02ef5e8 (commit) via 8110875a61174e62605a753b35b013e570730875 (commit) via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) via 1fc5771dca0bc12f6f6b54440b110db1031e17f6 (commit) via 6363306c10c119a2d362a11082eadf0d84c53f15 (commit) via 3ae673410231bbd19249fba8390948ef31dc51a3 (commit) via 6aa20670113dcb0e4dfa9b60bd8756172ad8a949 (commit) via 8b3f379b9273f192c9cbe24ad936e1d8f04a6b3d (commit) from 11f8ba92b2f87581a980e18033353ec98b45c0cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 Author: Liz Rea <liz at catalyst.net.nz> Date: Tue Apr 9 13:20:09 2013 +1200 Bug 10006 - holding branch is not available to XSLT display To test: Use attached XSLT stylesheet for OPAC Results * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file. * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem. Verify that the OPAC results now show the holding branch instead of the home branch. Possible fail states: * no branch is shown (only call numbers, if given) * the wrong branch is shown Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0942cac72e8910b3ed6e557c42f6665060c14bd0) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 74a458b85335d70d1068b9f1491df52e92ac5d66 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 5959154bc140a60164dd8652dd4285e2ec51f5d3) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3054241585e614c9423210ea4fad8d5bf1f0c897 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 18:02:43 2013 +0200 Bug 10045: Switch budget to fund in suggestions Labels are budget, but should be fund. To test: 1) Check the table on the suggestions page. 2) Check the suggestion edit form. 3) Check the suggestion display. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit cd14dae7720b93f1ed101cd6383828885237aa02) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c124e48057b5960a8c0ba82281e47d6e23e3b97a Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 24 08:52:12 2013 -0400 Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen A misplaced closing </li> causes the "reopen" checkbox to be misplaced if you're editing the a closed invoice. This patch puts the </li> in its proper place. To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and confirm that the "reopen" checkbox is correctly placed. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Problem easy to spot, patch fixes it perfectly. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit fc34239c7d161b82d923dbf318537d6a22e7ed9f) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c8f91111c0e36d3bc867653a84958408d7a45c05 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 17:44:43 2013 +0200 Bug 8068: Standardize terms used on acquisitions statistics branch > library budget > fund bookseller, supplier > vendor and capitalization To test: 1) Go to Reports > Acquisitions statistics 2) Check the labels and options of the form for correctness. 3) Run a few test searches to make sure functionality is unchanged. Unfortunately, some strings are from the .pl file, so a follow up moving those to the templates is needed. To make the changes consistent I have changed them in the .pl file. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9d612da96b5790179d954f2a0b8f191a38f75a26 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Mar 7 16:07:16 2013 -0500 Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system The budget planning table previously used a YUI menu as part of a system for hiding and showing table columns. Instead of trying to convert that sytem to Bootstrap I have used code from the batch modification/deletion pages which uses a list of checkboxes to show and hide table columns. This has the advantage of giving the user visual feedback of what columns are hidden and of offering the user an interface which is familiar from other pages. This patch also moves CSS from a batch-operations-specific CSS file into the main CSS file. Batch modification templates have been modified accordingly. To test, view the budget planning page and choose different "plan by" options (by month, by library, by item type). Test the show/hide action on each individual column and using the "show all" and "hide all" checkboxes. Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 28518a033bf9a1b3f86270cfab438b5b9cdee8be) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 37cd791fd9fa7921f4a8bac19f03b8b3e02ef5e8 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 44a8ed7dec205dd264797ecf2638fea7f1ea67c8) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8110875a61174e62605a753b35b013e570730875 Merge: 1fc5771 68e8f72 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 21:50:02 2013 -0400 Merge branch 'bug_9850' into 3.12-master commit 1fc5771dca0bc12f6f6b54440b110db1031e17f6 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 09:29:32 2013 -0400 Bug 9925 - Remove unused table-pager include While the tablesorter plugin has not been completely eliminated from the staff client yet, there are no more instances where it requires the include file for showing paging controls. table-pager.inc can be safely removed. To test, apply the patch and confirm that the file is gone. A search of Koha templates for references to table-pager.inc should return no results. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit aadcdf7c7e4c254edea4f2c96229add6ec8c74b1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6363306c10c119a2d362a11082eadf0d84c53f15 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 23:28:41 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Language settings Activate German and English for OPAC and intranet by default. To test: - Run the German web installer - Check that when logging into Koha the German interface is shown and you can switch between English and German using the links at the bottom of the page - Check language relevant settings in the system preferences are correctly set Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3ae673410231bbd19249fba8390948ef31dc51a3 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:56:30 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Optional This patch updates the German web installer files from the optional directory. This includes: - Adding the bridge/reference.gif to the REF itemtype - Updating currency rates and setting EUR to active - Adding branchcode MPL to the sample holidays - Updating a few strings on the patroncard samples - Fixing typos and rephrasing To test: - Run the web installer with German installed - Verify all optional SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 60db9a9e244e1a93522384bf3b715fcfea364927) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6aa20670113dcb0e4dfa9b60bd8756172ad8a949 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 22:14:50 2013 +0200 Bug 10050: Update German web installer files for 3.12 - Mandatory This patch updates the German web installer files from the mandatory directory. This includes: - CalendarFirstDayOfWeek defaults to Monday - gist rates default to 0.07|0.19|0.00 - RoutlingListNote default text translation - uniqueitemfields default set to barcode stocknumber - Translation of new user flags and permissions - Corrections to existing translations and typo corrections To test: - Run the web installer with German installed - Verify all mandatory SQL files are installed correctly Note: The German po files in master are buggy, please use files from translate.koha-community.org for testing. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 40cd834c74d0a8b5b1d92941c0ec651655630103) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8b3f379b9273f192c9cbe24ad936e1d8f04a6b3d Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Wed Apr 17 15:37:57 2013 +0200 Bug 10070: Anonymous search history is not being set in the cookie Test plan: 1 - turn on EnableOpacSearchHistory 2 - launch some searches at the opac 3 - go to your search history 4 - there is no history! 5 - apply this patch 6 - retry steps 1 to 3 7 - your history search is available! Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> This does fix the bug, but does undo the change to make the cookie utf-8 safe, however I think that change was done in the wrong way so I am happy to sign this off Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Wondering if the comment line should be deleted now too. Patch fixes the problem. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 52db043347016e106033c4c372bd9ec34cf8dee1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 + .../data/mysql/de-DE/mandatory/class_sources.txt | 2 +- .../de-DE/mandatory/message_transport_types.txt | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- .../sample_notices_message_attributes.txt | 3 +- .../sample_notices_message_transports.txt | 4 +- .../mysql/de-DE/mandatory/system_preferences.sql | 13 +- .../mysql/de-DE/mandatory/system_preferences.txt | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 14 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 12 +- .../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +- installer/data/mysql/de-DE/optional/auth_val.txt | 4 +- .../optional/marc21_holdings_coded_values.txt | 2 +- installer/data/mysql/de-DE/optional/parameters.sql | 10 +- installer/data/mysql/de-DE/optional/parameters.txt | 2 +- .../mysql/de-DE/optional/patron_categories.sql | 2 +- .../mysql/de-DE/optional/patron_categories.txt | 19 +- .../mysql/de-DE/optional/sample_creator_data.sql | 4 +- .../mysql/de-DE/optional/sample_creator_data.txt | 2 +- .../data/mysql/de-DE/optional/sample_holidays.sql | 10 +- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 2 +- .../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +- .../data/mysql/de-DE/optional/sample_libraries.sql | 4 - .../data/mysql/de-DE/optional/sample_news.sql | 4 +- .../data/mysql/de-DE/optional/sample_patrons.txt | 2 +- .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../intranet-tmpl/prog/en/css/pages/batchMod.css | 7 - .../intranet-tmpl/prog/en/css/staff-global.css | 8 + .../intranet-tmpl/prog/en/includes/table-pager.inc | 17 - koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 80 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 102 ++-- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 ++++-- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 + .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 + .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 14 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../prog/en/modules/tools/batchMod-del.tt | 1 - .../prog/en/modules/tools/batchMod-edit.tt | 1 - opac/opac-search.pl | 2 +- reports/acquisitions_stats.pl | 4 +- 137 files changed, 910 insertions(+), 528 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/batchMod.css delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:09:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:09:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-343-gc98d65a Message-ID: <E1UVY6J-0006aD-Ql@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via c98d65adf742ab0cadacd1ae0811a83d4d711c27 (commit) via 0942cac72e8910b3ed6e557c42f6665060c14bd0 (commit) via 141048bd9759689a7927895f3a50cf2c1dae5d23 (commit) via 5959154bc140a60164dd8652dd4285e2ec51f5d3 (commit) via fe85af6929c0ad0ce9fdc7817a69286cb53f2a38 (commit) via cd14dae7720b93f1ed101cd6383828885237aa02 (commit) via 8f40b04dcc55c10420b79ec7050028399b73131f (commit) via fc34239c7d161b82d923dbf318537d6a22e7ed9f (commit) via 8ffd35d8c1d3cb940b56b5702fac88f593e8f416 (commit) via 8e222dcdcc1f4aad9147f584df9d2f983f803a48 (commit) via 0b21236d2e7690bd3b499634fdb8fede249b4ff2 (commit) via 28518a033bf9a1b3f86270cfab438b5b9cdee8be (commit) via 1d1cd09456e263218befea64c023124fe4ce1e51 (commit) via 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 (commit) via 4b1749c170a534f315b17093c21b188837844868 (commit) via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit) via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit) via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit) via 8b574a02ba194c07d15104bb185c331993770880 (commit) via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit) via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit) via 595ac425b86864c2d52ca093bdc865a4804c033a (commit) via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit) via 3cac78bdb83b0a510f062e683698f5f253014296 (commit) via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit) via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit) via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit) via 418d5706a1e474a4d06377cf685563199064490a (commit) via bec43ed6404a629d5a4384b38531842f1209897d (commit) via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit) via dbb7a1e08a02d6ec1e201b98cf8f9152a464a0b3 (commit) via aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 (commit) via 7d5c915e3cd9f4cbfb64d610b16c9c4e2168588b (commit) via d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca (commit) via 60db9a9e244e1a93522384bf3b715fcfea364927 (commit) via 40cd834c74d0a8b5b1d92941c0ec651655630103 (commit) via 21786fb71e5b7e0cf0c58d8a9b18a79af56063ef (commit) via 52db043347016e106033c4c372bd9ec34cf8dee1 (commit) from f5709c00988bfd8c401d07d52b5925c105a61072 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c98d65adf742ab0cadacd1ae0811a83d4d711c27 Merge: 141048b 0942cac Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:14:26 2013 -0400 Merge branch 'bug_10006' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 2 + .../data/mysql/de-DE/mandatory/class_sources.txt | 2 +- .../de-DE/mandatory/message_transport_types.txt | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- .../sample_notices_message_attributes.txt | 3 +- .../sample_notices_message_transports.txt | 4 +- .../mysql/de-DE/mandatory/system_preferences.sql | 13 +- .../mysql/de-DE/mandatory/system_preferences.txt | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 14 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 12 +- .../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +- installer/data/mysql/de-DE/optional/auth_val.txt | 4 +- .../optional/marc21_holdings_coded_values.txt | 2 +- installer/data/mysql/de-DE/optional/parameters.sql | 10 +- installer/data/mysql/de-DE/optional/parameters.txt | 2 +- .../mysql/de-DE/optional/patron_categories.sql | 2 +- .../mysql/de-DE/optional/patron_categories.txt | 19 +- .../mysql/de-DE/optional/sample_creator_data.sql | 4 +- .../mysql/de-DE/optional/sample_creator_data.txt | 2 +- .../data/mysql/de-DE/optional/sample_holidays.sql | 10 +- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 2 +- .../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +- .../data/mysql/de-DE/optional/sample_libraries.sql | 4 - .../data/mysql/de-DE/optional/sample_news.sql | 4 +- .../data/mysql/de-DE/optional/sample_patrons.txt | 2 +- .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../intranet-tmpl/prog/en/css/pages/batchMod.css | 7 - .../intranet-tmpl/prog/en/css/staff-global.css | 8 + .../intranet-tmpl/prog/en/includes/table-pager.inc | 17 - koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 80 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 102 ++-- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/about.tt | 2 +- .../prog/en/modules/help/acqui/acqcontract.tt | 2 +- .../prog/en/modules/help/acqui/acqui-home.tt | 2 +- .../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +- .../prog/en/modules/help/acqui/basket.tt | 2 +- .../prog/en/modules/help/acqui/basketgroup.tt | 2 +- .../prog/en/modules/help/acqui/basketheader.tt | 2 +- .../prog/en/modules/help/acqui/booksellers.tt | 2 +- .../prog/en/modules/help/acqui/histsearch.tt | 2 +- .../prog/en/modules/help/acqui/invoice.tt | 2 +- .../prog/en/modules/help/acqui/invoices.tt | 2 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/help/acqui/neworderempty.tt | 2 +- .../en/modules/help/acqui/newordersuggestion.tt | 13 +- .../prog/en/modules/help/acqui/orderreceive.tt | 2 +- .../prog/en/modules/help/acqui/parcel.tt | 2 +- .../prog/en/modules/help/acqui/parcels.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/help/acqui/z3950_search.tt | 2 +- .../prog/en/modules/help/admin/admin-home.tt | 2 +- .../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/help/admin/aqbudgets.tt | 2 +- .../prog/en/modules/help/admin/aqplan.tt | 2 +- .../modules/help/admin/auth_subfields_structure.tt | 2 +- .../en/modules/help/admin/auth_tag_structure.tt | 2 +- .../en/modules/help/admin/authorised_values.tt | 43 ++- .../prog/en/modules/help/admin/authtypes.tt | 2 +- .../prog/en/modules/help/admin/biblio_framework.tt | 2 +- .../modules/help/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 2 +- .../prog/en/modules/help/admin/categorie.tt | 3 +- .../prog/en/modules/help/admin/checkmarc.tt | 2 +- .../prog/en/modules/help/admin/cities.tt | 2 +- .../prog/en/modules/help/admin/classsources.tt | 2 +- .../prog/en/modules/help/admin/currency.tt | 2 +- .../prog/en/modules/help/admin/didyoumean.tt | 2 +- .../prog/en/modules/help/admin/fieldmapping.tt | 2 +- .../modules/help/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/help/admin/itemtypes.tt | 2 +- .../prog/en/modules/help/admin/koha2marclinks.tt | 2 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/help/admin/marctagstructure.tt | 2 +- .../prog/en/modules/help/admin/matching-rules.tt | 2 +- .../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/help/admin/oai_sets.tt | 2 +- .../en/modules/help/admin/patron-attr-types.tt | 3 +- .../prog/en/modules/help/admin/preferences.tt | 2 +- .../prog/en/modules/help/admin/roadtype.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../prog/en/modules/help/admin/stopwords.tt | 2 +- .../en/modules/help/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/help/admin/z3950servers.tt | 2 +- .../modules/help/authorities/authorities-home.tt | 2 +- .../en/modules/help/authorities/authorities.tt | 2 +- .../prog/en/modules/help/authorities/detail.tt | 2 +- .../prog/en/modules/help/catalogue/detail.tt | 2 +- .../prog/en/modules/help/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/help/catalogue/moredetail.tt | 2 +- .../prog/en/modules/help/catalogue/search.tt | 14 +- .../en/modules/help/labels/label-edit-batch.tt | 2 +- .../en/modules/help/labels/label-edit-layout.tt | 2 +- .../en/modules/help/labels/label-edit-profile.tt | 2 +- .../en/modules/help/labels/label-edit-template.tt | 2 +- .../prog/en/modules/help/labels/label-home.tt | 2 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../prog/en/modules/help/members/files.tt | 2 +- .../prog/en/modules/help/members/mancredit.tt | 4 +- .../prog/en/modules/help/members/maninvoice.tt | 4 +- .../prog/en/modules/help/members/member-flags.tt | 169 ++++-- .../en/modules/help/members/member-password.tt | 2 +- .../prog/en/modules/help/members/member.tt | 9 +- .../prog/en/modules/help/members/memberentry.tt | 4 +- .../prog/en/modules/help/members/members-home.tt | 7 +- .../prog/en/modules/help/members/members-update.tt | 13 + .../prog/en/modules/help/members/moremember.tt | 4 +- .../prog/en/modules/help/members/notices.tt | 4 +- .../prog/en/modules/help/members/pay.tt | 2 +- .../prog/en/modules/help/members/paycollect.tt | 2 +- .../prog/en/modules/help/members/readingrec.tt | 4 +- .../prog/en/modules/help/members/routing-lists.tt | 2 +- .../prog/en/modules/help/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +- .../prog/en/modules/help/patroncards/edit-batch.tt | 2 +- .../en/modules/help/patroncards/edit-layout.tt | 2 +- .../en/modules/help/patroncards/edit-profile.tt | 2 +- .../en/modules/help/patroncards/edit-template.tt | 2 +- .../prog/en/modules/help/patroncards/home.tt | 2 +- .../en/modules/help/patroncards/image-manage.tt | 2 +- .../prog/en/modules/help/patroncards/manage.tt | 2 +- .../prog/en/modules/help/reserve/request.tt | 2 +- .../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/help/tags/list.tt | 11 + .../prog/en/modules/help/tags/review.tt | 4 +- .../prog/en/modules/help/virtualshelves/shelves.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 14 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../prog/en/modules/tools/batchMod-del.tt | 1 - .../prog/en/modules/tools/batchMod-edit.tt | 1 - opac/opac-search.pl | 2 +- reports/acquisitions_stats.pl | 4 +- 137 files changed, 910 insertions(+), 528 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/batchMod.css delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 04:33:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 02:33:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-296-g0d59169 Message-ID: <E1UVYTT-0006v4-7v@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 (commit) via 90756506f9326d885dc854ce3ff8507c1b023b32 (commit) via a0ede79720fef1f7f2aa54e90061ba90ee5ba83d (commit) via abb1b2839cc0e7bb7937a628bf265b90d84c7bc2 (commit) via 86409db5d9141ff4a4036bf5bcd61dda0ed580cb (commit) via 7f7c80a1507c1fdf6c877a7f1d5658d07f77d763 (commit) via b54f971beb834421f0eca19793e59f4b1a793700 (commit) via 4dc5411423ed597d3887101e7fd3ac6ce5b41fba (commit) from 6edaffcdb1ff283bbca4faa600fc6c015fc49b74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:37:54 2013 -0400 Revert "Merge branch 'bug_6554' into 3.12-master" This reverts commit 9c0b2e408b496b999cdbede92e651f3aef588209, reversing changes made to 65ea963e5217b1e955e404ea1c09928f6b259110. 6554 considered harmful Conflicts: opac/opac-search.pl commit 90756506f9326d885dc854ce3ff8507c1b023b32 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:33:19 2013 -0400 Revert "Bug 6554 Fix error caused by modifying $_ in a map" This reverts commit 32a0703092172e9dc92624bbc8a5649e05a79929. 6554 considered harmful. commit a0ede79720fef1f7f2aa54e90061ba90ee5ba83d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:57 2013 -0400 Revert "Bug 10074 - Encoding problems at login time" This reverts commit 1ee3892529a0d920c555f357330316fdaff50e08. 6554 considered harmful. commit abb1b2839cc0e7bb7937a628bf265b90d84c7bc2 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:43 2013 -0400 Revert "Bug 10074 - Encoding problems for installer" This reverts commit 362d399e48a89e2903a48f189d593ace0e82b88f. 6554 considered harmful. commit 86409db5d9141ff4a4036bf5bcd61dda0ed580cb Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:26 2013 -0400 Revert "Bug 10074: QA Followup for InstallAuth.pm" This reverts commit c509ea3f18e71d230b634ba88291f3b32f446345. 6554 considered harmful. commit 7f7c80a1507c1fdf6c877a7f1d5658d07f77d763 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:32:13 2013 -0400 Revert "Bug 10019: Fix for userid containing UTF8 chars" This reverts commit 678884ba389251849c69a40435a15f43f1bbb277. 6554 considered harmful. commit b54f971beb834421f0eca19793e59f4b1a793700 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:31:49 2013 -0400 Revert "Bug 9951: Followup for Tools" This reverts commit 22c88aa4cdfbe7389133d393199f57b5946e6605. 6554 considered harmful. commit 4dc5411423ed597d3887101e7fd3ac6ce5b41fba Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Thu Apr 25 22:31:21 2013 -0400 Revert "Bug 9951: Followup for tools/viewlog.pl" This reverts commit 5c4c680fa69c2af8643a61268b5568c57401e5b1. 6554 considered harmful. ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 15 +++++++------ C4/Context.pm | 17 +-------------- C4/ItemType.pm | 2 +- C4/Output.pm | 6 ++++- C4/Search.pm | 25 +++++++++------------ C4/Templates.pm | 44 +++++++++++++++++++++++++++++++++++++- C4/XSLT.pm | 3 +- acqui/booksellers.pl | 1 - acqui/histsearch.pl | 9 -------- admin/preferences.pl | 5 +--- admin/z3950servers.pl | 2 +- authorities/authorities-home.pl | 2 +- catalogue/search.pl | 2 +- cataloguing/addbiblio.pl | 2 +- cataloguing/additem.pl | 2 +- cataloguing/z3950_search.pl | 2 +- circ/circulation.pl | 2 - installer/InstallAuth.pm | 9 +++++-- members/member.pl | 2 +- opac/opac-search.pl | 2 +- patroncards/members-search.pl | 1 - reports/guided_reports.pl | 2 +- reserve/renewscript.pl | 2 +- serials/routing-preview.pl | 2 +- serials/routing.pl | 2 +- serials/serials-search.pl | 3 -- tags/review.pl | 2 +- tools/viewlog.pl | 2 +- 28 files changed, 90 insertions(+), 80 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 13:48:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 11:48:05 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10115 created. v3.12.00-beta1-344-gf8130fb Message-ID: <E1UVh8H-00019E-30@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10115 has been created at f8130fb8486a3bb840d37006ddfbf046cb9b161a (commit) - Log ----------------------------------------------------------------- commit f8130fb8486a3bb840d37006ddfbf046cb9b161a Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Apr 25 08:49:51 2013 -0400 Bug 10115 - Hiding advanced search in Orders search tab removes plus button The logic of the JavaScript for showing and hiding additional options in the orders search form wasn't quite right, resulting in the +/- control being hidden incorrectly. This patch corrects and simplifies the JS in order to fix the problem. To test: - Open any page in Acquisitions which shows the orders search form in the header search bar (for instance, Acquisitions home). - Open the orders search tab and click on the "+" to show more options. - Click the "-" to hide the additional options. The additional options should now be hidden and the "+" displayed. Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net> Works as expected Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 13:49:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 11:49:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10107 created. v3.12.00-beta1-346-g545573d Message-ID: <E1UVh9p-0001Ak-C3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10107 has been created at 545573d33318a37e5f58f053acc3a5cf09a9260c (commit) - Log ----------------------------------------------------------------- commit 545573d33318a37e5f58f053acc3a5cf09a9260c Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9e70efd11049b12f672b0fdbbe22d23a6e304d1c Merge: c98d65a f8130fb Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 07:54:13 2013 -0400 Merge branch 'bug_10115' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:04:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:04:11 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9659 created. v3.12.00-beta1-350-g1f9145b Message-ID: <E1UVhNr-0001Ni-0b@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9659 has been created at 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 (commit) - Log ----------------------------------------------------------------- commit 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:08:07 2013 -0400 Bug 9659: Move new unit test to db-dependent directory C4::Reports::Guided requires a koha-conf.xml file to be in place in order to load. This means that any test which uses it has to go in t/db_dependent Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6110375307845778f74d6e5a214d63ab69cc5330 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 10 15:50:50 2013 -0300 Bug 9659 - QA Follow up: Unit tests Added some tests against the methods added by this patch. To test, prove -v - t/Koha.t - t/ReportsGuided.t Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Works quite nicely! All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit cdc5e11159c6c3dba8ae371094633feb5e64b57d Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Tue Feb 19 15:58:53 2013 -0300 Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports A user might create a SQL report that relies on non-existent authorised value categories. Because of a typo, or just because they copy&pasted the report from the Wiki. Use cases are: - The user creates a report from SQL a) Uses bad authorised values b) Clicks 'Save Report' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Save Report' - The user edits an already saved report (Update SQL) a) Uses bad authorised values b) Clicks 'Update SQL' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Update SQL' - The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things. To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'): SELECT * FROM itemtypes WHERE hola=<<Test branch1|branchee>> AND hola2=<<Test branch2|brancha>> Regards To+ Notes: - I added several comments on the code. - Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it). - Added the following methods - C4::Reports::Guided::GetReservedAuthorisedValues - C4::Reports::Guided::GetParametersFromSQL - C4::Reports::Guided::IsAuthorisedValueValid - C4::Reports::Guided::ValidateSQLParameters - C4::Koha::IsAuthorisedValueCategory - Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D. - Fixed some trivial perlcritic -5 errors - Removed some debugging stuff left by mistake - Fixed some POD problems - Optimal SQL-driven IsAuthorisedValueCategory method - Thanks to Owen and Jared for their patience heh. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No koha-qa errors. Test: Tried with examples (from help and test plan) reports, correctly identifies invalid authorized values, and no problem with authorized ones. NOTE: Online help for this does not states that partial values need to be between '%' in a SQLish way. Perhaps this could be addressed inserting % in values or adding a checkbox (partial|exact). Or changing help. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b60a81111048a03591c455134b2b311c644d8754 Merge: 9e70efd 545573d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 07:55:53 2013 -0400 Merge branch 'bug_10107' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:12:56 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:12:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9219 created. v3.12.00-beta1-352-g6385cfd Message-ID: <E1UVhWK-0001Qh-Tv@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9219 has been created at 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 (commit) - Log ----------------------------------------------------------------- commit 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Dec 5 13:55:00 2012 -0500 Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl This patch adds the lost and damaged status for an issued item to the table of issued items on circulation.pl to make it align more closely to the same table on moremember.pl Test Plan: 1) Apply patch 2) Issue an item 3) Set the item's damaged status 4) Verify the status is showing near the date due on circulation.pl 5) Clear the damaged status and set the lost status again 6) Repeat step 4 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I could only test this with the DAMAGED value, because currently lost items are removed from the patron account when you set the status. I know there is a patch somewhere to make it optional and the change looks alright. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 48161f3c8abd4f01f4915b9d42515d128e70de81 Merge: b60a811 1f9145b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:09:23 2013 -0400 Merge branch 'bug_9659' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:24:50 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:24:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-353-g03b4dfe Message-ID: <E1UVhhq-0001XT-38@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 03b4dfe846047f233d7de84d8987f6622ee24129 (commit) via 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2 (commit) via 48161f3c8abd4f01f4915b9d42515d128e70de81 (commit) via 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20 (commit) via 6110375307845778f74d6e5a214d63ab69cc5330 (commit) via cdc5e11159c6c3dba8ae371094633feb5e64b57d (commit) via b60a81111048a03591c455134b2b311c644d8754 (commit) via 545573d33318a37e5f58f053acc3a5cf09a9260c (commit) via 9e70efd11049b12f672b0fdbbe22d23a6e304d1c (commit) via f8130fb8486a3bb840d37006ddfbf046cb9b161a (commit) from c98d65adf742ab0cadacd1ae0811a83d4d711c27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03b4dfe846047f233d7de84d8987f6622ee24129 Merge: 48161f3 6385cfd Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:18:59 2013 -0400 Merge branch 'bug_9219' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 23 +++ C4/Reports/Guided.pm | 127 +++++++++++++--- .../prog/en/includes/acquisitions-search.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 22 +++ .../en/modules/reports/guided_reports_start.tt | 87 +++++++++-- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- reports/guided_reports.pl | 170 ++++++++++++++------ t/Koha.t | 36 ++++- t/db_dependent/ReportsGuided.t | 110 +++++++++++++ 9 files changed, 497 insertions(+), 84 deletions(-) create mode 100755 t/db_dependent/ReportsGuided.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 14:24:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 12:24:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-302-ga80ef2b Message-ID: <E1UVhho-0001X1-Fa@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d (commit) via 9522316ce2e7382ced1f70f4d462f14d8b0bbaa2 (commit) via 041beaa1d4932b022ea34de7789e74b2ae586977 (commit) via f4c72bbc2aa660ba2c72a06fe7c3f9a3ff6ded15 (commit) via b391e79c2e30b7feaa984c0fd835f97ac88b6221 (commit) via 5bff5aa448c921fb67879924a54b3704f5485eb1 (commit) from 0d5916987e3320b2c52b8bb41cfd7e5a9015e751 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Dec 5 13:55:00 2012 -0500 Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl This patch adds the lost and damaged status for an issued item to the table of issued items on circulation.pl to make it align more closely to the same table on moremember.pl Test Plan: 1) Apply patch 2) Issue an item 3) Set the item's damaged status 4) Verify the status is showing near the date due on circulation.pl 5) Clear the damaged status and set the lost status again 6) Repeat step 4 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I could only test this with the DAMAGED value, because currently lost items are removed from the patron account when you set the status. I know there is a patch somewhere to make it optional and the change looks alright. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9522316ce2e7382ced1f70f4d462f14d8b0bbaa2 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 08:08:07 2013 -0400 Bug 9659: Move new unit test to db-dependent directory C4::Reports::Guided requires a koha-conf.xml file to be in place in order to load. This means that any test which uses it has to go in t/db_dependent Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 1f9145bbbdf020e18a4e0a49652a9cf55f6bed20) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 041beaa1d4932b022ea34de7789e74b2ae586977 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 10 15:50:50 2013 -0300 Bug 9659 - QA Follow up: Unit tests Added some tests against the methods added by this patch. To test, prove -v - t/Koha.t - t/ReportsGuided.t Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Works quite nicely! All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 6110375307845778f74d6e5a214d63ab69cc5330) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit f4c72bbc2aa660ba2c72a06fe7c3f9a3ff6ded15 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Tue Feb 19 15:58:53 2013 -0300 Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports A user might create a SQL report that relies on non-existent authorised value categories. Because of a typo, or just because they copy&pasted the report from the Wiki. Use cases are: - The user creates a report from SQL a) Uses bad authorised values b) Clicks 'Save Report' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Save Report' - The user edits an already saved report (Update SQL) a) Uses bad authorised values b) Clicks 'Update SQL' c) Koha lists the problematic authorised values d) The user decides to e-1) Save it anyway, it gets saved e-2) Edit the report, it gets back to where it chose 'Update SQL' - The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things. To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'): SELECT * FROM itemtypes WHERE hola=<<Test branch1|branchee>> AND hola2=<<Test branch2|brancha>> Regards To+ Notes: - I added several comments on the code. - Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it). - Added the following methods - C4::Reports::Guided::GetReservedAuthorisedValues - C4::Reports::Guided::GetParametersFromSQL - C4::Reports::Guided::IsAuthorisedValueValid - C4::Reports::Guided::ValidateSQLParameters - C4::Koha::IsAuthorisedValueCategory - Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D. - Fixed some trivial perlcritic -5 errors - Removed some debugging stuff left by mistake - Fixed some POD problems - Optimal SQL-driven IsAuthorisedValueCategory method - Thanks to Owen and Jared for their patience heh. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Work as described. No koha-qa errors. Test: Tried with examples (from help and test plan) reports, correctly identifies invalid authorized values, and no problem with authorized ones. NOTE: Online help for this does not states that partial values need to be between '%' in a SQLish way. Perhaps this could be addressed inserting % in values or adding a checkbox (partial|exact). Or changing help. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit cdc5e11159c6c3dba8ae371094633feb5e64b57d) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b391e79c2e30b7feaa984c0fd835f97ac88b6221 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 545573d33318a37e5f58f053acc3a5cf09a9260c) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5bff5aa448c921fb67879924a54b3704f5485eb1 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Apr 25 08:49:51 2013 -0400 Bug 10115 - Hiding advanced search in Orders search tab removes plus button The logic of the JavaScript for showing and hiding additional options in the orders search form wasn't quite right, resulting in the +/- control being hidden incorrectly. This patch corrects and simplifies the JS in order to fix the problem. To test: - Open any page in Acquisitions which shows the orders search form in the header search bar (for instance, Acquisitions home). - Open the orders search tab and click on the "+" to show more options. - Click the "-" to hide the additional options. The additional options should now be hidden and the "+" displayed. Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net> Works as expected Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit f8130fb8486a3bb840d37006ddfbf046cb9b161a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 23 +++ C4/Reports/Guided.pm | 127 +++++++++++++--- .../prog/en/includes/acquisitions-search.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 22 +++ .../en/modules/reports/guided_reports_start.tt | 87 +++++++++-- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- reports/guided_reports.pl | 170 ++++++++++++++------ t/Koha.t | 36 ++++- t/db_dependent/ReportsGuided.t | 110 +++++++++++++ 9 files changed, 497 insertions(+), 84 deletions(-) create mode 100755 t/db_dependent/ReportsGuided.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:23:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:23:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-6-g69231a2 Message-ID: <E1UVq6p-0004D5-LJ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 69231a29cedd0b15f403afe71004b40df5ddaa12 (commit) via 642fb2b85b8cdc39e81f7fe19b05608d4b4a4ea2 (commit) via c8c80a8e787ff04cf167dbeae7602a484e22f977 (commit) from f5593842dc99211192955a4e70818de18b6204b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 69231a29cedd0b15f403afe71004b40df5ddaa12 Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:27:12 2013 +1200 Revert "Bug 9812 - Forbid access to several files through the browser" This reverts commit f5593842dc99211192955a4e70818de18b6204b5. Revert at author's request commit 642fb2b85b8cdc39e81f7fe19b05608d4b4a4ea2 Merge: c8c80a8 f559384 Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:26:44 2013 +1200 Merge remote-tracking branch 'origin/3.8.x' into 3.8.x commit c8c80a8e787ff04cf167dbeae7602a484e22f977 Author: Marc Veron <veron at veron.ch> Date: Wed Oct 10 07:49:36 2012 +0200 Bug 8895 - Warning in systempreferences.pl: Use of uninitialized value in length... Clicking on Local use tab in system preferences results in warning in log file: systempreferences.pl: Use of uninitialized value in length at (...)/admin/systempreferences.pl line 456 Reason: content field "value" in table "systempreferences" can be NULL (and is tested for length). Added test for "defined" at to places. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: admin/systempreferences.pl | 2 ++ etc/koha-httpd.conf | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:46:35 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:46:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-7-ged0faee Message-ID: <E1UVqTT-0004Jr-Q3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via ed0faee2e3eb81c32612807ec935d99d06a93814 (commit) from 69231a29cedd0b15f403afe71004b40df5ddaa12 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed0faee2e3eb81c32612807ec935d99d06a93814 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Sat Apr 13 21:31:14 2013 -0300 Bug 10042 - Minor typo ("Communnity") in packages docs VERY trivial string patch. Couldn't help sending it. To+ Signed-off-by: Magnus Enger <magnus at enger.priv.no> Thanks for fixing my typo! I did not test by building packages etc, but by grepping for "Communnity". The patch removes all occurences of the typo. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-common.xml | 2 +- debian/docs/koha-create-dirs.xml | 2 +- debian/docs/koha-create.xml | 2 +- debian/docs/koha-disable.xml | 2 +- debian/docs/koha-dump-defaults.xml | 2 +- debian/docs/koha-dump.xml | 2 +- debian/docs/koha-email-disable.xml | 2 +- debian/docs/koha-email-enable.xml | 2 +- debian/docs/koha-enable.xml | 2 +- debian/docs/koha-foreach.xml | 2 +- debian/docs/koha-list.xml | 2 +- debian/docs/koha-mysql.xml | 2 +- debian/docs/koha-rebuild-zebra.xml | 2 +- debian/docs/koha-remove.xml | 2 +- debian/docs/koha-reset-passwd.xml | 2 +- debian/docs/koha-restart-zebra.xml | 2 +- debian/docs/koha-restore.xml | 2 +- debian/docs/koha-run-backups.xml | 2 +- debian/docs/koha-start-zebra.xml | 2 +- debian/docs/koha-stop-zebra.xml | 2 +- debian/docs/koha-upgrade-schema.xml | 2 +- debian/docs/koha-upgrade-to-3.4.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 26 23:46:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 21:46:49 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-31-g951092b Message-ID: <E1UVqTh-0004Kf-QN@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 951092bc3137c63dcae5dac1facfa7a7eef5b233 (commit) via 77e66cb814c5c203a3b94c303394bf0f37b3a94a (commit) via 2a7fa64bdfacec7411f06b6d35d30154c9f53d2a (commit) from f15bc76f298c66ba68195066e27efb93618072eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 951092bc3137c63dcae5dac1facfa7a7eef5b233 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Sat Apr 13 21:31:14 2013 -0300 Bug 10042 - Minor typo ("Communnity") in packages docs VERY trivial string patch. Couldn't help sending it. To+ Signed-off-by: Magnus Enger <magnus at enger.priv.no> Thanks for fixing my typo! I did not test by building packages etc, but by grepping for "Communnity". The patch removes all occurences of the typo. Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 77e66cb814c5c203a3b94c303394bf0f37b3a94a Author: David Cook <dcook at prosentient.com.au> Date: Fri Mar 1 13:22:33 2013 +1100 Bug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists The current problem: When the verify_images() function runs from amazonimages.js, it loops through every img element and selects the elements that come from Amazon sources. However, if the height/width is 1 (i.e. Amazon passes off a blank image) or if the img element's complete property is null or non-existent, then it searches for the parent node and re-writes the HTML with the "No Cover Image Available" (NO_AMAZON_IMAGE) text, even though that parent node might contain other img elements that have images available (from Google, local images, etc)! Proposed fix: Wrap the Amazon image in a span tag (as we do with the Google and local covers), so that it re-writes the HTML within that parent span, rather than the parent anchor which contains all the other images. To test: 1) Turn on the OPACAmazonCoverImages, GoogleJackets, and OPACLocalCoverImages system preferences 2) Replace the ISBN in one of your records with 9780615352435 3) Now load a local cover image for that record 4) Search for that record (but make sure you're vague enough to have multiple search results) 5) For a split second, you may notice the local cover image appears before being replaced by a "No Cover Image Available". Now apply this patch 6) Refresh your search results page 7) You should now see your local cover image, PLUS the "No Cover Image Available" for the Amazon image, and whatever other graphics/"no cover image available" "graphics" for the Google Jackets. To be comprehensive, try the same set of steps using the OPAC Lists rather than the OPAC Search Results Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 2a7fa64bdfacec7411f06b6d35d30154c9f53d2a Author: Chris Cormack <chris at bigballofwax.co.nz> Date: Sat Apr 27 09:25:31 2013 +1200 Revert "Bug 9812 - Forbid access to several files through the browser" This reverts commit c0c8a46be7b61539cd920e1cf51791e38c99813b. Reverted at Authors request ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-common.xml | 2 +- debian/docs/koha-create-dirs.xml | 2 +- debian/docs/koha-create.xml | 2 +- debian/docs/koha-disable.xml | 2 +- debian/docs/koha-dump-defaults.xml | 2 +- debian/docs/koha-dump.xml | 2 +- debian/docs/koha-email-disable.xml | 2 +- debian/docs/koha-email-enable.xml | 2 +- debian/docs/koha-enable.xml | 2 +- debian/docs/koha-foreach.xml | 2 +- debian/docs/koha-list.xml | 2 +- debian/docs/koha-mysql.xml | 2 +- debian/docs/koha-rebuild-zebra.xml | 2 +- debian/docs/koha-remove.xml | 2 +- debian/docs/koha-reset-passwd.xml | 2 +- debian/docs/koha-restart-zebra.xml | 2 +- debian/docs/koha-restore.xml | 2 +- debian/docs/koha-run-backups.xml | 2 +- debian/docs/koha-start-zebra.xml | 2 +- debian/docs/koha-stop-zebra.xml | 2 +- debian/docs/koha-upgrade-schema.xml | 2 +- debian/docs/koha-upgrade-to-3.4.xml | 2 +- etc/koha-httpd.conf | 20 -------------------- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 +++--- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 6 +++--- 25 files changed, 28 insertions(+), 48 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:09:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:09:19 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-303-g393b226 Message-ID: <E1UVqpT-0004QQ-Fr@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 393b226aca948e5136f69a2abb65467c61a78323 (commit) from a80ef2bc9877c1de54eeb0ed6c980290e0d9f53d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 393b226aca948e5136f69a2abb65467c61a78323 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:15:19 2013 -0400 Revert "Merge branch 'bug_9812' into 3.12-master" This reverts commit 761c6213f4d813e7eef00781867521dc1faabead, reversing changes made to c007557f24d6deff086f4c024f4a5c3dc25d721a. Reverted at request of author. ----------------------------------------------------------------------- Summary of changes: etc/koha-httpd.conf | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:11:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:11:57 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10103 created. v3.12.00-beta1-354-gfaa93af Message-ID: <E1UVqs1-0004Sf-AV@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10103 has been created at faa93aff62a5bc381134720177918f09987ea61a (commit) - Log ----------------------------------------------------------------- commit faa93aff62a5bc381134720177918f09987ea61a Author: Mirko Tietgen <mirko at abunchofthings.net> Date: Tue Apr 23 18:05:22 2013 +0200 Bug 10103 UniqueItemFields is missing from sysprefs.sql Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql. Also fixes an unrelated missing semicolon in sysprefs.sql Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:25:02 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:25:02 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10073 created. v3.12.00-beta1-356-gab5c3ec Message-ID: <E1UVr4g-0004X1-L6@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10073 has been created at ab5c3eccf4a7e874f8b654c199caeeae9a98128f (commit) - Log ----------------------------------------------------------------- commit ab5c3eccf4a7e874f8b654c199caeeae9a98128f Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 18 10:03:38 2013 +0200 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT If you do not have ccode or location governed by authorized value (you can release this default connection in the marc structure), these item values are not passed through in the items section, created by buildKohaItemsNamespace for XSLTParse4Display. This simple patch checks if the authorized value hash on ccode or location returns something and passes the original value in otherwise. Test plan: Temporarily disconnect ccode and location from authorized values in MARC structure. Edit an item, put some values in location and ccode. Look at this record via opac search (XSLT enabled). Toggle the value of OPACItemLocation to show ccode or location before call number. Restore authorized values-connection when applicable. Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful to apply these patches when testing this. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> This works as described for the XSLT result list. The text is shown when OpacItemLocation is set to show collection or location. Note: Displaying location and collection without using authorised values doesn't work in other places like the detail page item table. So this will need more work to be fully functional. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9f8a7baa50bcb4ebcf096570d5c76ad15748dba7 Merge: 03b4dfe faa93af Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:17:09 2013 -0400 Merge branch 'bug_10103' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:26:56 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:26:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10040 created. v3.12.00-beta1-358-g0f2945d Message-ID: <E1UVr6W-0004YP-HF@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10040 has been created at 0f2945d768753b92c7014830efc31345d3ce7e87 (commit) - Log ----------------------------------------------------------------- commit 0f2945d768753b92c7014830efc31345d3ce7e87 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 20:59:08 2013 +0200 Bug 10040: Capitalization wrong when deleting subfields from authority Confirmation message for deleting subfields from an authority framework has wrong capitalization. To reproduce: 1) Go to Administration > Authority types 2) Click on MARC structure for one of the authority types 3) Click on the subfields link for one of the fields 4) Delete one of the subfields Signed-off-by: Owen Leonard <oleonard at myacpl.org> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit ff1567000846e41362424e69a6de686261e0f5f0 Merge: 9f8a7ba ab5c3ec Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:31:13 2013 -0400 Merge branch 'bug_10073' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:29:44 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:29:44 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9671 created. v3.12.00-beta1-360-g109f316 Message-ID: <E1UVr9E-0004Zz-MU@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9671 has been created at 109f316efb49287e92f56164f819d2ced03536c1 (commit) - Log ----------------------------------------------------------------- commit 109f316efb49287e92f56164f819d2ced03536c1 Author: Aaron Wells <aaronw at catalyst.net.nz> Date: Mon Mar 25 16:56:24 2013 +1300 Bug 9671: Make fines.pl help text more accurate To test: run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Documentation change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 86f3175a0dc6e22edff3d25ffbc39b561d5d9b70 Merge: ff15670 0f2945d Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:33:03 2013 -0400 Merge branch 'bug_10040' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:31:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:31:22 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9886 created. v3.12.00-beta1-362-g4b1c71e Message-ID: <E1UVrAo-0004cN-7n@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9886 has been created at 4b1c71e91a19fcf37e302bba66019807b18cb307 (commit) - Log ----------------------------------------------------------------- commit 4b1c71e91a19fcf37e302bba66019807b18cb307 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Mar 21 13:56:01 2013 +0100 Bug 9886: ParseLetter removes too often punctuation characters from fields This patch makes ParseLetter somewhat more restrictive in removing punctuation characters from the end of a table field. Based on the assumption that we want to remove punctuation from fields in biblio and biblioitems (like ISBD). ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still removes e.g. a colon (:) at the end of a title. Removed an unneeded global and lookahead from the regex. Test plan: 1) Add a colon (:) to the end of a title. 2) Add a colon to the end of item copynumber. 3) Place a hold on that item. Check it in. Confirm hold. 4) Check the email or print notice generated. There should be no colon at the end of the title, but the colon in the copynumber should still be there. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I compared checkout notices with lots of different fields before and after applying the patch. For example the ) at the end of a field in branches is now longer removed. Other fields looked ok before and after. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 12fd63da99b5d217e4537e3f346f1730997ec084 Merge: 86f3175 109f316 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:35:56 2013 -0400 Merge branch 'bug_9671' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:39:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:39:05 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-308-g5e89a7e Message-ID: <E1UVrIH-0004fJ-Pc@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 5e89a7e09866dcb88e45d5e69761f0854b15b775 (commit) via 6089118225d8f7520f960bd30a31057ca159a36b (commit) via cb2fb765efb4009dc13be5b4ca0da997313c3363 (commit) via 86e0a34bb1340806536a50da99a03c79a966bde5 (commit) via 5a086cfed7e43e2ccfaf5a4833e0ede945d26ddf (commit) from 393b226aca948e5136f69a2abb65467c61a78323 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5e89a7e09866dcb88e45d5e69761f0854b15b775 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Mar 21 13:56:01 2013 +0100 Bug 9886: ParseLetter removes too often punctuation characters from fields This patch makes ParseLetter somewhat more restrictive in removing punctuation characters from the end of a table field. Based on the assumption that we want to remove punctuation from fields in biblio and biblioitems (like ISBD). ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still removes e.g. a colon (:) at the end of a title. Removed an unneeded global and lookahead from the regex. Test plan: 1) Add a colon (:) to the end of a title. 2) Add a colon to the end of item copynumber. 3) Place a hold on that item. Check it in. Confirm hold. 4) Check the email or print notice generated. There should be no colon at the end of the title, but the colon in the copynumber should still be there. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I compared checkout notices with lots of different fields before and after applying the patch. For example the ) at the end of a field in branches is now longer removed. Other fields looked ok before and after. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 4b1c71e91a19fcf37e302bba66019807b18cb307) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 6089118225d8f7520f960bd30a31057ca159a36b Author: Aaron Wells <aaronw at catalyst.net.nz> Date: Mon Mar 25 16:56:24 2013 +1300 Bug 9671: Make fines.pl help text more accurate To test: run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Documentation change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 109f316efb49287e92f56164f819d2ced03536c1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit cb2fb765efb4009dc13be5b4ca0da997313c3363 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 20:59:08 2013 +0200 Bug 10040: Capitalization wrong when deleting subfields from authority Confirmation message for deleting subfields from an authority framework has wrong capitalization. To reproduce: 1) Go to Administration > Authority types 2) Click on MARC structure for one of the authority types 3) Click on the subfields link for one of the fields 4) Delete one of the subfields Signed-off-by: Owen Leonard <oleonard at myacpl.org> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 0f2945d768753b92c7014830efc31345d3ce7e87) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 86e0a34bb1340806536a50da99a03c79a966bde5 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 18 10:03:38 2013 +0200 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT If you do not have ccode or location governed by authorized value (you can release this default connection in the marc structure), these item values are not passed through in the items section, created by buildKohaItemsNamespace for XSLTParse4Display. This simple patch checks if the authorized value hash on ccode or location returns something and passes the original value in otherwise. Test plan: Temporarily disconnect ccode and location from authorized values in MARC structure. Edit an item, put some values in location and ccode. Look at this record via opac search (XSLT enabled). Toggle the value of OPACItemLocation to show ccode or location before call number. Restore authorized values-connection when applicable. Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful to apply these patches when testing this. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> This works as described for the XSLT result list. The text is shown when OpacItemLocation is set to show collection or location. Note: Displaying location and collection without using authorised values doesn't work in other places like the detail page item table. So this will need more work to be fully functional. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit ab5c3eccf4a7e874f8b654c199caeeae9a98128f) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5a086cfed7e43e2ccfaf5a4833e0ede945d26ddf Author: Mirko Tietgen <mirko at abunchofthings.net> Date: Tue Apr 23 18:05:22 2013 +0200 Bug 10103 UniqueItemFields is missing from sysprefs.sql Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql. Also fixes an unrelated missing semicolon in sysprefs.sql Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit faa93aff62a5bc381134720177918f09987ea61a) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 6 +++++- C4/XSLT.pm | 4 ++-- installer/data/mysql/sysprefs.sql | 3 ++- .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- misc/cronjobs/fines.pl | 7 +++---- 5 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 00:39:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 26 Apr 2013 22:39:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-363-g9fbdc7b Message-ID: <E1UVrII-0004fk-Uy@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9fbdc7b1d6edb9a49d21beccaaa38770119e396f (commit) via 4b1c71e91a19fcf37e302bba66019807b18cb307 (commit) via 12fd63da99b5d217e4537e3f346f1730997ec084 (commit) via 109f316efb49287e92f56164f819d2ced03536c1 (commit) via 86f3175a0dc6e22edff3d25ffbc39b561d5d9b70 (commit) via 0f2945d768753b92c7014830efc31345d3ce7e87 (commit) via ff1567000846e41362424e69a6de686261e0f5f0 (commit) via ab5c3eccf4a7e874f8b654c199caeeae9a98128f (commit) via 9f8a7baa50bcb4ebcf096570d5c76ad15748dba7 (commit) via faa93aff62a5bc381134720177918f09987ea61a (commit) from 03b4dfe846047f233d7de84d8987f6622ee24129 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9fbdc7b1d6edb9a49d21beccaaa38770119e396f Merge: 12fd63d 4b1c71e Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 18:37:35 2013 -0400 Merge branch 'bug_9886' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 6 +++++- C4/XSLT.pm | 4 ++-- installer/data/mysql/sysprefs.sql | 3 ++- .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- misc/cronjobs/fines.pl | 7 +++---- 5 files changed, 14 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 03:27:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 01:27:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-309-g00895ba Message-ID: <E1UVtvE-0006cj-NC@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 00895bab836e2698223c1e081868ef0932542d50 (commit) from 5e89a7e09866dcb88e45d5e69761f0854b15b775 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 00895bab836e2698223c1e081868ef0932542d50 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 21:32:49 2013 -0400 Bug 9659 follow-up: correct syntax for older Perl A construction that was a syntax error in older versions of Perl was causing problems for jenkins. This patch fixes it. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/ReportsGuided.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 03:27:29 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 01:27:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-364-g906bf78 Message-ID: <E1UVtvF-0006d5-Pc@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c (commit) from 9fbdc7b1d6edb9a49d21beccaaa38770119e396f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 26 21:32:49 2013 -0400 Bug 9659 follow-up: correct syntax for older Perl A construction that was a syntax error in older versions of Perl was causing problems for jenkins. This patch fixes it. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/ReportsGuided.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 07:14:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 05:14:45 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-33-g7afc07b Message-ID: <E1UVxTA-0007ZK-Tk@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 7afc07bfaae3b508a043ec426f161bbe0cd87f8d (commit) via c31ebb9a3383432ce460ac8f98e9e9b6e2f902dd (commit) from 951092bc3137c63dcae5dac1facfa7a7eef5b233 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7afc07bfaae3b508a043ec426f161bbe0cd87f8d Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Mar 7 12:17:33 2013 -0500 Bug 6898 - circulation librarians can't run overdues without reports permissions followup Better update database. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit c31ebb9a3383432ce460ac8f98e9e9b6e2f902dd Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Fri Feb 10 10:43:29 2012 -0500 Bug 6898 - circulation librarians can't run overdues without reports permissions This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items report, rather than requiring full reports permissions. Test plan : With a user with permissions circulate_remaining_permissions : - Add overdues_report permission to user - Go to circulation home => you see "Overdues" link - Clik on it => you are allowed to access and use this page - Remove overdues_report permission to user - Go to circulation home => you do not see "Overdues" link - Edit URL : <server>/cgi-bin/koha/circ/overdue.pl => you are not allowed to access this page - Go to main page => you don't have access to reports module Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> ----------------------------------------------------------------------- Summary of changes: circ/overdue.pl | 2 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++ .../prog/en/modules/circ/circulation-home.tt | 2 +- 12 files changed, 29 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:00:20 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:00:20 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-8-g63ff9d8 Message-ID: <E1UVyBI-0007mg-EQ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 63ff9d849db148f35393fee80997da5864141cd6 (commit) from ed0faee2e3eb81c32612807ec935d99d06a93814 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 63ff9d849db148f35393fee80997da5864141cd6 Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Feb 14 14:23:30 2013 +0100 Bug 9613: items namespace missing in XSLT In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined. This patch add this namespace where missing. Also corrects a koha.org, instead of koha-community.org, in one namespace URL. Test plan : - Enable XSLT on search results - Perform a search => Look at error logs to check that there is no xsl error like : [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> With comment on Bugzilla. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslimUtils.xsl | 1 + .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:00:34 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:00:34 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-40-g75334ca Message-ID: <E1UVyBW-0007nX-R3@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 75334ca55de4f15484cc524ad827d5862aa99ccd (commit) via 4a83dde8bf4b1f5110671c978b6cb4da38104cce (commit) via 49e363a4c571a22eb487082f5f1dbda01321525f (commit) via 74b4355cfda5008578e9b787e8f37171c4b28526 (commit) via 6da83232d242da58a3cee9ce50f11a50611e1f9b (commit) via aee438607062ea89e708644433990094954b0f06 (commit) via c7a722ea068c993c7cb351d77d0f8d0103030062 (commit) from 7afc07bfaae3b508a043ec426f161bbe0cd87f8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75334ca55de4f15484cc524ad827d5862aa99ccd Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Mar 27 13:57:01 2013 -0400 Bug 9839 - when importing MARC records, item record not created even when set to "always add" Test Plan: 1) Catalog a new record with an ISBN 2) Add some items to the record 3) Download the record as MARCXML 4) Delete the itemnumbers from the 952 fields in the record, Change the barcode fields to unused barcodes 5) Use xml2marc to save as a standard MARC file 6) Import the record using the 'Stage MARC for import' tool Use the settings: Record matching rule: ISBN Action if matching record found: ignore Action if no match found: ignore Item processing: always_add Check for embedded item record data?: Yes How to process items: Always add items 7) Import, note the bib is ignored, and the items are not processed 8) Undo import into catalog 8) Apply this patch 9) Import this batch into the catalog 10) Note the items were processed and are now added to the matching record Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Tested with UNIMARC record. I followed the test plan, just changing 952 by 995 Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 4a83dde8bf4b1f5110671c978b6cb4da38104cce Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com> Date: Thu Feb 14 14:23:30 2013 +0100 Bug 9613: items namespace missing in XSLT In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined. This patch add this namespace where missing. Also corrects a koha.org, instead of koha-community.org, in one namespace URL. Test plan : - Enable XSLT on search results - Perform a search => Look at error logs to check that there is no xsl error like : [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> With comment on Bugzilla. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 49e363a4c571a22eb487082f5f1dbda01321525f Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Apr 8 10:13:11 2013 -0400 Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned The fix for Bug 9397 moved the "cannot check in" heading from within the one conditional where it should have been displayed to the top of all check-in errors/messages. "Cannot check in" is still only valid if the item is withdrawn and BlockReturnOfWithdrawnItems is ON. In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this patch puts "cannot check in" back into the correct conditional and adds a generic heading to check in messages for accessibility purposes. To test, check in items which will trigger a variety of errors including: - item must be returned to home library - item is lost - item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off) - item is overdue ...as well as items which should check in normally. Messages should display correctly. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 74b4355cfda5008578e9b787e8f37171c4b28526 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Apr 17 14:07:55 2013 -0400 Bug 10072 - "my suggestions" always says "There are no pending purchase suggestions." Test Plan: 1) Switch off the IndependantBranches syspref 2) Log into the OPAC 3) Place a suggestions 4) Instead of seeing your suggestion, you will see "There are no pending purchase suggestions." 5) Apply this patch 6) Reload the page 7) You should now see your suggestions Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 6da83232d242da58a3cee9ce50f11a50611e1f9b Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 21:56:53 2013 +0200 Bug 10058 - Fix unapi for NORMARC This patch uses a lot of MARC21 XSLT to transform NORMARC records to desired formats. Since NORMARC is mostly a subset of MARC21, I think this should give passable results. And better results than no unapi-support at all for NORMARC! To reproduce: - Make sure you have marcflavour = NORMARC - Visit /cgi-bin/koha/unapi in a browser - Observe the empty <formats></formats> element To test: - Apply the patch - Visit /cgi-bin/koha/unapi in a browser - Observe the the list of formats in the <formats></formats> element - Import the provided sample NORMARC record and make a note of its biblionumber - View the record at /cgi-bin/koha/unapi?id=koha:biblionumber:x&format=y where x = the biblionumber of the sample record and y = one of the formats marcxml, marcxml-full, mods, mods-full, mods3, mods3-full, oai_dc, rdfdc, rss2, rss2-full and srw_dc - Check that the transformed records make some kind of superficial sense Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit aee438607062ea89e708644433990094954b0f06 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Apr 9 15:44:45 2013 -0400 Bug 10002 - Don't include line breaks in strings that are translated Several JS alert messages contain "\n" which is problematic for translation. This patch removes those instances (a line break is not strictly necessary anyway). Also corrected: two instances of "holds(s)" To test, place a hold on a title with items. From the biblio detail page choose Edit -> Delete all items and Edit -> Delete record. In each case you should see error messages with no line breaks and no misspellings. Delete all items attached to the record with holds from the item edit page. Go back to the detail page and choose Edit -> Delete record. You should see an error message about existing hold(s) with no line breaks or misspellings. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Harmless change, fixes misspellings and makes translations easier Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit c7a722ea068c993c7cb351d77d0f8d0103030062 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Apr 8 10:26:06 2013 -0400 Bug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip This patch removes the extra i in "sliip." To test, go to Tools -> Notices & Slips and view the help file. The last bulleted item on the page should contain no typo. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> Comment: Can't resist to sign Bug 10000!! Work as described. No errors. Signed-off-by: Galen Charlton <gmc at esilibrary.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Can't resist to QA - All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 1 + C4/Suggestions.pm | 4 ---- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++- .../prog/en/modules/help/tools/letter.tt | 4 ++-- .../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslimUtils.xsl | 1 + .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 1 + opac/unapi | 13 +++++++++++++ 9 files changed, 25 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 08:04:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 06:04:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-42-g61d8236 Message-ID: <E1UVyFD-0007pq-KJ@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 61d82360beae443b21ca439b97fe033bb5920173 (commit) via 9e2b58b582531859fbdede3b327c18b5f7db8e6e (commit) from 75334ca55de4f15484cc524ad827d5862aa99ccd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 61d82360beae443b21ca439b97fe033bb5920173 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Fri Apr 19 22:52:07 2013 -0400 Bug 10085: unapi does not function under Plack The following errors appear when trying to use unapi under Plack (among others): Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160. Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173. Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174. Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185. To test: 1) Try to view /cgi-bin/koha/unapi under Plack 2) There is no step 2. Plack crashes. 3) Apply patch. 4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> I'm puzzled how this ever worked anyway, accidentally i'm guessing, this tidies up some lazy coding Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 9e2b58b582531859fbdede3b327c18b5f7db8e6e Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Feb 7 09:57:47 2013 -0500 Bug 9523: importing staged bib records hangs if a matched bib has been deleted Test Plan: 1) Stage a MARC record file that will have matches with existing records 2) Delete the bib from Koha that was matched on 3) Attempt to import the records into Koha, the import will hang 4) Apply the patch 5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed. Signed-off-by: Galen Charlton <gmc at esilibrary.com> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 1 + opac/unapi | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:09:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:09:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10110 created. v3.12.00-beta1-368-g8084a70 Message-ID: <E1UW30j-0000mq-AY@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10110 has been created at 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 (commit) - Log ----------------------------------------------------------------- commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 3d589018e75c71999d308c587f1fcaf63cc81be5 Merge: 906bf78 5b6f897 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:08:15 2013 -0400 Merge branch 'bug_9684' into 3.14-master commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:10:09 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:10:09 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_9684 created. v3.12.00-beta1-365-g5b6f897 Message-ID: <E1UW317-0000na-5X@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_9684 has been created at 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 13:15:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 11:15:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10093 created. v3.12.00-beta1-371-g97596d9 Message-ID: <E1UW36X-0000pi-Ha@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10093 has been created at 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 (commit) - Log ----------------------------------------------------------------- commit 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:25 2013 -0400 Add Stefano Bargioni to the history Welcome, Stefano, you are the 209th developer with a patch in Koha! Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2 Author: Stefano Bargioni <bargioni at pusc.it> Date: Fri Apr 26 11:18:52 2013 +0200 Bug 10093 - Typo in marc21_leader.tt fixed a typo in marc 21 leader builder about the value 'b', Serial component part Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Good catch. Template change only. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit df4b4435970285f2303214e49f390c16e16a01e2 Merge: 3d58901 8084a70 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:15:38 2013 -0400 Merge branch 'bug_10110' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:06:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:06:26 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_2046 created. v3.12.00-beta1-374-ge1ecd7a Message-ID: <E1UW3ta-000174-Nn@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_2046 has been created at e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 (commit) - Log ----------------------------------------------------------------- commit e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:11:39 2013 -0400 Bug 2046: Increment version number Database update for bug 2046 has been given version 3.11.00.203 commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5 Author: Kristina D.C. Hoeppner <kristina at catalyst.net.nz> Date: Fri Mar 29 15:04:42 2013 +1300 Bug 2046 - Suggestions: Title Field too small Increase both on staff and OPAC interface from 80 to 255 characters to be saved in the database. Shown will be 80 characters. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Clean patch, workes as described. To test: - Apply patch and run database update - Check that the column in the database is now varchar(255) - Enter a new suggestion in the OPAC - Edit this suggestion in staff - Confirm form has the new max value set Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit eae18676cc7057c4d521685a3c1ab20912e2cbf1 Merge: df4b443 97596d9 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:50 2013 -0400 Merge branch 'bug_10093' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:17:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:17:22 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_10088 created. v3.12.00-beta1-376-gf2e4471 Message-ID: <E1UW44A-0001Ca-4F@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug_10088 has been created at f2e44716f60578b9663862d7b2ba3b16f7067143 (commit) - Log ----------------------------------------------------------------- commit f2e44716f60578b9663862d7b2ba3b16f7067143 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Apr 25 09:47:53 2013 +0200 Bug 10088: FIX adding an order from a staged file. Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay routine. The existence of $defaulvalue hashref should be tested before getting to the branchcode key. Test plan: Before applying the patch, an error occurred when you try to create an order from a staged file. After applying the patch, the error does not appear anymore. Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 5c529f2339a3033c26f20890e18ab2284357c6a1 Merge: eae1867 e1ecd7a Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:12:18 2013 -0400 Merge branch 'bug_2046' into 3.14-master ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:18:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:18:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-317-ga8ee942 Message-ID: <E1UW44x-0001Dl-AH@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a8ee942442d42e7ae4f42567eba22f33725188a5 (commit) via 59ce0cd4a6863770e1cc6b956512e5698f94e06b (commit) via 8bb6bafbeb827cef15922ce497a7a73ebbfc3a6e (commit) via 2dbe9386065567f0f535188d843dfe12765f5fed (commit) via 239d37cb7e6d34fecd0050eadd5ac771c9ff5bda (commit) via b247b2c5217be18cc4f2fdd96877bac9b6eb9eab (commit) via 79a9b11a7937bab8397ec526114b0c072b253b17 (commit) via c48be8b905efa9ba4e472dbcbcea6ee15a92e075 (commit) from 00895bab836e2698223c1e081868ef0932542d50 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a8ee942442d42e7ae4f42567eba22f33725188a5 Author: Jonathan Druart <jonathan.druart at biblibre.com> Date: Thu Apr 25 09:47:53 2013 +0200 Bug 10088: FIX adding an order from a staged file. Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay routine. The existence of $defaulvalue hashref should be tested before getting to the branchcode key. Test plan: Before applying the patch, an error occurred when you try to create an order from a staged file. After applying the patch, the error does not appear anymore. Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 59ce0cd4a6863770e1cc6b956512e5698f94e06b Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:11:39 2013 -0400 Bug 2046: Increment version number Database update for bug 2046 has been given version 3.11.00.203 (cherry picked from commit e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 8bb6bafbeb827cef15922ce497a7a73ebbfc3a6e Author: Kristina D.C. Hoeppner <kristina at catalyst.net.nz> Date: Fri Mar 29 15:04:42 2013 +1300 Bug 2046 - Suggestions: Title Field too small Increase both on staff and OPAC interface from 80 to 255 characters to be saved in the database. Shown will be 80 characters. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Clean patch, workes as described. To test: - Apply patch and run database update - Check that the column in the database is now varchar(255) - Enter a new suggestion in the OPAC - Edit this suggestion in staff - Confirm form has the new max value set Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 2dbe9386065567f0f535188d843dfe12765f5fed Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 07:21:25 2013 -0400 Add Stefano Bargioni to the history Welcome, Stefano, you are the 209th developer with a patch in Koha! Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 97596d94982ce8c7ea4f2e8a29f724cb97cc1613) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 239d37cb7e6d34fecd0050eadd5ac771c9ff5bda Author: Stefano Bargioni <bargioni at pusc.it> Date: Fri Apr 26 11:18:52 2013 +0200 Bug 10093 - Typo in marc21_leader.tt fixed a typo in marc 21 leader builder about the value 'b', Serial component part Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Good catch. Template change only. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit b247b2c5217be18cc4f2fdd96877bac9b6eb9eab Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit 79a9b11a7937bab8397ec526114b0c072b253b17 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> commit c48be8b905efa9ba4e472dbcbcea6ee15a92e075 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> (cherry picked from commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3) Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ C4/Items.pm | 6 +++++- catalogue/showmarc.pl | 7 +++++-- docs/history.txt | 1 + installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../cataloguing/value_builder/marc21_leader.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +- kohaversion.pl | 2 +- reports/guided_reports.pl | 15 ++++++++++----- 11 files changed, 36 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 14:18:12 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 12:18:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-377-g9c79f18 Message-ID: <E1UW44y-0001EF-Gl@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9c79f183174d710f37b414c8dfa0b94ea2b8036a (commit) via f2e44716f60578b9663862d7b2ba3b16f7067143 (commit) via 5c529f2339a3033c26f20890e18ab2284357c6a1 (commit) via e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1 (commit) via 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5 (commit) via eae18676cc7057c4d521685a3c1ab20912e2cbf1 (commit) via 97596d94982ce8c7ea4f2e8a29f724cb97cc1613 (commit) via 9a449ce16ce00d667ff12ec262dc02e973a21cc2 (commit) via df4b4435970285f2303214e49f390c16e16a01e2 (commit) via 8084a70a3b13a87a516844ee7b7f3665aa8c1e95 (commit) via d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9 (commit) via 3d589018e75c71999d308c587f1fcaf63cc81be5 (commit) via 5b6f89714d58d4a7c33b621b2cefbc02523dafa3 (commit) from 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c79f183174d710f37b414c8dfa0b94ea2b8036a Merge: 5c529f2 f2e4471 Author: Jared Camins-Esakov <jcamins at cpbibliography.com> Date: Sat Apr 27 08:23:34 2013 -0400 Merge branch 'bug_10088' into 3.14-master ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ C4/Items.pm | 6 +++++- catalogue/showmarc.pl | 7 +++++-- docs/history.txt | 1 + installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../cataloguing/value_builder/marc21_leader.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +- kohaversion.pl | 2 +- reports/guided_reports.pl | 15 ++++++++++----- 11 files changed, 36 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:27:42 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:27:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-10-g5ad048b Message-ID: <E1UWCek-00040E-A8@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.8.x has been updated via 5ad048bb78b560ca821f4531e62c545d76999855 (commit) via b7cdee156e47617ff79849321b178f66ec7058e6 (commit) from 63ff9d849db148f35393fee80997da5864141cd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ad048bb78b560ca821f4531e62c545d76999855 Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit b7cdee156e47617ff79849321b178f66ec7058e6 Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:28:04 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:28:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-48-g31a6b22 Message-ID: <E1UWCf6-000412-N4@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 31a6b2265315a9ac376887a64c6f532b94a28cce (commit) via a43c5d0bdd2413d6a125b10710deab6e38026404 (commit) via 042012cfe2d87cea0b569dad37dba6f12c1107d7 (commit) via 958e7626f16d46c9e1e8c81e8c9614364966deec (commit) via 575f8ed4425a7de45765ef10866569ff52645e6b (commit) via 652f01bdb32e2bff665add37c6d4863c679ec96a (commit) from 61d82360beae443b21ca439b97fe033bb5920173 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31a6b2265315a9ac376887a64c6f532b94a28cce Author: Tomas Cohen Arazi <tomascohen at gmail.com> Date: Wed Apr 24 11:40:18 2013 -0300 Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC This bug is present in master and (at least 3.8.x, where we spotted it). The patch makes adding items, to a list from the results page, not rely only on opacbookbag syspref but also 'virtualshelves'. Regards To+ PS: Thanks Graciela Galli for reporting. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Template only patch, works nicely. Test plan copied from bug report: - Disable the opacbookbag syspref - Login in the OPAC - Create a list (I tested a private one) - Search in your db for some biblios. - Choose some and add them to the created list - Go to your users's page, to the my lists tab - Your list is empty. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit a43c5d0bdd2413d6a125b10710deab6e38026404 Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr> Date: Sun Mar 17 19:11:29 2013 +0100 Bug 9831: Correct and add authorised values un French UNIMARC installer 2d version, Correcting a typo In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong. A lot of unimarc function codes and language codes are missing. Reference for country codes is ISO 3166-1 standard Reference for language codes is ISO 632-2 standard Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website) This patch correct wrong values and add new ones. For the moment I keep some wrong codes, because they may be used by some librairies : - language codes deu, lan, mla, sam - function codes 571, 573, 574, 575 To test : 1) take a fresh new koha 2) apply patch 3) install Koha, choosing French UNIMARC settings 4) look if values are OK in authorised values and if you can use them in cataloguing module Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> SQL change only, French installer installs authorised values without problems. Note: There is a problem loading sample labels unrelated to this patch: sample_labels.sql ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 042012cfe2d87cea0b569dad37dba6f12c1107d7 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Mon Apr 15 06:21:55 2013 +0200 Bug 9818: Fixing capitalization and remove dollar sign Overdue Fines Cap ($) > Overdue fines cap (amount) To test: Go to administration > circulation and fine rules Check column label Overdue fines cap now follows capitalization rules and has no dollar sign. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 958e7626f16d46c9e1e8c81e8c9614364966deec Author: Magnus Enger <magnus at enger.priv.no> Date: Mon Apr 15 20:24:08 2013 +0200 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the wrong name, and called it biblio-zebra-indexdefs.xml. This patch fixes that. To reproduce: - Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra- indexdefs.xml exists To test: - Apply the patch and check that etc/zebradb/marc_defs/normarc/ biblios/biblio-zebra-indexdefs.xml no longer exists, but that etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml does exist. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 575f8ed4425a7de45765ef10866569ff52645e6b Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Apr 10 14:24:16 2013 -0400 Bug 10026 - OPAC cart not showing location anymore When Bug 7570 added availability information to the cart it switched which subroutine was used to get item information, and thus changed how the information was being returned. This patch makes accommodations for this change by adding processing of item location information to the script in a way that will match the existing template variables. To test, add items to the cart in the OPAC some of which include shelving location information. When you view the cart you should see the shelving location displayed. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 652f01bdb32e2bff665add37c6d4863c679ec96a Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Apr 14 19:29:13 2013 +0200 Bug 8294: Fix display of serial enumeration for OPAC holds It turns out that this was not a missing but a broken feature. This patch corrects the template variables to make enumchron show up on the item table for item level holds in the OPAC. To test: Try to place item level holds on 1) a record where at least one item 2) a record where none of the items has items.enumchron information. The column with enumchron should only show for 1), but not for 2). Signed-off-by: David Cook <dcook at prosentient.com.au> Works as described. Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com> Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: ...bra-indexdefs.xml => biblio-koha-indexdefs.xml} | 0 .../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++----- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 4 +- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- opac/opac-basket.pl | 4 + 6 files changed, 454 insertions(+), 145 deletions(-) rename etc/zebradb/marc_defs/normarc/biblios/{biblio-zebra-indexdefs.xml => biblio-koha-indexdefs.xml} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 27 23:53:47 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 27 Apr 2013 21:53:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-51-g70f32c0 Message-ID: <E1UWD3z-0004DV-PT@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.10.x has been updated via 70f32c0d3f0883167359242a9d54492e612f3f49 (commit) via 0159cab8767bec0f48d5a43dc11da9ef22315203 (commit) via f06fff86051e9ab15048382185e6379cb17d0396 (commit) from 31a6b2265315a9ac376887a64c6f532b94a28cce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70f32c0d3f0883167359242a9d54492e612f3f49 Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Fri Apr 26 17:11:37 2013 +0100 Bug 9684 : Correct path to compact.xsl When try to display card view of retrieved record error occurred as compact.xsl could not be found script was constructing path as though it was opac Also added fallback to en version if no xsl file found under current lang as done in opac-showmarc.pl Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Test plan: * Set sys pref to use CCSR * Do a Z39.50 Search * Click 'card' on one of the results * confirm that there is no error. All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> I am astonished that opacthemes affects Z39.50 search in staff so this might be fixing a bigger problem. Checked that clicking on Card works for both themes now correctly after I confirmed the bug. Also all views in OPAC were checked for both themes. All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 0159cab8767bec0f48d5a43dc11da9ef22315203 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 14:48:03 2013 +0200 Bug 10110 Followup for Acquisition.pm Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Adds a comment, no danger from that. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit f06fff86051e9ab15048382185e6379cb17d0396 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Apr 25 13:54:31 2013 +0200 Bug 10110: Problems with diacritics in saved SQL reports Adds decoding for cgi params (for completeness). Apparently, the NAME attribute of DBI statement handle has a UTF8 bug. Fixing this by decoding the returned column names. Did this in a shared routine. http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Copying test plan from bug report: Example SQL: select branchname as "Bibliothek (???)", branchname "Bibiothek (??a)", branchname from branches where branchcode = <<Bibliotheksk?rzel|branches>> 1) Create report with given example SQL or your own including some diacritics in the columnnames 2) Save the report and run it 3) Verify column names are broken before patch, but fixed after.. All tests and QA script pass. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ catalogue/showmarc.pl | 7 +++++-- reports/guided_reports.pl | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 30 00:12:03 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 29 Apr 2013 22:12:03 +0000 Subject: [koha-commits] main Koha release repository branch new/bug6554_reverts created. v3.12.00-beta1-390-g16753c7 Message-ID: <E1UWwIl-0001Is-AY@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, new/bug6554_reverts has been created at 16753c750d97385ad243329aa6a1328352749bb1 (commit) - Log ----------------------------------------------------------------- commit 16753c750d97385ad243329aa6a1328352749bb1 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:39 2013 -0700 Revert "Bug 6554 Followup for circulation patron search" This reverts commit f257944d10c2660e7d7297768af314985c80a1c7. Rolling back bug 6554 work until we have more comprehensive tests. commit 5e47f766a2b5fc85e766e1fc67b054e971185de7 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:31 2013 -0700 Revert "Bug 6554: Followup for preferences.pl" This reverts commit c78b905811ed4869a4a69f60272e1b7787026f6e. Rolling back bug 6554 work until we have more comprehensive tests. commit 7459297a3a4500cf0115962a81366a42a398be8f Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:24 2013 -0700 Revert "Bug 6554: Followup for acquisitions" This reverts commit b2b003adea685acf3f590ed00baf7abec734341f. Rolling back bug 6554 work until we have more comprehensive tests. commit 7c6e4f5a8d6e101377f949e1967bce8ae017ea4e Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:18 2013 -0700 Revert "Bug 6554: Followup for serial search" This reverts commit c18cd930eb3d15e20c642b2788116cc2abb30538. Rolling back bug 6554 work until we have more comprehensive tests. commit 94508a5c3d712f03d25ef63c40830b0c147140c5 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:17:06 2013 -0700 Revert "Bug 6554 QA Followup" This reverts commit 686fdae32c2377b8748f71c534b5f32a2a83e850. Rolling back bug 6554 work until we have more comprehensive tests. commit a7eb34f2c8a281ef83f711e581079a2232296c88 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:12:32 2013 -0700 Revert "Bug 6554 - make Koha internally utf-8 clean" This reverts commit d542740ab8877234d043c8a11cb19a6004e72656. Rolling back bug 6554 work until we have more comprehensive tests. Conflicts: opac/opac-search.pl commit 4ba31d2e2802183d8b1d1de466e9219107c7f061 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:10:45 2013 -0700 Revert "Bug 6554 Fix error caused by modifying $_ in a map" This reverts commit e98fe7e32244fa11d218b4d2a1006eea547e70d8. Rolling back bug 6554 work until we have more comprehensive tests. commit 3536b10acf223b33819153532841494c816d6375 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:10:23 2013 -0700 Revert "Bug 10074 - Encoding problems at login time" This reverts commit 5805b5f363bd657d3dac6aeba225438bf80cae9b. Rolling back bug 6554 work until we have more comprehensive tests. commit abe349ed6cc0b2296634b66d71de703fcd99a5a4 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:09:48 2013 -0700 Revert "Bug 10074 - Encoding problems for installer" This reverts commit d0c6e09429d2af711f911b57601a02f17591d441. Rolling back bug 6554 work until we have more comprehensive tests. commit ad5e44bcde5948f73effb0732f79f8ceec2abf99 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:06:12 2013 -0700 Revert "Bug 10074: QA Followup for InstallAuth.pm" This reverts commit e848d89e45d3e6610c3e9d246bd3672636dd63fb. Rolling back bug 6554 work until we have more comprehensive tests. commit 327b6c6ce31942963efcc03d5aea2981250360f2 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:05:22 2013 -0700 Revert "Bug 10019: Fix for userid containing UTF8 chars" This reverts commit 7e90e1524f7e586dac0f98241ace430e5cbeac7f. Rolling back bug 6554 work until we have more comprehensive tests. commit 11b62318f445ca514d8c55d8c2973b45bdaa6295 Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:04:38 2013 -0700 Revert "Bug 9951: Followup for Tools" This reverts commit 252568aa8babdcc9508d3b3c7626543bfa648d99. Rolling back bug 6554 work until we have more comprehensive tests. commit 5948badf43bd30e5a6c52f30f440f400bcdbb51c Author: Galen Charlton <gmc at esilibrary.com> Date: Mon Apr 29 15:03:45 2013 -0700 Revert "Bug 9951: Followup for tools/viewlog.pl" This reverts commit de7ba790fd2533bcf44ad7fd2f1255514ed9313c. Rolling back bug 6554 work until we have more comprehensive tests. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository