Skip to content

Commit

Permalink
Merge branch 'tags/rel_2_12_7' into iish_master_2_12_7
Browse files Browse the repository at this point in the history
# Conflicts:
#	ChangeLog
#	Open-ILS/src/perlmods/lib/OpenILS.pm
#	Open-ILS/src/perlmods/lib/OpenILS/Application.pm
#	Open-ILS/src/sql/Pg/002.schema.config.sql
#	Open-ILS/xul/staff_client/chrome/content/main/about.html
#	Open-ILS/xul/staff_client/defaults/preferences/prefs.js
#	README
#	build/i18n/po/AutoFieldWidget.js/AutoFieldWidget.js.pot
#	build/i18n/po/AutoFieldWidget.js/ar-JO.po
#	build/i18n/po/AutoFieldWidget.js/cs-CZ.po
#	build/i18n/po/AutoFieldWidget.js/de-DE.po
#	build/i18n/po/AutoFieldWidget.js/en-CA.po
#	build/i18n/po/AutoFieldWidget.js/en-GB.po
#	build/i18n/po/AutoFieldWidget.js/es-ES.po
#	build/i18n/po/AutoFieldWidget.js/fi-FI.po
#	build/i18n/po/AutoFieldWidget.js/fr-CA.po
#	build/i18n/po/AutoFieldWidget.js/he-IL.po
#	build/i18n/po/AutoFieldWidget.js/hu-HU.po
#	build/i18n/po/AutoFieldWidget.js/hy-AM.po
#	build/i18n/po/AutoFieldWidget.js/oc-FR.po
#	build/i18n/po/AutoFieldWidget.js/pt-BR.po
#	build/i18n/po/AutoFieldWidget.js/ru-RU.po
#	build/i18n/po/AutoFieldWidget.js/sv-SE.po
#	build/i18n/po/AutoFieldWidget.js/tr-TR.po
#	build/i18n/po/FlattenerGrid.js/FlattenerGrid.js.pot
#	build/i18n/po/FlattenerGrid.js/ar-JO.po
#	build/i18n/po/FlattenerGrid.js/cs-CZ.po
#	build/i18n/po/FlattenerGrid.js/de-DE.po
#	build/i18n/po/FlattenerGrid.js/en-CA.po
#	build/i18n/po/FlattenerGrid.js/es-ES.po
#	build/i18n/po/FlattenerGrid.js/fi-FI.po
#	build/i18n/po/FlattenerGrid.js/fr-CA.po
#	build/i18n/po/FlattenerGrid.js/hy-AM.po
#	build/i18n/po/PCrudFilterPane.js/PCrudFilterPane.js.pot
#	build/i18n/po/PCrudFilterPane.js/ar-JO.po
#	build/i18n/po/PCrudFilterPane.js/cs-CZ.po
#	build/i18n/po/PCrudFilterPane.js/de-DE.po
#	build/i18n/po/PCrudFilterPane.js/es-ES.po
#	build/i18n/po/PCrudFilterPane.js/fi-FI.po
#	build/i18n/po/PCrudFilterPane.js/hy-AM.po
#	build/i18n/po/Searcher.js/Searcher.js.pot
#	build/i18n/po/Searcher.js/ar-JO.po
#	build/i18n/po/Searcher.js/cs-CZ.po
#	build/i18n/po/Searcher.js/de-DE.po
#	build/i18n/po/Searcher.js/en-CA.po
#	build/i18n/po/Searcher.js/en-GB.po
#	build/i18n/po/Searcher.js/es-ES.po
#	build/i18n/po/Searcher.js/fi-FI.po
#	build/i18n/po/Searcher.js/fr-CA.po
#	build/i18n/po/Searcher.js/hy-AM.po
#	build/i18n/po/Searcher.js/oc-FR.po
#	build/i18n/po/Searcher.js/pt-BR.po
#	build/i18n/po/Searcher.js/ru-RU.po
#	build/i18n/po/TranslatorPopup.js/TranslatorPopup.js.pot
#	build/i18n/po/TranslatorPopup.js/ar-JO.po
#	build/i18n/po/TranslatorPopup.js/cs-CZ.po
#	build/i18n/po/TranslatorPopup.js/de-DE.po
#	build/i18n/po/TranslatorPopup.js/en-CA.po
#	build/i18n/po/TranslatorPopup.js/en-GB.po
#	build/i18n/po/TranslatorPopup.js/es-ES.po
#	build/i18n/po/TranslatorPopup.js/fi-FI.po
#	build/i18n/po/TranslatorPopup.js/fr-CA.po
#	build/i18n/po/TranslatorPopup.js/he-IL.po
#	build/i18n/po/TranslatorPopup.js/hu-HU.po
#	build/i18n/po/TranslatorPopup.js/hy-AM.po
#	build/i18n/po/TranslatorPopup.js/oc-FR.po
#	build/i18n/po/TranslatorPopup.js/pt-BR.po
#	build/i18n/po/TranslatorPopup.js/ru-RU.po
#	build/i18n/po/TranslatorPopup.js/sv-SE.po
#	build/i18n/po/TranslatorPopup.js/tr-TR.po
#	build/i18n/po/URLVerify.js/URLVerify.js.pot
#	build/i18n/po/URLVerify.js/ar-JO.po
#	build/i18n/po/URLVerify.js/cs-CZ.po
#	build/i18n/po/URLVerify.js/de-DE.po
#	build/i18n/po/URLVerify.js/en-GB.po
#	build/i18n/po/URLVerify.js/es-ES.po
#	build/i18n/po/URLVerify.js/hy-AM.po
#	build/i18n/po/URLVerify.js/pt-BR.po
#	build/i18n/po/User.js/User.js.pot
#	build/i18n/po/User.js/ar-JO.po
#	build/i18n/po/User.js/cs-CZ.po
#	build/i18n/po/User.js/de-DE.po
#	build/i18n/po/User.js/en-CA.po
#	build/i18n/po/User.js/en-GB.po
#	build/i18n/po/User.js/es-ES.po
#	build/i18n/po/User.js/fi-FI.po
#	build/i18n/po/User.js/fr-CA.po
#	build/i18n/po/User.js/he-IL.po
#	build/i18n/po/User.js/hu-HU.po
#	build/i18n/po/User.js/hy-AM.po
#	build/i18n/po/User.js/oc-FR.po
#	build/i18n/po/User.js/pt-BR.po
#	build/i18n/po/User.js/ru-RU.po
#	build/i18n/po/User.js/sv-SE.po
#	build/i18n/po/User.js/tr-TR.po
#	build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot
#	build/i18n/po/XULTermLoader.js/ar-JO.po
#	build/i18n/po/XULTermLoader.js/cs-CZ.po
#	build/i18n/po/XULTermLoader.js/de-DE.po
#	build/i18n/po/XULTermLoader.js/en-CA.po
#	build/i18n/po/XULTermLoader.js/en-GB.po
#	build/i18n/po/XULTermLoader.js/es-ES.po
#	build/i18n/po/XULTermLoader.js/fi-FI.po
#	build/i18n/po/XULTermLoader.js/fr-CA.po
#	build/i18n/po/XULTermLoader.js/he-IL.po
#	build/i18n/po/XULTermLoader.js/hu-HU.po
#	build/i18n/po/XULTermLoader.js/hy-AM.po
#	build/i18n/po/XULTermLoader.js/oc-FR.po
#	build/i18n/po/XULTermLoader.js/pt-BR.po
#	build/i18n/po/XULTermLoader.js/ru-RU.po
#	build/i18n/po/XULTermLoader.js/sv-SE.po
#	build/i18n/po/XULTermLoader.js/tr-TR.po
#	build/i18n/po/acq.js/acq.js.pot
#	build/i18n/po/acq.js/ar-JO.po
#	build/i18n/po/acq.js/cs-CZ.po
#	build/i18n/po/acq.js/de-DE.po
#	build/i18n/po/acq.js/en-CA.po
#	build/i18n/po/acq.js/en-GB.po
#	build/i18n/po/acq.js/es-ES.po
#	build/i18n/po/acq.js/fi-FI.po
#	build/i18n/po/acq.js/fr-CA.po
#	build/i18n/po/acq.js/he-IL.po
#	build/i18n/po/acq.js/hu-HU.po
#	build/i18n/po/acq.js/hy-AM.po
#	build/i18n/po/acq.js/oc-FR.po
#	build/i18n/po/acq.js/pt-BR.po
#	build/i18n/po/acq.js/ru-RU.po
#	build/i18n/po/acq.js/sv-SE.po
#	build/i18n/po/acq.js/tr-TR.po
#	build/i18n/po/admin.properties/admin.properties.pot
#	build/i18n/po/admin.properties/ar-JO.po
#	build/i18n/po/admin.properties/cs-CZ.po
#	build/i18n/po/admin.properties/de-DE.po
#	build/i18n/po/admin.properties/en-CA.po
#	build/i18n/po/admin.properties/en-GB.po
#	build/i18n/po/admin.properties/es-ES.po
#	build/i18n/po/admin.properties/fi-FI.po
#	build/i18n/po/admin.properties/fr-CA.po
#	build/i18n/po/admin.properties/he-IL.po
#	build/i18n/po/admin.properties/hu-HU.po
#	build/i18n/po/admin.properties/hy-AM.po
#	build/i18n/po/admin.properties/oc-FR.po
#	build/i18n/po/admin.properties/pt-BR.po
#	build/i18n/po/admin.properties/ru-RU.po
#	build/i18n/po/admin.properties/sv-SE.po
#	build/i18n/po/admin.properties/tr-TR.po
#	build/i18n/po/auth.properties/ar-JO.po
#	build/i18n/po/auth.properties/auth.properties.pot
#	build/i18n/po/auth.properties/cs-CZ.po
#	build/i18n/po/auth.properties/de-DE.po
#	build/i18n/po/auth.properties/en-CA.po
#	build/i18n/po/auth.properties/en-GB.po
#	build/i18n/po/auth.properties/es-ES.po
#	build/i18n/po/auth.properties/fi-FI.po
#	build/i18n/po/auth.properties/fr-CA.po
#	build/i18n/po/auth.properties/he-IL.po
#	build/i18n/po/auth.properties/hu-HU.po
#	build/i18n/po/auth.properties/hy-AM.po
#	build/i18n/po/auth.properties/oc-FR.po
#	build/i18n/po/auth.properties/pt-BR.po
#	build/i18n/po/auth.properties/ru-RU.po
#	build/i18n/po/auth.properties/sv-SE.po
#	build/i18n/po/auth.properties/tr-TR.po
#	build/i18n/po/authority.js/ar-JO.po
#	build/i18n/po/authority.js/authority.js.pot
#	build/i18n/po/authority.js/cs-CZ.po
#	build/i18n/po/authority.js/de-DE.po
#	build/i18n/po/authority.js/en-CA.po
#	build/i18n/po/authority.js/en-GB.po
#	build/i18n/po/authority.js/es-ES.po
#	build/i18n/po/authority.js/fi-FI.po
#	build/i18n/po/authority.js/fr-CA.po
#	build/i18n/po/authority.js/hy-AM.po
#	build/i18n/po/authority.js/oc-FR.po
#	build/i18n/po/authority.js/pt-BR.po
#	build/i18n/po/authority.js/ru-RU.po
#	build/i18n/po/authority.js/tr-TR.po
#	build/i18n/po/capture.js/ar-JO.po
#	build/i18n/po/capture.js/capture.js.pot
#	build/i18n/po/capture.js/cs-CZ.po
#	build/i18n/po/capture.js/de-DE.po
#	build/i18n/po/capture.js/en-CA.po
#	build/i18n/po/capture.js/en-GB.po
#	build/i18n/po/capture.js/es-ES.po
#	build/i18n/po/capture.js/fi-FI.po
#	build/i18n/po/capture.js/fr-CA.po
#	build/i18n/po/capture.js/he-IL.po
#	build/i18n/po/capture.js/hu-HU.po
#	build/i18n/po/capture.js/hy-AM.po
#	build/i18n/po/capture.js/oc-FR.po
#	build/i18n/po/capture.js/pt-BR.po
#	build/i18n/po/capture.js/ru-RU.po
#	build/i18n/po/capture.js/sv-SE.po
#	build/i18n/po/capture.js/tr-TR.po
#	build/i18n/po/cat.properties/ar-JO.po
#	build/i18n/po/cat.properties/cat.properties.pot
#	build/i18n/po/cat.properties/cs-CZ.po
#	build/i18n/po/cat.properties/de-DE.po
#	build/i18n/po/cat.properties/en-CA.po
#	build/i18n/po/cat.properties/en-GB.po
#	build/i18n/po/cat.properties/es-ES.po
#	build/i18n/po/cat.properties/fi-FI.po
#	build/i18n/po/cat.properties/fr-CA.po
#	build/i18n/po/cat.properties/he-IL.po
#	build/i18n/po/cat.properties/hu-HU.po
#	build/i18n/po/cat.properties/hy-AM.po
#	build/i18n/po/cat.properties/oc-FR.po
#	build/i18n/po/cat.properties/pt-BR.po
#	build/i18n/po/cat.properties/ru-RU.po
#	build/i18n/po/cat.properties/sv-SE.po
#	build/i18n/po/cat.properties/tr-TR.po
#	build/i18n/po/circ.properties/ar-JO.po
#	build/i18n/po/circ.properties/circ.properties.pot
#	build/i18n/po/circ.properties/cs-CZ.po
#	build/i18n/po/circ.properties/de-DE.po
#	build/i18n/po/circ.properties/en-CA.po
#	build/i18n/po/circ.properties/en-GB.po
#	build/i18n/po/circ.properties/es-ES.po
#	build/i18n/po/circ.properties/fi-FI.po
#	build/i18n/po/circ.properties/fr-CA.po
#	build/i18n/po/circ.properties/he-IL.po
#	build/i18n/po/circ.properties/hu-HU.po
#	build/i18n/po/circ.properties/hy-AM.po
#	build/i18n/po/circ.properties/oc-FR.po
#	build/i18n/po/circ.properties/pt-BR.po
#	build/i18n/po/circ.properties/ru-RU.po
#	build/i18n/po/circ.properties/sv-SE.po
#	build/i18n/po/circ.properties/tr-TR.po
#	build/i18n/po/common.properties/ar-JO.po
#	build/i18n/po/common.properties/common.properties.pot
#	build/i18n/po/common.properties/cs-CZ.po
#	build/i18n/po/common.properties/de-DE.po
#	build/i18n/po/common.properties/en-CA.po
#	build/i18n/po/common.properties/en-GB.po
#	build/i18n/po/common.properties/es-ES.po
#	build/i18n/po/common.properties/fi-FI.po
#	build/i18n/po/common.properties/fr-CA.po
#	build/i18n/po/common.properties/he-IL.po
#	build/i18n/po/common.properties/hu-HU.po
#	build/i18n/po/common.properties/hy-AM.po
#	build/i18n/po/common.properties/oc-FR.po
#	build/i18n/po/common.properties/pt-BR.po
#	build/i18n/po/common.properties/ru-RU.po
#	build/i18n/po/common.properties/sv-SE.po
#	build/i18n/po/common.properties/tr-TR.po
#	build/i18n/po/conify.dtd/ar-JO.po
#	build/i18n/po/conify.dtd/conify.dtd.pot
#	build/i18n/po/conify.dtd/cs-CZ.po
#	build/i18n/po/conify.dtd/de-DE.po
#	build/i18n/po/conify.dtd/en-CA.po
#	build/i18n/po/conify.dtd/en-GB.po
#	build/i18n/po/conify.dtd/es-ES.po
#	build/i18n/po/conify.dtd/fi-FI.po
#	build/i18n/po/conify.dtd/fr-CA.po
#	build/i18n/po/conify.dtd/he-IL.po
#	build/i18n/po/conify.dtd/hu-HU.po
#	build/i18n/po/conify.dtd/hy-AM.po
#	build/i18n/po/conify.dtd/oc-FR.po
#	build/i18n/po/conify.dtd/pt-BR.po
#	build/i18n/po/conify.dtd/ru-RU.po
#	build/i18n/po/conify.dtd/sv-SE.po
#	build/i18n/po/conify.dtd/tr-TR.po
#	build/i18n/po/conify.js/ar-JO.po
#	build/i18n/po/conify.js/conify.js.pot
#	build/i18n/po/conify.js/cs-CZ.po
#	build/i18n/po/conify.js/de-DE.po
#	build/i18n/po/conify.js/en-CA.po
#	build/i18n/po/conify.js/en-GB.po
#	build/i18n/po/conify.js/es-ES.po
#	build/i18n/po/conify.js/fi-FI.po
#	build/i18n/po/conify.js/fr-CA.po
#	build/i18n/po/conify.js/he-IL.po
#	build/i18n/po/conify.js/hu-HU.po
#	build/i18n/po/conify.js/hy-AM.po
#	build/i18n/po/conify.js/oc-FR.po
#	build/i18n/po/conify.js/pt-BR.po
#	build/i18n/po/conify.js/ru-RU.po
#	build/i18n/po/conify.js/sv-SE.po
#	build/i18n/po/conify.js/tr-TR.po
#	build/i18n/po/db.seed/ar-JO.po
#	build/i18n/po/db.seed/cs-CZ.po
#	build/i18n/po/db.seed/db.seed.pot
#	build/i18n/po/db.seed/de-DE.po
#	build/i18n/po/db.seed/en-CA.po
#	build/i18n/po/db.seed/en-GB.po
#	build/i18n/po/db.seed/es-ES.po
#	build/i18n/po/db.seed/fi-FI.po
#	build/i18n/po/db.seed/fr-CA.po
#	build/i18n/po/db.seed/he-IL.po
#	build/i18n/po/db.seed/hu-HU.po
#	build/i18n/po/db.seed/hy-AM.po
#	build/i18n/po/db.seed/oc-FR.po
#	build/i18n/po/db.seed/pt-BR.po
#	build/i18n/po/db.seed/ru-RU.po
#	build/i18n/po/db.seed/sv-SE.po
#	build/i18n/po/db.seed/tr-TR.po
#	build/i18n/po/fm_IDL.dtd/ar-JO.po
#	build/i18n/po/fm_IDL.dtd/cs-CZ.po
#	build/i18n/po/fm_IDL.dtd/de-DE.po
#	build/i18n/po/fm_IDL.dtd/en-CA.po
#	build/i18n/po/fm_IDL.dtd/en-GB.po
#	build/i18n/po/fm_IDL.dtd/es-ES.po
#	build/i18n/po/fm_IDL.dtd/fi-FI.po
#	build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot
#	build/i18n/po/fm_IDL.dtd/fr-CA.po
#	build/i18n/po/fm_IDL.dtd/he-IL.po
#	build/i18n/po/fm_IDL.dtd/hu-HU.po
#	build/i18n/po/fm_IDL.dtd/hy-AM.po
#	build/i18n/po/fm_IDL.dtd/oc-FR.po
#	build/i18n/po/fm_IDL.dtd/pt-BR.po
#	build/i18n/po/fm_IDL.dtd/ru-RU.po
#	build/i18n/po/fm_IDL.dtd/sv-SE.po
#	build/i18n/po/fm_IDL.dtd/tr-TR.po
#	build/i18n/po/ils_events.xml/ar-JO.po
#	build/i18n/po/ils_events.xml/cs-CZ.po
#	build/i18n/po/ils_events.xml/de-DE.po
#	build/i18n/po/ils_events.xml/en-CA.po
#	build/i18n/po/ils_events.xml/en-GB.po
#	build/i18n/po/ils_events.xml/es-ES.po
#	build/i18n/po/ils_events.xml/fi-FI.po
#	build/i18n/po/ils_events.xml/fr-CA.po
#	build/i18n/po/ils_events.xml/he-IL.po
#	build/i18n/po/ils_events.xml/hu-HU.po
#	build/i18n/po/ils_events.xml/hy-AM.po
#	build/i18n/po/ils_events.xml/ils_events.xml.pot
#	build/i18n/po/ils_events.xml/oc-FR.po
#	build/i18n/po/ils_events.xml/pt-BR.po
#	build/i18n/po/ils_events.xml/ru-RU.po
#	build/i18n/po/ils_events.xml/sv-SE.po
#	build/i18n/po/ils_events.xml/tr-TR.po
#	build/i18n/po/lang.dtd/ar-JO.po
#	build/i18n/po/lang.dtd/cs-CZ.po
#	build/i18n/po/lang.dtd/de-DE.po
#	build/i18n/po/lang.dtd/en-CA.po
#	build/i18n/po/lang.dtd/en-GB.po
#	build/i18n/po/lang.dtd/es-ES.po
#	build/i18n/po/lang.dtd/fi-FI.po
#	build/i18n/po/lang.dtd/fr-CA.po
#	build/i18n/po/lang.dtd/he-IL.po
#	build/i18n/po/lang.dtd/hu-HU.po
#	build/i18n/po/lang.dtd/hy-AM.po
#	build/i18n/po/lang.dtd/lang.dtd.pot
#	build/i18n/po/lang.dtd/oc-FR.po
#	build/i18n/po/lang.dtd/pt-BR.po
#	build/i18n/po/lang.dtd/ru-RU.po
#	build/i18n/po/lang.dtd/sv-SE.po
#	build/i18n/po/lang.dtd/tr-TR.po
#	build/i18n/po/match_set.js/ar-JO.po
#	build/i18n/po/match_set.js/cs-CZ.po
#	build/i18n/po/match_set.js/en-GB.po
#	build/i18n/po/match_set.js/es-ES.po
#	build/i18n/po/match_set.js/fr-CA.po
#	build/i18n/po/match_set.js/hy-AM.po
#	build/i18n/po/match_set.js/match_set.js.pot
#	build/i18n/po/offline.properties/ar-JO.po
#	build/i18n/po/offline.properties/cs-CZ.po
#	build/i18n/po/offline.properties/de-DE.po
#	build/i18n/po/offline.properties/en-CA.po
#	build/i18n/po/offline.properties/en-GB.po
#	build/i18n/po/offline.properties/es-ES.po
#	build/i18n/po/offline.properties/fi-FI.po
#	build/i18n/po/offline.properties/fr-CA.po
#	build/i18n/po/offline.properties/he-IL.po
#	build/i18n/po/offline.properties/hu-HU.po
#	build/i18n/po/offline.properties/hy-AM.po
#	build/i18n/po/offline.properties/oc-FR.po
#	build/i18n/po/offline.properties/offline.properties.pot
#	build/i18n/po/offline.properties/pt-BR.po
#	build/i18n/po/offline.properties/ru-RU.po
#	build/i18n/po/offline.properties/sv-SE.po
#	build/i18n/po/offline.properties/tr-TR.po
#	build/i18n/po/opac.dtd/ar-JO.po
#	build/i18n/po/opac.dtd/cs-CZ.po
#	build/i18n/po/opac.dtd/de-DE.po
#	build/i18n/po/opac.dtd/en-CA.po
#	build/i18n/po/opac.dtd/en-GB.po
#	build/i18n/po/opac.dtd/es-ES.po
#	build/i18n/po/opac.dtd/fi-FI.po
#	build/i18n/po/opac.dtd/fr-CA.po
#	build/i18n/po/opac.dtd/he-IL.po
#	build/i18n/po/opac.dtd/hu-HU.po
#	build/i18n/po/opac.dtd/hy-AM.po
#	build/i18n/po/opac.dtd/oc-FR.po
#	build/i18n/po/opac.dtd/opac.dtd.pot
#	build/i18n/po/opac.dtd/pt-BR.po
#	build/i18n/po/opac.dtd/ru-RU.po
#	build/i18n/po/opac.dtd/sv-SE.po
#	build/i18n/po/opac.dtd/tr-TR.po
#	build/i18n/po/opac.js/ar-JO.po
#	build/i18n/po/opac.js/cs-CZ.po
#	build/i18n/po/opac.js/de-DE.po
#	build/i18n/po/opac.js/en-CA.po
#	build/i18n/po/opac.js/en-GB.po
#	build/i18n/po/opac.js/es-ES.po
#	build/i18n/po/opac.js/fi-FI.po
#	build/i18n/po/opac.js/fr-CA.po
#	build/i18n/po/opac.js/he-IL.po
#	build/i18n/po/opac.js/hu-HU.po
#	build/i18n/po/opac.js/hy-AM.po
#	build/i18n/po/opac.js/oc-FR.po
#	build/i18n/po/opac.js/opac.js.pot
#	build/i18n/po/opac.js/pt-BR.po
#	build/i18n/po/opac.js/ru-RU.po
#	build/i18n/po/opac.js/sv-SE.po
#	build/i18n/po/opac.js/tr-TR.po
#	build/i18n/po/patron.properties/ar-JO.po
#	build/i18n/po/patron.properties/cs-CZ.po
#	build/i18n/po/patron.properties/de-DE.po
#	build/i18n/po/patron.properties/en-CA.po
#	build/i18n/po/patron.properties/en-GB.po
#	build/i18n/po/patron.properties/es-ES.po
#	build/i18n/po/patron.properties/fi-FI.po
#	build/i18n/po/patron.properties/fr-CA.po
#	build/i18n/po/patron.properties/he-IL.po
#	build/i18n/po/patron.properties/hu-HU.po
#	build/i18n/po/patron.properties/hy-AM.po
#	build/i18n/po/patron.properties/oc-FR.po
#	build/i18n/po/patron.properties/patron.properties.pot
#	build/i18n/po/patron.properties/pt-BR.po
#	build/i18n/po/patron.properties/ru-RU.po
#	build/i18n/po/patron.properties/sv-SE.po
#	build/i18n/po/patron.properties/tr-TR.po
#	build/i18n/po/pickup_and_return.js/ar-JO.po
#	build/i18n/po/pickup_and_return.js/cs-CZ.po
#	build/i18n/po/pickup_and_return.js/de-DE.po
#	build/i18n/po/pickup_and_return.js/en-CA.po
#	build/i18n/po/pickup_and_return.js/en-GB.po
#	build/i18n/po/pickup_and_return.js/es-ES.po
#	build/i18n/po/pickup_and_return.js/fi-FI.po
#	build/i18n/po/pickup_and_return.js/fr-CA.po
#	build/i18n/po/pickup_and_return.js/he-IL.po
#	build/i18n/po/pickup_and_return.js/hu-HU.po
#	build/i18n/po/pickup_and_return.js/hy-AM.po
#	build/i18n/po/pickup_and_return.js/oc-FR.po
#	build/i18n/po/pickup_and_return.js/pickup_and_return.js.pot
#	build/i18n/po/pickup_and_return.js/pt-BR.po
#	build/i18n/po/pickup_and_return.js/ru-RU.po
#	build/i18n/po/pickup_and_return.js/sv-SE.po
#	build/i18n/po/pickup_and_return.js/tr-TR.po
#	build/i18n/po/pull_list.js/ar-JO.po
#	build/i18n/po/pull_list.js/cs-CZ.po
#	build/i18n/po/pull_list.js/de-DE.po
#	build/i18n/po/pull_list.js/en-CA.po
#	build/i18n/po/pull_list.js/en-GB.po
#	build/i18n/po/pull_list.js/es-ES.po
#	build/i18n/po/pull_list.js/fi-FI.po
#	build/i18n/po/pull_list.js/fr-CA.po
#	build/i18n/po/pull_list.js/he-IL.po
#	build/i18n/po/pull_list.js/hu-HU.po
#	build/i18n/po/pull_list.js/hy-AM.po
#	build/i18n/po/pull_list.js/oc-FR.po
#	build/i18n/po/pull_list.js/pt-BR.po
#	build/i18n/po/pull_list.js/pull_list.js.pot
#	build/i18n/po/pull_list.js/ru-RU.po
#	build/i18n/po/pull_list.js/sv-SE.po
#	build/i18n/po/pull_list.js/tr-TR.po
#	build/i18n/po/register.js/ar-JO.po
#	build/i18n/po/register.js/cs-CZ.po
#	build/i18n/po/register.js/de-DE.po
#	build/i18n/po/register.js/en-CA.po
#	build/i18n/po/register.js/en-GB.po
#	build/i18n/po/register.js/es-ES.po
#	build/i18n/po/register.js/fi-FI.po
#	build/i18n/po/register.js/fr-CA.po
#	build/i18n/po/register.js/he-IL.po
#	build/i18n/po/register.js/hu-HU.po
#	build/i18n/po/register.js/hy-AM.po
#	build/i18n/po/register.js/oc-FR.po
#	build/i18n/po/register.js/pt-BR.po
#	build/i18n/po/register.js/register.js.pot
#	build/i18n/po/register.js/ru-RU.po
#	build/i18n/po/register.js/sv-SE.po
#	build/i18n/po/register.js/tr-TR.po
#	build/i18n/po/reports.dtd/ar-JO.po
#	build/i18n/po/reports.dtd/cs-CZ.po
#	build/i18n/po/reports.dtd/de-DE.po
#	build/i18n/po/reports.dtd/en-CA.po
#	build/i18n/po/reports.dtd/en-GB.po
#	build/i18n/po/reports.dtd/es-ES.po
#	build/i18n/po/reports.dtd/fi-FI.po
#	build/i18n/po/reports.dtd/fr-CA.po
#	build/i18n/po/reports.dtd/he-IL.po
#	build/i18n/po/reports.dtd/hu-HU.po
#	build/i18n/po/reports.dtd/hy-AM.po
#	build/i18n/po/reports.dtd/oc-FR.po
#	build/i18n/po/reports.dtd/pt-BR.po
#	build/i18n/po/reports.dtd/reports.dtd.pot
#	build/i18n/po/reports.dtd/ru-RU.po
#	build/i18n/po/reports.dtd/sv-SE.po
#	build/i18n/po/reports.dtd/tr-TR.po
#	build/i18n/po/reports.js/ar-JO.po
#	build/i18n/po/reports.js/cs-CZ.po
#	build/i18n/po/reports.js/de-DE.po
#	build/i18n/po/reports.js/en-CA.po
#	build/i18n/po/reports.js/en-GB.po
#	build/i18n/po/reports.js/es-ES.po
#	build/i18n/po/reports.js/fi-FI.po
#	build/i18n/po/reports.js/fr-CA.po
#	build/i18n/po/reports.js/he-IL.po
#	build/i18n/po/reports.js/hu-HU.po
#	build/i18n/po/reports.js/hy-AM.po
#	build/i18n/po/reports.js/oc-FR.po
#	build/i18n/po/reports.js/pt-BR.po
#	build/i18n/po/reports.js/reports.js.pot
#	build/i18n/po/reports.js/ru-RU.po
#	build/i18n/po/reports.js/sv-SE.po
#	build/i18n/po/reports.js/tr-TR.po
#	build/i18n/po/reservation.js/ar-JO.po
#	build/i18n/po/reservation.js/cs-CZ.po
#	build/i18n/po/reservation.js/de-DE.po
#	build/i18n/po/reservation.js/en-CA.po
#	build/i18n/po/reservation.js/en-GB.po
#	build/i18n/po/reservation.js/es-ES.po
#	build/i18n/po/reservation.js/fi-FI.po
#	build/i18n/po/reservation.js/fr-CA.po
#	build/i18n/po/reservation.js/he-IL.po
#	build/i18n/po/reservation.js/hu-HU.po
#	build/i18n/po/reservation.js/hy-AM.po
#	build/i18n/po/reservation.js/oc-FR.po
#	build/i18n/po/reservation.js/pt-BR.po
#	build/i18n/po/reservation.js/reservation.js.pot
#	build/i18n/po/reservation.js/ru-RU.po
#	build/i18n/po/reservation.js/sv-SE.po
#	build/i18n/po/reservation.js/tr-TR.po
#	build/i18n/po/selfcheck.js/ar-JO.po
#	build/i18n/po/selfcheck.js/cs-CZ.po
#	build/i18n/po/selfcheck.js/de-DE.po
#	build/i18n/po/selfcheck.js/en-CA.po
#	build/i18n/po/selfcheck.js/en-GB.po
#	build/i18n/po/selfcheck.js/es-ES.po
#	build/i18n/po/selfcheck.js/fi-FI.po
#	build/i18n/po/selfcheck.js/fr-CA.po
#	build/i18n/po/selfcheck.js/he-IL.po
#	build/i18n/po/selfcheck.js/hu-HU.po
#	build/i18n/po/selfcheck.js/hy-AM.po
#	build/i18n/po/selfcheck.js/oc-FR.po
#	build/i18n/po/selfcheck.js/pt-BR.po
#	build/i18n/po/selfcheck.js/ru-RU.po
#	build/i18n/po/selfcheck.js/selfcheck.js.pot
#	build/i18n/po/selfcheck.js/sv-SE.po
#	build/i18n/po/selfcheck.js/tr-TR.po
#	build/i18n/po/serial.js/ar-JO.po
#	build/i18n/po/serial.js/cs-CZ.po
#	build/i18n/po/serial.js/de-DE.po
#	build/i18n/po/serial.js/en-GB.po
#	build/i18n/po/serial.js/es-ES.po
#	build/i18n/po/serial.js/hy-AM.po
#	build/i18n/po/serial.js/serial.js.pot
#	build/i18n/po/serial.properties/ar-JO.po
#	build/i18n/po/serial.properties/cs-CZ.po
#	build/i18n/po/serial.properties/de-DE.po
#	build/i18n/po/serial.properties/en-CA.po
#	build/i18n/po/serial.properties/en-GB.po
#	build/i18n/po/serial.properties/es-ES.po
#	build/i18n/po/serial.properties/fi-FI.po
#	build/i18n/po/serial.properties/fr-CA.po
#	build/i18n/po/serial.properties/hy-AM.po
#	build/i18n/po/serial.properties/oc-FR.po
#	build/i18n/po/serial.properties/pt-BR.po
#	build/i18n/po/serial.properties/serial.properties.pot
#	build/i18n/po/serial.properties/tr-TR.po
#	build/i18n/po/tpac/ar-JO.po
#	build/i18n/po/tpac/cs-CZ.po
#	build/i18n/po/tpac/de-DE.po
#	build/i18n/po/tpac/en-CA.po
#	build/i18n/po/tpac/en-GB.po
#	build/i18n/po/tpac/es-ES.po
#	build/i18n/po/tpac/fi-FI.po
#	build/i18n/po/tpac/fr-CA.po
#	build/i18n/po/tpac/he-IL.po
#	build/i18n/po/tpac/hu-HU.po
#	build/i18n/po/tpac/hy-AM.po
#	build/i18n/po/tpac/oc-FR.po
#	build/i18n/po/tpac/pt-BR.po
#	build/i18n/po/tpac/ru-RU.po
#	build/i18n/po/tpac/sv-SE.po
#	build/i18n/po/tpac/tr-TR.po
#	build/i18n/po/vandelay.js/ar-JO.po
#	build/i18n/po/vandelay.js/cs-CZ.po
#	build/i18n/po/vandelay.js/en-CA.po
#	build/i18n/po/vandelay.js/en-GB.po
#	build/i18n/po/vandelay.js/es-ES.po
#	build/i18n/po/vandelay.js/hy-AM.po
#	build/i18n/po/vandelay.js/pt-BR.po
#	build/i18n/po/vandelay.js/vandelay.js.pot
#	build/i18n/po/webstaff/ar-JO.po
#	build/i18n/po/webstaff/cs-CZ.po
#	build/i18n/po/webstaff/es-ES.po
#	build/i18n/po/webstaff/hy-AM.po
#	build/i18n/po/webstaff/ru-RU.po
#	build/i18n/po/webstaff/webstaff.pot
#	configure.ac
#	docs/installation/server_upgrade.adoc
  • Loading branch information
