[koha-commits] main Koha release repository branch master updated. v3.14.00-799-g9f3e1c4
Git repo owner
gitmaster at git.koha-community.org
Sat Apr 19 17:42: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 9f3e1c4947d9f0249225b8017df0c03579826123 (commit)
via 58b5b384f64178cfc9e90c693a32dada484f06de (commit)
via 78551cc97663328de19fde7437fb615f75527aec (commit)
via 0477e4dae11613a94eb8fd33d140b419be507dbc (commit)
via 138f14c2b971f7f539bc11081f8be3cc8742de78 (commit)
via 2407fcb28a07842746fc989237a09332a928c962 (commit)
via 36074fba651560bef11423f2d1817ffc83c0045c (commit)
via e7433b970ce9187b8b073b9b2581950308dce22a (commit)
from 5629f4bc252698a102a1b581c3db0be124a4474a (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 9f3e1c4947d9f0249225b8017df0c03579826123
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 16:05:17 2014 +0000
Bug 9416: (follow-up) teach ordering from staged files about the notes fields
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 58b5b384f64178cfc9e90c693a32dada484f06de
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 15:52:45 2014 +0000
Bug 9416: (follow-up) reconcile with work done on bug 11699
This patch teaches the ordering receiving process how to
set vendor and internal order notes.
One observation: I'm not sure it's entirely useful to set
a note to communicate to the vendor during receiving --
how is it to be sent to them, and why?
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 78551cc97663328de19fde7437fb615f75527aec
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 15:27:29 2014 +0000
Bug 9416: (follow-up) update DBIC schema classes
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0477e4dae11613a94eb8fd33d140b419be507dbc
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 15:24:32 2014 +0000
Bug 9416: DBrev 3.15.00.032
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 138f14c2b971f7f539bc11081f8be3cc8742de78
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Sat Apr 19 10:21:51 2014 +0200
Bug 9416: (follow-up) fix neworderempty and templates
This followup answer QA remarks :
- neworderempty.pl updated so that the 2 new variables are passed
to the template
- modordernotes.tt fixed to make the translation easier
- in CSV headers, to make clear that no change are made for the moment,
rename "note" to "internal note"
Additionnaly, "Publisher code" was wrong in the csv headers. I changed
it to "Publisher" (the field in database is publishercode, but the
content is a real publisher name, not a code)
I did not change "Note:" in modordernotes.tt, because it is just under
a h1 tag which specifies the type of note the librarian is editing.
Test plan :
- edit an existing order, and try to change/add/delete the vendor note,
and the internal note. Check the changes are properly saved
- export a basket and a basketgroup in CSV. Check the columns headers
are "Publisher" and "Vendor note"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed some tabs. Passes QA script and tests.
Tested:
- add notes when creating an order
- edit notes modifying an order line
- edit notes using the links on the basket summary
- check basket CSV export
- close basket
- check basket group CSV export
- edit notes on order receive page using the links
- edit notes on receive
Note: Translatability of templates could be improved by a follow-up.
It's better not to divide up sentences with if/else structures.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2407fcb28a07842746fc989237a09332a928c962
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Sat Apr 19 10:22:10 2014 +0200
Bug 9416: (follow-up) update acquisitions unit tests
This patch fixes UT, to take into account the new fields
order_internalnote and order_vendornote.
Note that "notes" field is still returned as well by some
acquisition subs (those which return all the fields of biblio
and biblioitems table)
Test plan :
run prove t/db_dependant/Acquisition.t
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 36074fba651560bef11423f2d1817ffc83c0045c
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Mon Feb 17 01:11:42 2014 +0100
Bug 9416: add new order vendor note field
Currently, there is a single note field in each order. It would be
useful to have 2 notes fields:
- one for the staff (ex: "catalog this book as soon as possible")
- one for the vendor (ex: "urgent", "only the 2d volume"...), which
could later be printed in basketgroup pdf for example
This patch adds a new note made for vendor in each order. The existing
note is renamed "internal note".
The behavior of the 2 notes are the same
Changes in database structure:
- new column aqorders.order_vendornote
- column aqorders.notes renamed aqorders.order_internalnote
To test :
[1] Make a complete acquisiton process (creating the order > looking at
the basket > looking the order > receiving); and try to use the 2
notes (internal note / vendor note)
[2] Check the changes made on one page (eg detail of the order) are
saved and visible on an other page (eg receipt page)
Signed-off-by: Marc Véron <veron at veron.ch>
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 e7433b970ce9187b8b073b9b2581950308dce22a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 15:39:52 2014 +0000
Bug 11699: (follow-up) update one more test that uses ModReceiveOrder
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 39 +++++++++++++-----
Koha/Schema/Result/Aqorder.pm | 15 +++++--
acqui/addorderiso2709.pl | 3 +-
acqui/finishreceive.pl | 6 ++-
acqui/modordernotes.pl | 17 +++++---
acqui/neworderempty.pl | 7 ++--
acqui/orderreceive.pl | 3 +-
installer/data/mysql/kohastructure.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 8 ++++
.../prog/en/includes/csv_headers/acqui/basket.tt | 2 +-
.../en/includes/csv_headers/acqui/basketgroup.tt | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 8 +++-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 13 ++++--
.../prog/en/modules/acqui/modordernotes.tt | 9 +++--
.../prog/en/modules/acqui/neworderempty.tt | 8 +++-
.../prog/en/modules/acqui/orderreceive.tt | 6 ++-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 13 ++++--
kohaversion.pl | 2 +-
t/db_dependent/Acquisition.t | 42 +++++++++++++-------
t/db_dependent/Acquisition/TransferOrder.t | 7 +++-
20 files changed, 150 insertions(+), 63 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list