[koha-commits] main Koha release repository branch master updated. v3.14.00-353-ge276049
Git repo owner
gitmaster at git.koha-community.org
Thu Jan 23 17:37:24 CET 2014
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 e276049746bf3cffc835eeee596040967b4ac9cc (commit)
via 1b56285e2250737a1a2282f2e3e8b4d0f1e0818c (commit)
via 9237ee80c4e6724f56999c86767477907426aac3 (commit)
via c4998fc9045af72ff2cfbb8f30c9d16012ebb791 (commit)
via eba01fcafb438fd2523017a553ea39ffc23b7799 (commit)
via ce2b280903060a37e1cabeba66fc89a833a529a1 (commit)
via 9cb6174653185e8ea37871245c8d25092d8e4a81 (commit)
via 6e861c5563ddd807088e31a11776fb49014de27e (commit)
via 6d63881e0447bae83d21b6f082ee1549277c6071 (commit)
via e974b554a5cc08413e66c43072e857f3d2b5458e (commit)
via cbffe7bf245743aaa8b497c819f3532bd6982235 (commit)
via 795421a643fb3247500e773af60988d051ee8917 (commit)
via 17d880b6ce22ba9eded49b6e260f2a1bb6184c6b (commit)
via c21cef38643a55313c21505ee2f47c82f20229af (commit)
via 7cae63657737bbff3cb583bd69a80a414cdcb6cc (commit)
via 2754c7897e47e8e9ed02215b742ad92e3d8d483d (commit)
via 1633b17ee3968607f45e2e9bc5045072fedf3141 (commit)
from fc698eed06ec9a7335c4b94362917d2b364b44c4 (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 e276049746bf3cffc835eeee596040967b4ac9cc
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Jan 23 16:53:44 2014 +0000
Bug 10922: (follow-up) remove display of form parameter
This patch removes the display of the close parameter
in the "Accounting details" legend added by the previous patch --
this was obviously a bit of stray debug logic.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 1b56285e2250737a1a2282f2e3e8b4d0f1e0818c
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Fri Sep 20 13:09:38 2013 +0200
Bug 10922: Display whether prices are include or don't include tax when creating a new order
This patch adds "(tax inc.)" or "(tax exc.)" after the "Vendor price",
"Replacement cost", "Budgeted cost" and "Actual cost" when entering
a new order. This reflects the value of the list and invoice prices
include/don't include tax flags in the vendor record.
Actual cost must probably not be displayed here, but it will be the
subject of an other patch.
To test :
- create 2 vendors, with differents values for "List prices includes
tax" and "Invoiced prices does includes tax" options
- create baskets for these 2 vendors
- create an order in each basket, and look at the "tax. inc." and
"tax exc" mention. It should be consistent with the options for
each vendor
- look at an order adding "&close=1" to the normal URL of the order.
You must see the order without ability to edit it, but with the same
mentions "tax inc." and "tax exc."
Signed-off-by: Isabelle Beroud <isabelle.beroud at univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes tests and QA script.
I have some doubts about the calculations done here, but the
display changes are correct.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9237ee80c4e6724f56999c86767477907426aac3
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Dec 16 11:57:15 2013 +0100
Bug 11397: Remove the itemnumber list on the Acquisition detail tab
The list of links to items from the acquisitions tab can be
unwieldy if an order was used to purchase a lot of them, and the
availability of AcqItemSetSubfieldsWhenReceived and filters on the
holdings table provide alternative ways to do things like turn
off on-order statuses.
Test plan:
- verify this patch does not introduce regression on the enhancement
introduced by bug 8230.
- verify the itemnumber list does not appears anymore.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
The acquisitions details tab on the holdings table in the staff
client no longer shows the links to the items. Tests pass.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
In my tests the itemnumbers didn't show up on the acquisition
detail tab before the patch. So the patch visually only changed
the column header for me. All other acquisition related information
showed up ok.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c4998fc9045af72ff2cfbb8f30c9d16012ebb791
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Jan 17 16:31:54 2014 +0100
Bug 11429: Manage display for basketgroup without name
If a basketgroup does not have a name, the link was ' (closed)'
Now it is "Basket group no. ID (closed)".
This is used on the acqui/basketgroup.pl?booksellerid=XX page
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script. Adds a link to the basket group page
on the basket summary page. The link only appears when the basket
group is closed.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit eba01fcafb438fd2523017a553ea39ffc23b7799
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Thu Dec 19 22:58:35 2013 +0100
Bug 11429: Add a link to basketgroup in basket detail page
If a basket is in a closed basketgroup, the basketgroup name is
currently displayed.
This patch adds a link around the basketgroup name if the librarian
has permission to manage basketgroups.
Test:
A. With a librarian with rights for managing basketgroups
Display a closed basket that is grouped in a basketgroup
Check the name of the basketgroup is now a link
Click on the link and check you are seeing information about the
right basketgroup
B. With a librarian WITHOUT rights for managing basketgroups
Display a closed basket that is grouped in a basketgroup
Check the name of the basketgroup is not a link
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ce2b280903060a37e1cabeba66fc89a833a529a1
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Sun Dec 22 23:34:18 2013 +0100
Bug 11435: Show basketgroup information in Acquisition tab in catalogue page
This patch adds a new column for displaying information about
basketgroups in the Acquisition tab on catalogue page for a record.
It also adds the number of the basket in the basket column.
If the user does not have group_manage permission, he just see the basketgroup name
and number.
If he has the permission, he can click to display the basketgroup.
If the basket is not in a basketgroup, the column is empty.
To test:
- Use a record in an order, and put the basket in a basketgroup.
- Connect with a user WITHOUT group_manage permission (but with order_manage
permission).
- Go to the record's detail in catalogue and click on Acquisition tab.
- Check you see the name and number of the basketgroup, with no link
around it.
- Check the number of the basket is displayed within () after the name of
the basket
- Click on the basket link, check the basket displayed is the right one.
- Connect with a user WITH group_manage permission.
- Go to the record's detail in catalogue and click on Acquisition tab.
- Check you see a link with the name and number of the basketgroup.
- Click on the link, check the basketgroup displayed is the right one.
- On the basketgroup page, move the basket out of the basketgroup, and
save the basketgroup.
- Go back to the record's page on the catalogue and click on Acquisition
tab.
- Check the basketgroup column is empty
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9cb6174653185e8ea37871245c8d25092d8e4a81
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Jan 17 11:21:05 2014 +0100
Bug 11549: [follow-up] Make NewOrder calculate new parent_ordernumber
If parent_ordernumber is not set in NewOrder parameter, it is
automatically set to ordernumber.
This patch only avoid code duplication.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
This solution is better!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script. Also all tests in
t/db_dependent/Acquisitions/.
Confirmed bug and that the patch fixes it.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6e861c5563ddd807088e31a11776fb49014de27e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jan 14 12:13:31 2014 +0100
Bug 11549: (follow-up) interpolated variables into SQL statements should not be allowed
Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6d63881e0447bae83d21b6f082ee1549277c6071
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jan 14 12:06:34 2014 +0100
Bug 11549: make it possible to receive and cancel the receipt of a transferred order
To reproduce the issue:
- transfer an order from a basket to another. Note the previous
ordernumber (X) and the new one (Y).
- receive the order
- cancel the receipt
- verify the order has been deleted:
select count(*) from aqorders where ordernumber=Y;
select * from aqorders_transfers where ordernumber_from = X;
The value for ordernumber_to is null.
To test this patch:
- apply this patch
- transfer an order from a basket to another
- receive the order
- cancel the receipt
- verify the order still exist in the basket where the transfer has been
done.
Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e974b554a5cc08413e66c43072e857f3d2b5458e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jan 14 12:04:24 2014 +0100
Bug 11549: Add regression test
test plan:
prove t/db_dependent/Acquisition/TransferOrder.t should fail before the
patch and success after applying it.
Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Testing notes on last patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cbffe7bf245743aaa8b497c819f3532bd6982235
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Jan 15 10:14:48 2014 +0100
Bug 11141: (follow-up) ensure filters are kept if the receive is cancelled
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 795421a643fb3247500e773af60988d051ee8917
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Oct 25 16:35:44 2013 +0200
Bug 11141: retain pending order filters during receiving.
On receiving orders, the librarian has to filter again the pending
orders list.
This patch stores the filters in a cookie in order to apply them when
the librarian finish a receive and come back on the pending orders list.
Test plan:
1/ choose a vendor with several baskets and orders.
2/ start to receive an item.
3/ on the pending orders page, add some relevant filters.
4/ receive an item.
5/ you are back on the pending orders page and filters are directly
applied.
Signed-off-by: Nicolas Bravais <nicolas.bravais at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Tested with receiving and cancelling the receive process the
filters are kept.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 17d880b6ce22ba9eded49b6e260f2a1bb6184c6b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Nov 27 16:35:54 2013 +0100
Bug 11312: make facets selectable using an ID [opac-bootstrap]
Signed-off-by: Francesca Moore <francescalamoore at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c21cef38643a55313c21505ee2f47c82f20229af
Author: Francesca Moore <francescalamoore at gmail.com>
Date: Tue Jan 14 14:42:38 2014 +1300
Bug 11312: make facets selectable using an ID -- opac-bootstrap
To test:
1. search in OPAC directory
2. inspect the facets, note that they now have spans
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described.
I'm not sure that this change is necessary, since the parent li elements
have IDs that can be hooked onto for CSS, but it doesn't change existing
behaviour and more control is always nice, so that's all right.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 7cae63657737bbff3cb583bd69a80a414cdcb6cc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Nov 27 16:35:27 2013 +0100
Bug 11312: make facets selectable using an ID [opac-prog]
Signed-off-by: Francesca Moore <francescalamoore at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2754c7897e47e8e9ed02215b742ad92e3d8d483d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Nov 27 16:34:12 2013 +0100
Bug 11312: make facets selectable using an ID [staff]
Test plan:
launch a search and verify all facet headers have an id.
Signed-off-by: Francesca Moore <francescalamoore at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 1633b17ee3968607f45e2e9bc5045072fedf3141
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Fri Dec 27 00:44:28 2013 -0300
Bug 11453: Update EN default UNIMARC bibliographic framework
This patch updates default EN UNIMARC bibliographic framework
I used the 2008 version of the UNIMARC bibliographic manual,
and added updates listed on official site.
There are new fields/subfields, those added are hidden by
default.
There are some description changes, and also a lot of
changes to repeatable and mandatory values.
To test:
a) Functional
1) Remove all bibliographic frameworks
2) Load new file unimarc_framework_DEFAULT.sql
3) Check that it load without errors
b) Correctness
1) Take a time and verify that all new
fields/subfileds are correct
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Huge patch, lots of additions and corrections.
To view the changes git diff --color-words HEAD^ is helpful.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 5 +-
acqui/finishreceive.pl | 2 +-
acqui/parcel.pl | 23 +-
catalogue/detail.pl | 16 +-
.../mandatory/unimarc_framework_DEFAULT.sql | 2237 ++++++++++++++------
.../intranet-tmpl/prog/en/includes/facets.inc | 16 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 +-
.../prog/en/modules/acqui/neworderempty.tt | 16 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 18 +
.../prog/en/modules/catalogue/detail.tt | 39 +-
.../bootstrap/en/includes/opac-facets.inc | 21 +-
.../opac-tmpl/prog/en/includes/opac-facets.inc | 18 +-
t/db_dependent/Acquisition/TransferOrder.t | 11 +-
14 files changed, 1730 insertions(+), 705 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list