Lucien van Wouw committed Oct 20, 2017
2 parents 0625478 + 8e1f00f commit 1a92bcb
Show file tree
Hide file tree
Showing 617 changed files with 4,010 additions and 3,881 deletions.
663 changes: 206 additions & 457 deletions ChangeLog

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Open-ILS/src/perlmods/lib/OpenILS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut

our $VERSION = '2.1206';
our $VERSION = '2.1207';

1;
2 changes: 1 addition & 1 deletion Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
return "2-12-6";
return "2-12-7";
}

__PACKAGE__->register_method(
Expand Down
4 changes: 2 additions & 2 deletions Open-ILS/src/sql/Pg/002.schema.config.sql
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');

INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1055', :eg_version); -- berick/phasefx
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.6', :eg_version);
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1078', :eg_version); -- csharp/bshum/gmcharlt
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.7', :eg_version);

CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
BEGIN;

SELECT evergreen.upgrade_deps_block_check('1078', :eg_version); -- csharp/bshum/gmcharlt

-- The following billing types would not have been automatically added
-- in upgrade scripts between versions 1.2 and 1.4 (early 2009). We
-- add them here. It's okay if they fail, so this should probably be
-- run outside a transaction if added to the version-upgrade scripts.

INSERT INTO config.billing_type (id, name, owner)
SELECT 7, 'Damaged Item', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item');

INSERT INTO config.billing_type (id, name, owner)
SELECT 8, 'Damaged Item Processing Fee', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item Processing Fee');

INSERT INTO config.billing_type (id, name, owner)
SELECT 9, 'Notification Fee', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Notification Fee');

COMMIT;
25 changes: 25 additions & 0 deletions Open-ILS/src/sql/Pg/version-upgrade/2.12.6-2.12.7-upgrade-db.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--Upgrade Script for 2.12.6 to 2.12.7
\set eg_version '''2.12.7'''
BEGIN;
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.7', :eg_version);

SELECT evergreen.upgrade_deps_block_check('1078', :eg_version); -- csharp/bshum/gmcharlt

-- The following billing types would not have been automatically added
-- in upgrade scripts between versions 1.2 and 1.4 (early 2009). We
-- add them here. It's okay if they fail, so this should probably be
-- run outside a transaction if added to the version-upgrade scripts.

INSERT INTO config.billing_type (id, name, owner)
SELECT 7, 'Damaged Item', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item');

INSERT INTO config.billing_type (id, name, owner)
SELECT 8, 'Damaged Item Processing Fee', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item Processing Fee');

INSERT INTO config.billing_type (id, name, owner)
SELECT 9, 'Notification Fee', 1
WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Notification Fee');

COMMIT;
3 changes: 3 additions & 0 deletions Open-ILS/src/templates/staff/cat/volcopy/index.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
angular.module('egCoreMod').run(['egStrings', function(s) {
s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved volume/copy template(s)') %]";
s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted volume/copy template') %]";
[%# Note the "~" characters escape the gettext brackets %]
s.COPY_NOTE_INITIALS =
"[% l('[_1] ~[ [_2] @ [_3] ~]', '{{value}}', '{{initials}}', '{{ws_ou}}') %]"
}]);
</script>
[% END %]
Expand Down
34 changes: 28 additions & 6 deletions Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<b>[% l('Status') %]</b>
</div>
<div class="col-md-4">
<b>[% l('Statistical Categories') %]</b>
<b>[% l('Copy Alert') %]</b>
</div>
</div>

Expand Down Expand Up @@ -138,6 +138,7 @@
<div class="col-md-6">
<b>[% l('Reference?') %]</b>
</div>

</div>

<div class="row">
Expand Down Expand Up @@ -405,13 +406,33 @@
</div>

<div class="col-md-4">

<div class="row" >
<div class="col-xs-12">
<div class="row">
<div class="nullable col-xs-12">
<input class="form-control" type="text" ng-model="working.alert_message"
ng-disabled="!defaults.attributes.alert_message" placeholder="Alert message" />
</div>
</div>
</div>
</div>

<div class="row pad-vert"></div>
<div class="row">
<div class="col-xs-12">
<select class="form-control" ng-disabled="!defaults.statcats"
ng-model="working.statcat_filter"
ng-options="o.id() as o.shortname() for o in statcat_filter_list">
<option value="">[% l('Filter by Library') %]</option>
</select>
<div class="row bg-info">
<div class="col-xs-12">
<b>Statistical Categories</b>
</div>
</div>
<div class="row">
<select class="form-control" ng-disabled="!defaults.statcats"
ng-model="working.statcat_filter"
ng-options="o.id() as o.shortname() for o in statcat_filter_list">
<option value="">[% l('Filter by Library') %]</option>
</select>
</div>
</div>
</div>

Expand All @@ -437,6 +458,7 @@
</div>
</div>
</div>

</div>

</div>
Expand Down
5 changes: 4 additions & 1 deletion Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,14 @@
</div>
</div>
<div class="row pad-vert">
<div class="col-md-12">
<div class="col-md-10">
<textarea class="form-control" ng-change="n.value(value) && n.ischanged(1)"
ng-model="value" placeholder="[% l('Note...') %]" ng-disabled="deleted">
</textarea>
</div>
<div class="col-md-2">
{{n.create_date() | date:$root.egDateFormat}}
</div>
</div>
<div class="row">
<div class="col-md-12">
Expand Down
5 changes: 3 additions & 2 deletions Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@
</div>
<div class="col-xs-6">
<label>
<input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
[% l('Alerts') %]
<input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alert_message"/>
<!-- <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/> -->
[% l('Alert Message') %]
</label>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ within the "form" by name for validation.
<div class="row reg-field-row" ng-show="show_field('au.dob')">
[% draw_field_label('au', 'dob') %]
<div class="col-md-3 reg-field-input">
<eg-date-input
<eg-date-input
ng-required="field_required('au', 'dob')"
ng-model="patron.dob"
ng-blur="handle_field_changed(patron, 'dob')">
</eg-date-input>
Expand Down
1 change: 1 addition & 0 deletions Open-ILS/src/templates/vandelay/vandelay.tt2
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[% ctx.page_title = l('MARC Import/Export') %]

<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/vandelay/vandelay.js'> </script>
<script type="text/javascript" src='[% ctx.media_prefix %]/js/file-saver/FileSaver.min.js'> </script>
<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/vandelay.css'/>
<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %]/vandelay.css'/>

Expand Down
16 changes: 14 additions & 2 deletions Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
location : true,
holdable : true,
age_protect : true,
floating : true
floating : true,
alert_message : true
}
};

