From: gmc Date: Fri, 5 Nov 2010 17:50:28 +0000 (+0000) Subject: missed database update script X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bb4f1a430ef4ac23e76fccac07037542591fffde;p=evergreen%2Fbjwebb.git missed database update script Signed-off-by: Galen Charlton git-svn-id: svn://svn.open-ils.org/ILS/trunk@18633 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index f6d40906c..39abb0155 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -4963,9 +4963,15 @@ $$[%- USE date -%] # BT - vendcode goes to NAD/BY *suffix* w/ 91 qualifier # INGRAM - vendcode goes to NAD/BY *segment* w/ 91 qualifier (separately) # BRODART - vendcode goes to FTX segment (lineitem level) + # In the logic below, vendors are identified by their SANs, as that + # is the identifier most likely to be the same from library to library. + # Baker & Taylor = 1556150 + # Brodart = 1697684 + # Ingram = 1697978 + # Midwest Tapes = 2549913 -%] [%- -IF target.provider.edi_default.vendcode && target.provider.code == 'BRODART'; +IF target.provider.edi_default.vendcode && target.provider.san == '1697684'; xtra_ftx = target.provider.edi_default.vendcode; END; -%] @@ -4978,9 +4984,9 @@ END; "po_number":[% target.id %], "date":"[% date.format(date.now, '%Y%m%d') %]", "buyer":[ - [% IF target.provider.edi_default.vendcode && (target.provider.code == 'BT' || target.provider.name.match('(?i)^BAKER & TAYLOR')) -%] + [% IF target.provider.edi_default.vendcode && (target.provider.san == '1556150') -%] {"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"} - [%- ELSIF target.provider.edi_default.vendcode && target.provider.code == 'INGRAM' -%] + [%- ELSIF target.provider.edi_default.vendcode && target.provider.san == '1697978' -%] {"id":"[% target.ordering_agency.mailing_address.san %]"}, {"id-qualifier": 91, "id":"[% target.provider.edi_default.vendcode %]"} [%- ELSE -%] @@ -5006,6 +5012,9 @@ END; {"id-qualifier":"IB","id":"[% isbn %]"}, [%- END %] [% END %] + [% IF helpers.get_li_attr('upc', '', li.attributes) %] + {"id-qualifier":"UP","id":"[% helpers.get_li_attr('upc', '', li.attributes) %]"} + [% END %] {"id-qualifier":"IN","id":"[% li.id %]"} ], "price":[% li.estimated_unit_price || '0.00' %], diff --git a/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql b/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql new file mode 100644 index 000000000..fef1ad2ef --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql @@ -0,0 +1,7 @@ +BEGIN; + +INSERT INTO config.upgrade_log (version) VALUES ('0459'); -- gmc + +ALTER TABLE actor.usr_password_reset ALTER COLUMN request_time TYPE TIMESTAMP WITH TIME ZONE; + +COMMIT; diff --git a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js index 27ed9e3fd..7c08653c1 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js +++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js @@ -119,7 +119,7 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { }); fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.lineitem.retrieve'], + ['open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative'], { params : [ openils.User.authtoken, liId, args ], diff --git a/Open-ILS/web/js/dojo/openils/acq/Picklist.js b/Open-ILS/web/js/dojo/openils/acq/Picklist.js index 504b9691a..d80eeb534 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Picklist.js +++ b/Open-ILS/web/js/dojo/openils/acq/Picklist.js @@ -57,7 +57,7 @@ dojo.declare('openils.acq.Picklist', null, { // // Fetch the picklist information fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: false, params: [openils.User.authtoken, pl_id, {flesh_lineitem_count:1}], oncomplete: function(r) { diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index d12d09fac..dc8e56a3f 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -323,7 +323,7 @@ function AcqLiTable() { this.plCache[li.picklist()] = this.plCache[li.picklist()] || fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], {params: [this.authtoken, li.picklist()]}); if (pl) { if (pl.name() == "") { diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js index 102294e65..281189f92 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -52,7 +52,7 @@ function init() { } else { fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.invoice.retrieve'], + ['open-ils.acq', 'open-ils.acq.invoice.retrieve.authoritative'], { params : [openils.User.authtoken, invoiceId], oncomplete : function(r) { diff --git a/Open-ILS/web/js/ui/default/acq/lineitem/related.js b/Open-ILS/web/js/ui/default/acq/lineitem/related.js index e06a7161f..e90874d94 100644 --- a/Open-ILS/web/js/ui/default/acq/lineitem/related.js +++ b/Open-ILS/web/js/ui/default/acq/lineitem/related.js @@ -14,7 +14,7 @@ var paramPO; function fetchLi() { fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.lineitem.retrieve"], { + ["open-ils.acq", "open-ils.acq.lineitem.retrieve.authoritative"], { "async": true, "params": [openils.User.authtoken, targetId, { "flesh_attrs": true, diff --git a/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js b/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js index 17be1359a..9653aa529 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js @@ -30,7 +30,7 @@ function drawBriefRecordForm(fields) { openils.Util.hide('acq-brief-record-po-row'); fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, paramPL], oncomplete : function(r) { diff --git a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js index 392273bac..cf75f521a 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js @@ -90,7 +90,7 @@ function fooPicklist() { function viewPicklist() { var lineitem = fieldmapper.standardRequest( - [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve' ], + [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative' ], { params: [openils.User.authtoken, aur_obj.lineitem()] } diff --git a/Open-ILS/web/js/ui/default/acq/picklist/view.js b/Open-ILS/web/js/ui/default/acq/picklist/view.js index cfd6cb98d..7cbc0c5f2 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/view.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/view.js @@ -14,7 +14,7 @@ function load() { liTable = new AcqLiTable(); liTable.isPL = plId; fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, plId, {flesh_lineitem_count:true, flesh_owner:true}], diff --git a/Open-ILS/web/js/ui/default/acq/picklist/view_list.js b/Open-ILS/web/js/ui/default/acq/picklist/view_list.js index fb245a8c5..17b2e92e4 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/view_list.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/view_list.js @@ -68,7 +68,7 @@ function createPL(fields) { function(plId) { fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, plId, {flesh_lineitem_count:1, flesh_owner:1}], diff --git a/Open-ILS/web/js/ui/default/acq/search/picklist.js b/Open-ILS/web/js/ui/default/acq/search/picklist.js index b21bc37cb..61da13f74 100644 --- a/Open-ILS/web/js/ui/default/acq/search/picklist.js +++ b/Open-ILS/web/js/ui/default/acq/search/picklist.js @@ -165,7 +165,7 @@ function createPl(fields) { openils.acq.Picklist.create(fields, function(plId) { fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.picklist.retrieve"], { + ["open-ils.acq", "open-ils.acq.picklist.retrieve.authoritative"], { "async": true, "params": [ openils.User.authtoken, plId, diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 8cd554ae0..2405182e3 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -3402,7 +3402,7 @@ circ.util.batch_hold_update = function ( hold_ids, field_changes, params ) { circ.util.find_acq_po = function(session, copy_id) { dojo.require("openils.Util"); fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id"], { + ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id.authoritative"], { "params": [session, copy_id, {"clear_marc": true}], "onresponse": function(r) { if (r = openils.Util.readResponse(r)) {