[koha-commits] main Koha release repository branch, master, updated. v3.02.00-beta-21-g6676dc2

[Git repo owner]

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  6676dc2df04f5b361ed616c17a8f0d741a2dee59 (commit)
       via  1457256b98afd94dc3e3166200120bfb29b562dc (commit)
       via  b1c1f6f434276811ba231b29db4e3efbe006b0bd (commit)
       via  0eea24a8a19b0be56b77d983c4265c98620393fa (commit)
      from  5d2a1c7916e49fb39f6986afeb2b30f34c361660 (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 6676dc2df04f5b361ed616c17a8f0d741a2dee59
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Fri Jul 2 08:47:22 2010 -0400

    bug 4188: add note about hiding the OrderPdfTemplate syspref
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 1457256b98afd94dc3e3166200120bfb29b562dc
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Fri Jul 2 08:39:46 2010 -0400

    bug 4188: move PDF templates for printed purchase orders
    
    The PDF templates for purchase orders now live in the
    directory koha-tmpl/intranet-tmpl/prog/pdf to separate
    them from code.  As no automatic translation system for
    PDF files is currently implemented, I'm keeping them out
    of the language subdirectories for now.
    
    At present, there are two choices of templates for printing
    purchase orders (AKA basket groups), controlled by setting
    the OrderPdfFormat syspref:
    
    pdfformat::layout2pages (two-page layout)
    pdfformat::layout3pages (three-page layout)
    
    To customize a template or to add a new one requires two steps:
    
    * modifying the PDF; note that OpenOffice source files
      are included as a way of generating the PDF
    * modifying the code in acqui/pdfformat/layout*.pm to
      position the order text onto the template
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit b1c1f6f434276811ba231b29db4e3efbe006b0bd
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Fri Jul 2 08:19:14 2010 -0400

    remove extraneous warns
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 0eea24a8a19b0be56b77d983c4265c98620393fa
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Sun Apr 18 11:53:34 2010 +0200

    Bug 4188 Allow acq basket group printing into PDF
    
    Since new acquisition module workflow and specifications is not
    documented, this fix is more an hypothesis than a patch.
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Languages.pm                                    |    2 +-
 acqui/basketgroup.pl                               |    3 ---
 acqui/pdfformat/layout2pages.pm                    |    5 ++---
 acqui/pdfformat/layout3pages.pm                    |    5 ++---
 .../en/modules/admin/preferences/acquisitions.pref |    4 ++--
 .../intranet-tmpl/prog/pdf}/layout2pages.odt       |  Bin 12688 -> 12688 bytes
 .../intranet-tmpl/prog/pdf}/layout2pages.pdf       |  Bin 25541 -> 25541 bytes
 .../intranet-tmpl/prog/pdf}/layout3pages.odt       |  Bin 12973 -> 12973 bytes
 .../intranet-tmpl/prog/pdf}/layout3pages.pdf       |  Bin 26944 -> 26944 bytes
 9 files changed, 7 insertions(+), 12 deletions(-)
 rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout2pages.odt (100%)
 rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout2pages.pdf (100%)
 rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout3pages.odt (100%)
 rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout3pages.pdf (100%)


hooks/post-receive
-- 
main Koha release repository