Merge 'jgarcial/bibcirculation-extend-ill-for-acquisitions' into next
- jgarcial/bibcirculation-extend-ill-for-acquisitions: (23 commits) BibCirculation: temporary barcode for new copies BibCirculation: extended ILL to manage acquisition BibCirculation: make statuses customizable BibCirculation: lots of small fixes BibCirculation: 'cancelled' status for ILL request BibCirculation: sorting last issued loans BibCirculation: edit ill request details BibCircuation: avoid multiple loan creation BibCirculation: loan and renew process enhancement BibCirculation: added budget_code to crcILLREQUEST BibCirculation: edit library type BibCirculation: arrival date and library merge BibCirculation: extended item statuses BibCirculation: improved book_title_from_MARC BibCirculation: fixed multi-barcode loan BibCirculation: fixed user interface loan renewal BibCirculation: pylint and kwalitee cleaning BibCirculation: small fixes on printing & intrface BibCirculation: daemon for overdue letters BibCirculation: email alerts for new requests ...
- Amendments done as part of merge: Cleans bibcird executable that is not necessary under version control. Adds table update statements in upgrade instructions. Fixes copyright statements WRT Invenio and years. Fixes some variable imports; more to be done via a later ticket. Removes migration kit from branch history as it is CERN specific.
Conflicts:
config/invenio.conf
configure.ac
modules/bibcirculation/lib/bibcirculation_dblayer.py
modules/bibcirculation/lib/bibcirculation_templates.py
modules/bibcirculation/lib/bibcirculation_utils.py
modules/bibcirculation/lib/bibcirculation_webinterface.py
modules/bibcirculation/lib/bibcirculationadminlib.py
modules/bibsched/lib/bibtask_config.py
modules/miscutil/lib/inveniocfg.py
modules/miscutil/sql/tabcreate.sql
modules/webstyle/lib/webinterface_layout.py