Expand Down Expand Up @@ -1576,6 +1577,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
createSimpleUpdateWatcher('mint_condition');
createSimpleUpdateWatcher('opac_visible');
createSimpleUpdateWatcher('ref');
createSimpleUpdateWatcher('alert_message');

$scope.saveCompletedCopies = function (and_exit) {
var cnHash = {};
Expand Down Expand Up @@ -1668,7 +1670,16 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,

$scope.ok = function(note) {

if (note.initials) note.value += ' [' + note.initials + ']';
if ($scope.initials) {
note.value = egCore.strings.$replace(
egCore.strings.COPY_NOTE_INITIALS, {
value : note.value,
initials : $scope.initials,
ws_ou : egCore.org.get(
egCore.auth.user().ws_ou()).shortname()
});
}

angular.forEach(copy_list, function (cp) {
if (!angular.isArray(cp.notes())) cp.notes([]);
var n = new egCore.idl.acpn();
Expand Down Expand Up @@ -2002,6 +2013,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
createSimpleUpdateWatcher('mint_condition');
createSimpleUpdateWatcher('opac_visible');
createSimpleUpdateWatcher('ref');
createSimpleUpdateWatcher('alert_message');

$scope.suffix_list = [];
itemSvc.get_suffixes(egCore.auth.user().ws_ou()).then(function(list){
Expand Down
6 changes: 4 additions & 2 deletions Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro

var row_item = {
index : checkinSvc.checkins.length,
copy_barcode : params.copy_barcode
input_barcode : params.copy_barcode
};

// track the item in the grid before sending the request
Expand All @@ -185,11 +185,13 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro

egCirc.checkin(params, options).then(
function(final_resp) {

row_item.evt = final_resp.evt;
angular.forEach(final_resp.data, function(val, key) {
row_item[key] = val;
});

row_item['copy_barcode'] = row_item.acp.barcode();

if (row_item.mbts) {
var amt = Number(row_item.mbts.balance_owed());
Expand Down
5 changes: 4 additions & 1 deletion Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
// immediate reaction to their barcode input action.
var row_item = {
index : $scope.checkouts.length,
copy_barcode : params.copy_barcode,
input_barcode : params.copy_barcode,
noncat_type : params.noncat_type
};

Expand Down Expand Up @@ -165,6 +165,9 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
angular.forEach(co_resp.data, function(val, key) {
row_item[key] = val;
});

row_item['copy_barcode'] = row_item.acp.barcode();

munge_checkout_resp(co_resp, row_item);
},
function() {
Expand Down
2 changes: 1 addition & 1 deletion Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
if ($scope.patron.day_phone &&
$scope.patron.isnew &&
$scope.org_settings['patron.password.use_phone']) {
$scope.patron.passwd = phone.substr(-4);
$scope.patron.passwd = $scope.patron.day_phone.substr(-4);
}
case 'evening_phone' :
case 'other_phone' :
Expand Down
4 changes: 3 additions & 1 deletion Open-ILS/web/js/ui/default/staff/circ/renew/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) {
// immediate reaction to their barcode input action.
var row_item = {
index : $scope.renewals.length,
copy_barcode : params.copy_barcode,
input_barcode : params.copy_barcode,
noncat_type : params.noncat_type
};

Expand All @@ -103,6 +103,8 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) {
row_item[key] = val;
});

row_item['copy_barcode'] = row_item.acp.barcode();

if (row_item.mbts) {
var amt = Number(row_item.mbts.balance_owed());
if (amt != 0) {
Expand Down
25 changes: 18 additions & 7 deletions Open-ILS/web/js/ui/default/vandelay/vandelay.js
Original file line number Diff line number Diff line change
Expand Up @@ -577,13 +577,24 @@ function vlExportRecordQueue(opts) {
req.onreadystatechange = function () {
if (req.readyState == 4) {
var file_tag = opts.nonimported ? '_nonimported' : '';
openils.XUL.contentToFileSaveDialog(req.responseText, null, {
defaultString : currentQueueName + file_tag + '.mrc',
defaultExtension : '.mrc',
filterName : 'MARC21',
filterExtension : '*.mrc',
filterAll : true
} );
var filename = currentQueueName + file_tag + '.mrc';

try {
if (window.IAMBROWSER) {
var blob = new Blob([req.responseText], {type: "application/octet-stream"});
saveAs(blob, filename);
} else {
openils.XUL.contentToFileSaveDialog(req.responseText, null, {
defaultString : filename,
defaultExtension : '.mrc',
filterName : 'MARC21',
filterExtension : '*.mrc',
filterAll : true
} );
}
} catch (E) {
alert(E);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Open-ILS/xul/staff_client/chrome/content/main/about.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_6</p>
<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_7</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
Expand Down
2 changes: 1 addition & 1 deletion Open-ILS/xul/staff_client/defaults/preferences/prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
pref("open-ils.enable_join_tabs", true);

// We'll use this one to help brand some build information into the client, and rely on subversion keywords
pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_6");
pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_7");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ Installation instructions
+
[source, bash]
------------------------------------------------------------------------------
make STAFF_CLIENT_STAMP_ID=rel_2_12_6 install
make STAFF_CLIENT_STAMP_ID=rel_2_12_7 install
------------------------------------------------------------------------------
+
2. The server portion of the staff client expects `http://hostname/xul/server`
Expand Down
2 changes: 1 addition & 1 deletion build/i18n/po/AutoFieldWidget.js/AutoFieldWidget.js.pot
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Evergreen 1.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2017-09-20 16:54:32-0400\n"
"POT-Creation-Date: 2017-10-19 13:33:50-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
6 changes: 3 additions & 3 deletions build/i18n/po/AutoFieldWidget.js/ar-JO.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: evergreen\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2017-08-25 14:21-0400\n"
"POT-Creation-Date: 2017-09-20 16:54-0400\n"
"PO-Revision-Date: 2017-04-09 07:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2017-08-28 05:31+0000\n"
"X-Generator: Launchpad (build 18446)\n"
"X-Launchpad-Export-Date: 2017-09-23 06:08+0000\n"
"X-Generator: Launchpad (build 18463)\n"

#: AutoFieldWidget.js:REQ_FIELDS_EMPTY
msgid "${0} edit pane has ${1} required field(s) that contain no value(s)"
Expand Down
Loading

0 comments on commit 1a92bcb

Please sign in to comment.