[koha-commits] main Koha release repository branch master updated. v3.14.00-1073-gbbd3db8
Git repo owner
gitmaster at git.koha-community.org
Sun May 4 23:32:37 CEST 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 bbd3db8c84af321485d93352ee6ccb83a96b61be (commit)
via 3db3c984d14113ddc6d9926bcd2ee34fab8c3de5 (commit)
via bfb88cc4e0bd5fe62a46ec9c617690dd3099c878 (commit)
via b8340153c4098aba6c85479f5d9f267b1e7af070 (commit)
via 01fb9837d760d76365cca805fb082ae023cd8c26 (commit)
via 8c1112eb1edf5f510372f53ca16c08fa8c0a1bcb (commit)
via e4e058decf80426a0547925313df431cb45b7aa5 (commit)
via cfcf15eee2283e9f66d854d0f05176759ccc9189 (commit)
via dbd45fc4c90f4c0b513989f61d9f444ae4b3a6a1 (commit)
via e7ef292577cc626a6b5066008b841e815ea66c1e (commit)
via 953c9d511bf94f3904541feb81568b893505bb1a (commit)
via dee6710fc80b54eb673e09b056534dbef5e31866 (commit)
via 5d69ebdc4cf2108073881cce3382f570ed76208e (commit)
via 061ab30ac1abbcb55451b98a1b10a74f354a764d (commit)
via 271b48bfd3f24686c5cae31d094d8543d8e53981 (commit)
via 3e211aa2a8b91b38eb38fa214973fc18e7bea2cf (commit)
via bde00182377905170d49ad230de197086fb489e1 (commit)
via 0d40dda9bc060b1d5e8281a014633eb87c5cee25 (commit)
via a6affb44e29aa1d71875865bcfc821fcc4f22cea (commit)
via 511113ce89d7cf9e784ba344d6ae55e7174acc0e (commit)
via 9eee2b508853a22e9baf26122de537e5cabf0a18 (commit)
via b9619a485efbb209fecbf6bc7bb8b0ecd7091c98 (commit)
via 9997918f0209408fedfee99bd41a9e38cc508d47 (commit)
via 4924f7bd59f5d7713cd5aa0ca09a3fc405285062 (commit)
via 59bd868c98f700551bb6c1b56df03ab269a9601e (commit)
via 3c8c0591e2344ba6e44df16319b47065d23d652e (commit)
via f87f2579d237a258179be5b1442ed693a0caef34 (commit)
via 2f2d7b9368fc5d8c9a14b4ffb4f441b2128dbef4 (commit)
from 454bef0b795ad5ab38b659b0366d9edd1f592dd7 (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 bbd3db8c84af321485d93352ee6ccb83a96b61be
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 21:55:02 2014 +0000
Bug 10875: (follow-up) make displaying/hiding inactive funds work cross-browser
This uses the idea introduced by the patch for bug 8659 by Maxime
Pelletier.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3db3c984d14113ddc6d9926bcd2ee34fab8c3de5
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 21:29:41 2014 +0000
Bug 7180: (follow-up) restore ability to select bibs in middle of import batch
This patch repairs the JavaScript that selectively removes unselected
bibs from the form submission, fixing a problem where selecting
bibs from the middle or end of the list would cause them to be ordered
without the appropriate quantities, funds, and prices.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit bfb88cc4e0bd5fe62a46ec9c617690dd3099c878
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 21:12:33 2014 +0000
Bug 7180: (follow-up) fix regression on bug 6074
This patch ensures that bibs selected for ordering are marked
as imported in their import batch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b8340153c4098aba6c85479f5d9f267b1e7af070
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 21:06:50 2014 +0000
Bug 7180: (follow-up) fix warnings
This patch fixes some warnings (not introduced by the main
patches) regarding fetching the number of bibs in a batch
and fetching the list of batches.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 01fb9837d760d76365cca805fb082ae023cd8c26
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 25 11:14:00 2014 +0200
Bug 10875: (follow-up) preselect the fund located in the record
It is useless to copy the fund list in a new node. It seems easier to
hide/show inactive/active funds.
This patch also adds a "(inactive)" marker in the fund list for
inactive funds. If the fund located in the record is inactive, it is
displayed by default and cannot be hidden.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8c1112eb1edf5f510372f53ca16c08fa8c0a1bcb
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Sep 11 10:01:34 2013 +0200
Bug 10875: ensure adding order from a staged file does not display inactive funds by default
When adding an order from a staged file, a link
"show all funds" is now added on the top of the
page. All inactive funds are hidden by default.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Works as described.
- Loading the page, a fund needs to be selected. Before
the patch the first fund was preselected.
- Checking the checkbox, inactive funds show up, but
are not visible otherwise.
- If the fund is selected from the MARC file, the
correct fund will be selected, even if it's inactive.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e4e058decf80426a0547925313df431cb45b7aa5
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 20:14:09 2014 +0000
Bug 7180: (follow-up) require an authenticated session to use the AJAX authval dropbox
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cfcf15eee2283e9f66d854d0f05176759ccc9189
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 20:06:39 2014 +0000
Bug 7180: (follow-up) point to new location of the jQuery checkboxes plugin
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit dbd45fc4c90f4c0b513989f61d9f444ae4b3a6a1
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 20:01:10 2014 +0000
Bug 7180: DBRev 3.15.00.043
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e7ef292577cc626a6b5066008b841e815ea66c1e
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 20:00:04 2014 +0000
Bug 7180: (follow-up) use "MARC record" instead of "marcrecord"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 953c9d511bf94f3904541feb81568b893505bb1a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 23 09:56:26 2014 +0200
Bug 7180: (follow-up) reset statistic values on reloading the page
On the "Default accounting details", if a dropdown list was created for
a statistic value, on reloading the page it still exist. It should not
given the fund value is reset.
The CGIsort variable is useless and can be remove: the dropdown list
is generated using the ajax call.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit dee6710fc80b54eb673e09b056534dbef5e31866
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 16 11:01:24 2014 +0200
Bug 7180: (follow-up) fix various issues
1/ showmarc.pl takes the importid for staged files.
2/ small note to indicate that the vendor's discount will be used if no
discount is filled.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5d69ebdc4cf2108073881cce3382f570ed76208e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Apr 15 16:31:18 2014 +0200
Bug 7180: (follow-up) fix various issues
* fix calculation of discount
* add CSS for unselected rows
* fix Javascript error
* correct capitalization
* use “Statistic” instead of “Planning value”
* improve description of system preference
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 061ab30ac1abbcb55451b98a1b10a74f354a764d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 6 17:19:20 2014 +0100
Bug 7180: (follow-up) remove disused script fetch_sort_dropbox.pl
Test plan:
git grep fetch_sort_dropbox
should return no result.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 271b48bfd3f24686c5cae31d094d8543d8e53981
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Sep 27 16:42:44 2013 +0200
Bug 7180: (followup) fix case where discount was divided by 100 twice.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3e211aa2a8b91b38eb38fa214973fc18e7bea2cf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Sep 16 12:45:52 2013 +0200
Bug 7180: (follow-up) remove useless rrp variable
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit bde00182377905170d49ad230de197086fb489e1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Sep 12 14:59:56 2013 +0200
Bug 7180: (follow-up) restore the "Add order" link
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0d40dda9bc060b1d5e8281a014633eb87c5cee25
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 12 08:35:41 2013 -0400
Bug 7180: (follow-up) correct minor language issues
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a6affb44e29aa1d71875865bcfc821fcc4f22cea
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Sep 12 11:44:25 2013 +0200
Bug 7180: QA followup
- fix unit tests (use a transaction).
- add 3 tabs on the page in order to be more understandable.
- fix a warn in logs
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 511113ce89d7cf9e784ba344d6ae55e7174acc0e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Sep 11 09:35:16 2013 +0200
Bug 7180: (follow-up) update license version
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9eee2b508853a22e9baf26122de537e5cabf0a18
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Sep 10 10:31:11 2013 +0200
Bug 7180: make neworderempty code use getAuthValueDropbox.
The js function fetchSortDropbox has been deleted in previous patch.
The new function is getAuthValueDropbox.
Test plan:
- link authorized values to some funds
- open an existing order and verify value are correctly filled in the
sort1 and sort2 values
- create a new order and verify behavior is the same as before
Note: This patch generates 2 ajax queries (max) if the budget is linked
to 2 av categories for sort1 and sort2. This could be improved using a
template plugin for values display on load.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b9619a485efbb209fecbf6bc7bb8b0ecd7091c98
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Sep 10 10:30:25 2013 +0200
Bug 7180: (follow-up) change syspref description
- the blank line is now useless
- add an example for the syspref value
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9997918f0209408fedfee99bd41a9e38cc508d47
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Sep 9 22:53:49 2013 +0200
Bug 7180: (follow-up) fix minor issues
- Fixed some labels from Budget to Fund
- Added the system preference to sysprefs.sql
- Fixed some untranslatable Javascript strings
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 4924f7bd59f5d7713cd5aa0ca09a3fc405285062
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jul 15 10:05:06 2013 +0200
Bug 7180: (follow-up) ensure that the default quantity is 1
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 59bd868c98f700551bb6c1b56df03ab269a9601e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jul 1 15:59:14 2013 +0200
Bug 7180: QA followup
Ergonomic improvements:
- Remove the green color the selected record.
- Use fieldset.rows (and legend).
- Use the required css class for quantity inputs.
- Replace "budget" with "fund".
- fix the "undefined" string
- Add a "show MARC" link
- replace "no_match" with a text.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3c8c0591e2344ba6e44df16319b47065d23d652e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 21 13:27:39 2013 +0100
Bug 7180: Add UT for C4::Budgets::GetBudgetByCode
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f87f2579d237a258179be5b1442ed693a0caef34
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 20 12:32:07 2013 +0100
Bug 7180: (follow-up) fix getAuthValueDropbox should display the selected value
If the no AV match the name/category or if no category is defined, the
input field should contain the value.
Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2f2d7b9368fc5d8c9a14b4ffb4f441b2128dbef4
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 8 17:25:06 2012 +0100
Bug 7180: Order from staged file improvements
This patch adds:
- 1 syspref MarcFieldsToOrder
- 1 Ajax script acqui/ajax-getauthvaluedropbox.pl
- 1 routine C4::Budgets::GetBudgetByCode
Before this patch you were not able to order 1 or all the records from
your staged file. You were allowed to specify some information ("Import
All" and "Accounting details" areas) for the order.
With this patch, the previous behaviour still exists.
But now you can *select* which records you want to ordered.
For these ones you can specify independently quantity,
price, budget, sort1 and sort2.
The cherry on the cake is that you can pre-fill these fields with
values from the MARC record.
Test plan:
1. Fill the new syspref MarcFieldsToOrder with something like:
==BEGIN==
price: 947$c
quantity: 969$h
budget_code: 922$a
rrp: 010$d
discount: 969$d
sort1: 923$a
sort2: 924$a
==END==
The empty line at the end is mandatory!
The budget (corresponding to your budget_code) can be filled with
authorized value categories (statistic 1 and 2).
The sort1 and sort2 values can be filled with the an authorized value
(of the category previously selected)
2. Choose randomly one or more biblio(s) and fill fields with what is
relevant.
3. Export the biblio and import it (with the "Stage MARC records for
import" tool).
4. Go on a basket and add an order from a staged file. Select your
staged file.
5. Well. Now you can see your biblio (or biblios if your had exported
more than one). For each one, fields should be pre-filled with the
biblio values. The budget should be selected on the budget
corresponding to the budget_code (in the field 922$a) and the
"planning values" too (with fields 923$a and 924$a).
You can modify these values (or not) and choose a default value for
budget and planning values (in the "Accounting details" area).
6. Save and check the prices values. Modify the order and check that
budget and sort* are good
Prices are calculated following some parameters:
if there is no price => listprice = 0
else =>
- the gstrate value for your order is the gstrate value of the bookseller
- discount = if filled : the discount value / 100
else: the discount value of the bookseller
- if the bookseller includes tax( List item price includes tax: Yes )
if a discount exists:
ecost = price
rrp = ecost / ( 1 - discount )
else: # a discount does not exist
ecost = price * ( 1 - discount )
rrp = price
else # the bookseller does not include tax
if a discount exists:
ecost = price / ( 1 + gstrate )
rrp = ecost / ( 1 - discount )
else: # a discount does not exist
rrp = price / ( 1 + gstrate )
ecost = rrp * ( 1 - discount )
- in all cases:
listprice = rrp / currency rate
unitprice = ecost
total = ecost * quantity
7. Retry with different parameters
8. Check the 'Import all' action still works
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 26 +
acqui/addorderiso2709.pl | 206 ++++---
acqui/ajax-getauthvaluedropbox.pl | 84 +++
acqui/fetch_sort_dropbox.pl | 107 ----
acqui/neworderempty.pl | 35 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +
.../intranet-tmpl/prog/en/css/staff-global.css | 6 +
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 94 +---
.../prog/en/modules/acqui/addorderiso2709.tt | 579 ++++++++++++--------
.../prog/en/modules/acqui/neworderempty.tt | 59 +-
.../en/modules/admin/preferences/acquisitions.pref | 7 +-
kohaversion.pl | 2 +-
t/db_dependent/Budgets.t | 16 +-
14 files changed, 672 insertions(+), 557 deletions(-)
create mode 100755 acqui/ajax-getauthvaluedropbox.pl
delete mode 100755 acqui/fetch_sort_dropbox.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list