]> git.evergreen-ils.org Git - Evergreen.git/commit
projects / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d606c8) | patch
Merging acq-experiment to trunk, since rel_1_4 has been branched.
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 20 Oct 2008 19:42:01 +0000 (19:42 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 20 Oct 2008 19:42:01 +0000 (19:42 +0000)
commit88925dfa866c6c2b95df8382ff5887f711e683f5
tree406de6c9bcdbf4a8fdc4b00e5a0221aff409fc5atree
parent5d606c898bb600bb8855d8d9e64512c6526ea1becommit | diff
Merging acq-experiment to trunk, since rel_1_4 has been branched.

The majority of this is new ACQ-related code, with a few modifications of existing code.

Truncated svnmerge commit message:

Merged revisions 8236,8238-8244,8246-8249,8251-8252,8254-8257,8260,8266-8269,8271,8273,8276-8286,8288-8290,8303,8313,8317-8318,8320-8321,8323-8324,8326,8328-8330,8332-8335,8337-8340,8342,8345,8349-8350,8355-8360,8362-8378,8385-8386,8388,8390-8391,8393-8397,8399-8401,8404,8406-8413,8415-8422,8424-8425,8427-8430,8451,8453-8454,8456,8458,8467,8469-8470,8476,8478,8482-8487,8495,8497,8510,8534,8539-8541,8574,8576,8578-8579,8581,8593-8599,8601,8603,8605,8607-8608,8617,8620-8623,8629,8631,8633,8635,8637-8639,8646-8647,8649-8651,8657-8660,8662,8664,8668,8670-8671,8675-8676,8678,8681-8688,8692,8694-8695,8697-8698,8706,8712,8714-8720,8722,8724,8727-8730,8732-8736,8744-8748,8756-8758,8762-8764,8768-8770,8773-8785,8789-8793,8795-8797,8799-8800,8803-8807,8814-8816,8821-8822,8826-8828,8831-8834,8836,8838-8839,8841,8843,8864-8867,8876-8880,8882,8885,8929,8932,8934-8935,8937-8941,8945-8947,8957-8958,8965,8978-8984,8996-8998,9005-9006,9109,9136,9139,9153,9167,9188,9202,9205,9237-9240,9246,9249,9251,9262-9264,9267-9268,9273-9274,9283,9290,9315-9317,9324,9326,9331-9332,9337,9341,9344,9346,9348,9351,9355,9382-9384,9404-9411,9416-9423,9438,9446,9463,9480,9487-9488,9508-9510,9516-9519,9531,9537-9538,9550-9563,9572-9576,9578-9583,9585-9586,9588,9590-9592,9596-9598,9602-9605,9607-9611,9613,9617-9621,9623-9624,9628,9630,9633,9636-9640,9643-9648,9651,9656-9668,9673-9674,9676,9679-9683,9687-9692,9702,9709-9713,9722,9735,9810,9812,9818-9821,9894,9905,9907,9911,9913,9915-9917,9921-9924,9928-9930,9935,9937-9940,9944,9946,9997,10006-10007,10017-10018,10026,10034-10039,10043-10045,10053-10055,10057-10058,10062,10086,10089-10090,10094-10111,10113-10114,10116-10118,10120,10122,10146,10149,10160,10163,10172,10175-10176,10180-10186,10196-10198,10234-10235,10239,10309,10316-10318,10322,10327-10330,10342,10349-10356,10460-10462,10567,10703,10720,10826,10834-10836,10854-10855,10857,10867 via svnmerge from
svn://svn.open-ils.org/ILS/branches/acq-experiment

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10879 dcc99617-32d9-48b4-a31d-7c20da2025e4
77 files changed:
Open-ILS/examples/apache/eg_vhost.conf diff | blob | history
Open-ILS/examples/fm_IDL.xml diff | blob | history
Open-ILS/examples/oils_web.xml [new file with mode: 0644] blob
Open-ILS/src/extras/ils_events.xml diff | blob | history
Open-ILS/src/perlmods/OpenILS/Application/Acq.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/Application/Acq/Provider.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/Const.pm diff | blob | history
Open-ILS/src/perlmods/OpenILS/Utils/MFHD.pm [new file with mode: 0755] blob
Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Caption.pm [new file with mode: 0755] blob
Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Holding.pm [new file with mode: 0755] blob
Open-ILS/src/perlmods/OpenILS/Utils/MFHDParser.pm [new file with mode: 0644] blob
Open-ILS/src/perlmods/OpenILS/WWW/EGWeb.pm [new file with mode: 0644] blob
Open-ILS/src/sql/Pg/200.schema.acq.sql [new file with mode: 0644] blob
Open-ILS/src/sql/Pg/210.schema.serials.sql [new file with mode: 0644] blob
Open-ILS/src/sql/Pg/950.data.seed-values.sql diff | blob | history
Open-ILS/src/sql/Pg/build-db.sh diff | blob | history
Open-ILS/src/support-scripts/test-scripts/acq_fund.py [new file with mode: 0644] blob
Open-ILS/web/css/skin/default.css [new file with mode: 0644] blob
Open-ILS/web/css/skin/default/acq.css [new file with mode: 0644] blob
Open-ILS/web/css/skin/default/admin.css [new file with mode: 0644] blob
Open-ILS/web/css/theme/default.css [new file with mode: 0644] blob
Open-ILS/web/css/theme/default/acq.css [new file with mode: 0644] blob
Open-ILS/web/css/theme/default/admin.css [new file with mode: 0644] blob
Open-ILS/web/images/eg_logo.jpg [new file with mode: 0644] blob
Open-ILS/web/images/eg_tiny_logo.jpg [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/Util.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/CurrencyType.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/Fund.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/FundingSource.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/Lineitem.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/LineitemAttr.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/PO.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/Picklist.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/acq/Provider.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/editors.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/widget/FundSelector.js [new file with mode: 0644] blob
Open-ILS/web/js/dojo/openils/widget/ProviderSelector.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/base.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/common/jubgrid.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/list_currency_types.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/list_funds.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/list_providers.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/view_fund.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/financial/view_provider.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/picklist/bib_search.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/picklist/view_list.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/po/li_search.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/po/search.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/po/view_po.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/receiving/process.js [new file with mode: 0644] blob
Open-ILS/web/js/ui/default/acq/settings/li_attr.js [new file with mode: 0644] blob
Open-ILS/web/templates/base.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/common/jubgrid.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/list_funds.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/list_providers.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/view_fund.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/financial/view_provider.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/picklist/bib_search.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/picklist/list.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/picklist/view.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/po/li_search.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/po/search.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/po/view.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/receiving/process.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/acq/settings/li_attr.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/base.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/footer.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/header.tt2 [new file with mode: 0644] blob
Open-ILS/web/templates/default/menu.tt2 [new file with mode: 0644] blob
Evergreen ILS