[koha-commits] main Koha release repository branch master updated. v3.16.00-277-g44343dc
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 24 19:15:20 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 44343dc1325051993d07c1d8e794c3d2fd67baa4 (commit)
via 359590f36a2ca656fb3b4c4fc63cc915cee50794 (commit)
via b64490cb48011eb6ed9958fb05780cee51b38539 (commit)
via 08d98e858464d083ebec94e63ed551f69b325217 (commit)
via 4bb10a02445eda38939d528f77b23a96a577efb9 (commit)
via 986b8c92620580166ab408362f72ce52d045d92c (commit)
via 110c665a4b641258bf53c443db4fb77a408f0757 (commit)
via c4d9b3dd527c402d63bb4b7c5da0aacfe2969698 (commit)
via cd191642cd5b539ecca99c12a0953615b0dfb2ab (commit)
via a12e96e938c9203e5fb98d7ab74e77d0b22f34ba (commit)
from a9c0e18d0ab90143fe343a5a15b833ecde5c13f4 (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 44343dc1325051993d07c1d8e794c3d2fd67baa4
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jul 24 12:11:31 2014 -0300
Bug 12164: (followup) MoveOrders description corrected
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 359590f36a2ca656fb3b4c4fc63cc915cee50794
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 30 12:05:46 2014 +0200
Bug 12164: Fix decimal number display
If the funds are not moved, the amount is display like 123.000000.
This patch hardcodes the number of decimal numbers to display (2).
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and tests, especially all acquisition tests.
New routines in Budgets.pm:
- CloneBudgetPeriod
- CloneBudgetHierarchy
- MoveOrders
OK t/db_dependent/Budgets.t
Some of the tests done:
1) Duplicate an existing budget
- OK Existing budget is active, duplicate it and mark it inactive
- OK Existing budget is inactive, duplicate and mark it inactive
2) Close budget
- OK Budget was created without funds - no changes are made
- OK Budget was created with funds, all orders moved correctly
- moving the available money to the new budget is optional
- OK Budget was created with funds, but one fund deleted,
all orders moved correctly, one missing fund reported,
orders unchanged
3) Partial receiced undone
- OK Partial receive from last budget is undone, order lines
are correctly recombined and fund is set to the current budget
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b64490cb48011eb6ed9958fb05780cee51b38539
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 30 11:38:27 2014 +0200
Bug 12164: Fix some typos
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 08d98e858464d083ebec94e63ed551f69b325217
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Jun 6 12:53:53 2014 +0200
Bug 12164: follow-up: various fixes
This follow-up fixes issues raised on bug 12164 comment 17.
1/ The unreceived orders columns should only display "pending" orders
2/ Fix some typo from_budget_period_id vs budget_period_id vs
to_budget_period_id
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4bb10a02445eda38939d528f77b23a96a577efb9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri May 2 10:00:11 2014 +0200
Bug 12164: Add UI report
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 986b8c92620580166ab408362f72ce52d045d92c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 2 10:19:58 2014 +0200
Bug 12164: On closing budget period, move unspent amount
On closing a budget (budget period), the user will be presented with an
option to move remaining unspent funds from the previous budget to the
newly created one - adding to the amounts already entered in those
funds.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 110c665a4b641258bf53c443db4fb77a408f0757
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 2 10:18:04 2014 +0200
Bug 12164: Close a budget period (budget)
This is the main patch.
On closing a budget period, all unreceived orders are moved from the
old/previous fiscal year into the new fiscal year.
You can rollover funds unused in the previous fiscal year to the new
fiscal year.
This patch set is based on bug 12168 (bugfix) and can be tested on top
of bug 11578 (easier to see the fund structure).
The patch set is cut in 6 main patches:
- Move the budget period clone logic into C4::Budgets
The code is moved from the pl to Budgets.pm and unit tests are provided.
The original code should certainly be buggy since a typo existed.
- On cloning budget period, mark original budget as inactive
Cloning a budget period is already possible in Koha, this patch adds a
checkbox to mark as inactive the original budget. That avoids to edit
the budget and click the "inactive" checkbox. Both do the same action.
- On cloning budget periods, add a "reset all funds" option
Same as before, a new checkbox is added on cloning a budget period. If
you check it, all fund amounts will be set to 0. Otherwise, no change
compared to the existing behavior.
- Close a budget period (budget)
The goal of this patch set is to move unreceived orders from a budget to
another. This patch adds a C4::Budgets::MoveOrders routine which does
this job.
This action is only possible if the fund structure is the same for both
budgets, the budget_code field should be the same.
- On closing budget period, move unspent amount
Unspent amount will be move from the previous budget structure to the
new one.
- Add UI report
This patch only adds a report when closing a budget is done.
Test plan:
Wording: below, budget is a "budget period" and fund is a "budget".
Prerequisite: Having 1 active budget with some funds (with different
levels and different amounts). Order and receive some orders (not all).
1/ Go on the budgets administration page (admin/aqbudgetperiods.pl) and
duplicate the structure of this budget ("Duplicate" link in the
"Actions" column).
2/ Enter start and end date for this budget and mark the original budget
as inactive.
3/ Note that a new budget is created, with the same fund structures (and
same value) and that the old one is marked as inactive (see
admin/aqbudgets.pl page with patches from bug 11578).
4/ Try to close the new budget: it is not possible, there is no
unreceived orders for this budget.
5/ You can close the inactive budget ("Close" link in the "Actions"
column).
6/ Verify the number of "Unreceived orders" is correct and select the
new budget in the budget list. Click on the "Move remaining unspent
funds" if you want to move unspent amounts.
7/ A report view is displayed and show you the ordernumber which have
been impacted (grouped by fund).
8/ Try different configuration, depending on the selected checkboxes.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c4d9b3dd527c402d63bb4b7c5da0aacfe2969698
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 2 10:16:13 2014 +0200
Bug 12164: On cloning budget periods, add a "reset all funds" option
This patch adds a checkbox "reset all funds" (budgets).
If it is checked, the new created budgets (funds) will be reset.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cd191642cd5b539ecca99c12a0953615b0dfb2ab
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 2 10:14:52 2014 +0200
Bug 12164: On cloning budget period, mark original budget as inactive
This patch adds a checkbox "mark original budget as inactive" (budget
period).
If it is checked, the original budget will be marked as inactive.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a12e96e938c9203e5fb98d7ab74e77d0b22f34ba
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 2 10:10:53 2014 +0200
Bug 12164: Move the budget period clone logic into C4::Budgets
Note the typo InsertInTable "aqcudgets", note sure about the existing
behavior before this patch!
This patch adds a link "Duplicate" in the action list for budget
periods (budgets).
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 6 +
C4/Budgets.pm | 221 ++++++++++++++++++++
admin/aqbudgetperiods.pl | 124 ++++++-----
.../prog/en/modules/admin/aqbudgetperiods.tt | 207 +++++++++++++++++-
t/db_dependent/Budgets.t | 187 ++++++++++++++++-
5 files changed, 692 insertions(+), 53 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list