[Koha-patches] pull requestion BibLibre-cataloguing-recommited (#5574)

[Chris Cormack]

Id rather not pull and rebase again. If you just give me the commit id ill cherry pick it.

Once they are pulled and rebased on to master its much easier to just fix anything with a new commit. Rewriting history is messy and error prone.

Hope this helps

Chris

Paul Poulain <paul.poulain at biblibre.com> wrote:

>owen noticed a problem in the branch, I fixed it, pls
>* chris = pull again &
>* all = test
>
>thx
>
>==========================
>
>
>The following changes since commit 718473bdd2f156544e7f254fa7adce2890c51e2a:
>
>  Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506
>(2010-12-14 21:07:15 +1300)
>
>are available in the git repository at:
>
>  git://git.biblibre.com/koha_biblibre.git
>remotes/origin/3.4/BibLibre-cataloguing-recommited
>
>Paul Poulain (19):
>      Order cancelling improvement : delete attached items & biblio
>      Fixes leading zeroes in Add Mulpiple Copies
>      NormalizeString POD Fixing and variable renaming
>      C4/Items.pm changes & improvements
>      MT4586: Use zebra instead of mysql for publisher and
>collectiontitle searches
>      don't discard $3 when building a record (UNIMARC specific)
>      MT4004 : additem.pl Some Status were not defaulted to the correct
>value         Status 0 was lost because test was done on value and not
>on the fact that a value was defined or not.         when value is 0
>then it was not used as default value for
>      fix permission of moveitem = edit_items needed
>      update some unimarc plugins
>      addbiblio: removing dead code and managing new permissions
>      unimarc plugin 210c bis to fixup
>      MT3915: rebuild_zebra changes because deleted biblios would stick
>in zebra indexes
>      missing french permission to deal with edit_items
>      MT #2991 (Feature) Batch biblio modifications
>      MT #4931 add the ability to choose home or holding branch in
>stocktaking
>      MT1059 Follow-up : Fix merge reference selection presentation
>      Add link to Fast cataloguing in case the scanned barcode don't
>exist in circulation
>      adding some copyright BibLibre statements
>      #5574: follow-up
>
> C4/Acquisition.pm                                  |    3 +
> C4/Barcodes.pm                                     |    9 +-
> C4/Biblio.pm                                       |  182 +++++++-
> C4/Charset.pm                                      |   31 +-
> C4/Items.pm                                        |   73 +++-
> C4/Search.pm                                       |    3 +-
> cataloguing/addbiblio.pl                           |    3 +-
> cataloguing/additem.pl                             |  472
>+++++++++++---------
> cataloguing/moveitem.pl                            |    2 +-
> cataloguing/value_builder/unimarc_field_010.pl     |    3 +-
> cataloguing/value_builder/unimarc_field_210c.pl    |  217 +++++-----
> .../value_builder/unimarc_field_210c_bis.pl        |  109 +++++
> cataloguing/value_builder/unimarc_field_225a.pl    |    2 +-
> cataloguing/ysearchzebra.pl                        |   52 +++
> .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |    1 +
> koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |    6 +
> .../prog/en/modules/basket/basket.tmpl             |    5 +
> .../prog/en/modules/cataloguing/addbiblio.tmpl     |   44 +-
> .../prog/en/modules/cataloguing/additem.tmpl       |    1 +
> .../prog/en/modules/cataloguing/merge.tmpl         |    4 +-
> .../value_builder/unimarc_field_210c_bis.tmpl      |   73 +++
> .../prog/en/modules/cataloguing/z3950_search.tmpl  |    2 +-
> .../prog/en/modules/circ/circulation.tmpl          |    1 +
> .../prog/en/modules/tools/batchedit.tmpl           |  231 ++++++++++
> .../prog/en/modules/tools/inventory.tmpl           |    6 +
> misc/migration_tools/rebuild_zebra.pl              |   27 +-
> tools/batchedit.pl                                 |  222 +++++++++
> tools/inventory.pl                                 |    4 +-
> 28 files changed, 1357 insertions(+), 431 deletions(-)
> create mode 100755 cataloguing/value_builder/unimarc_field_210c_bis.pl
> create mode 100644 cataloguing/ysearchzebra.pl
> create mode 100644
>koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl
> create mode 100644
>koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tmpl
>
>-- 
>Paul POULAIN
>http://www.biblibre.com
>Expert en Logiciels Libres pour l'info-doc
>Tel : (33) 4 91 81 35 08
>
>_______________________________________________
>Koha-patches mailing list
>Koha-patches at lists.koha-community.org
>http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>website : http://www.koha-community.org/
>git : http://git.koha-community.org/
>bugs : http://bugs.koha-community.org/