[koha-commits] main Koha release repository branch master updated. v3.16.00-29-g7533b1c
Git repo owner
gitmaster at git.koha-community.org
Sun May 25 16:58:51 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 7533b1c0a8369e072673f2c8102319fc9511149d (commit)
via b2499288cdff37bf80dd9976ae141c8f07446236 (commit)
via 2dab2cc22334ee49b7eb2e67252ca484e63cb6cb (commit)
from 27f1df06700d19d006218812c168fc9079e3706d (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 7533b1c0a8369e072673f2c8102319fc9511149d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 25 15:20:57 2014 +0000
Bug 12110: (follow-up) improve whitespace
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b2499288cdff37bf80dd9976ae141c8f07446236
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Sun May 18 21:30:53 2014 +0200
Bug 12110: (follow-up) add French and German translation
This followup
- translates "vendor note" in French and German.
- replaces "Notes for vendor" with "Note for vendor" in English template
(as there can only be 1 note)
- fixes a typo in French template (Qte => Qté, for "Quantité")
Test plan :
[1] set OrderPdfFormat preference to "French 3-pages"
[2] Print a basketgroup containing an order with a vendornote, and check
the note is displayed and introduced by "Notes pour le fournisseur"
[3] set OrderPdfFormat preference to "German 2-pages"
[4] Print a basketgroup containing an order with a vendornote, and check
the note is displayed and introduced by "Lieferantennotiz"
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2dab2cc22334ee49b7eb2e67252ca484e63cb6cb
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Sat Apr 19 20:21:59 2014 +0200
Bug 12110: Display the order vendor note in basket and basketgroup CSV and PDF
This bug adds the "vendor note" for each order in the PDF for
basketgroups. The note is displayed only if it exists, just under the
bibliographic information.
I added a separation line "--------" between bibliographic information
and the note, so that it could be visible at 1st glance.
It also replaces the internal note with the vendor in the CSV for basket
and basketgroup. It is more logical and useful for libraries to export
the note made for vendor, as those files are destined to be sent to the
vendor.
Test plan :
- fill a basket with some orders, some with internal notes, some with
vendor notes
- export the basket in CSV : only the vendor notes should be present
- put the basket in a basketgroup
- export the basketgroup in CSV : only the vendor notes should be
present
- Select "English-2 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
the bibliographic information
- Select "English-3 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
the bibliographic information
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 4 ++--
acqui/basketgroup.pl | 2 +-
acqui/pdfformat/layout2pages.pm | 2 +-
acqui/pdfformat/layout2pagesde.pm | 2 +-
acqui/pdfformat/layout3pages.pm | 2 +-
acqui/pdfformat/layout3pagesfr.pm | 4 ++--
.../intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt | 2 +-
.../prog/en/includes/csv_headers/acqui/basketgroup.tt | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list