No subject

Content-Type: text/plain; charset=3D&quot;utf-8&quot;<br><br>---<br>=C2=A0.=
../data/mysql/en/mandatory/userpermissions.sql=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=
=A0=C2=A0 4 ++--<br>=C2=A0installer/data/mysql/updatedatabase.pl=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=
=A0=C2=A0 7 +++++++<br>=C2=A02 files changed, 9 insertions(+), 2 deletions(=
-)<br>

<br>diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/in=
staller/data/mysql/en/mandatory/userpermissions.sql<br>index 29b3b05..f8893=
7a 100644<br>--- a/installer/data/mysql/en/mandatory/userpermissions.sql<br=
>

+++ b/installer/data/mysql/en/mandatory/userpermissions.sql<br>@@ -8,7 +8,7=
 @@ INSERT INTO permissions (module_bit, code, description) VALUES<br>=C2=
=A0=C2=A0=C2=A0 (13, &#39;edit_notices&#39;, &#39;Define notices&#39;),<br>=
=C2=A0=C2=A0=C2=A0 (13, &#39;edit_notice_status_triggers&#39;, &#39;Set not=
ice/status triggers for overdue items&#39;),<br>

=C2=A0=C2=A0=C2=A0 (13, &#39;view_system_logs&#39;, &#39;Browse the system =
logs&#39;),<br>-=C2=A0=C2=A0 (13, &#39;inventory&#39;, &#39;Perform invento=
ry (stocktaking) of your catalogue&#39;),<br>+=C2=A0=C2=A0 (13, &#39;invent=
ory&#39;, &#39;Perform inventory (stocktaking) of your catalog&#39;),<br>

=C2=A0=C2=A0=C2=A0 (13, &#39;stage_marc_import&#39;, &#39;Stage MARC record=
s into the reservoir&#39;),<br>=C2=A0=C2=A0=C2=A0 (13, &#39;manage_staged_m=
arc&#39;, &#39;Managed staged MARC records, including completing and revers=
ing imports&#39;),<br>=C2=A0=C2=A0=C2=A0 (13, &#39;export_catalog&#39;, &#3=
9;Export bibliographic and holdings data&#39;),<br>

@@ -16,4 +16,4 @@ INSERT INTO permissions (module_bit, code, description) V=
ALUES<br>=C2=A0=C2=A0=C2=A0 (13, &#39;delete_anonymize_patrons&#39;, &#39;D=
elete old borrowers and anonymize circulation history (deletes borrower rea=
ding history)&#39;),<br>

=C2=A0=C2=A0=C2=A0 (13, &#39;batch_upload_patron_images&#39;, &#39;Upload p=
atron images in batch or one at a time&#39;),<br>=C2=A0=C2=A0=C2=A0 (13, &#=
39;schedule_tasks&#39;, &#39;Schedule tasks to run&#39;)<br>-;<br>+;<br>\ N=
o newline at end of file<br>

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/=
updatedatabase.pl<br>index 7d410ee..293d9fa 100755<br>--- a/installer/data/=
mysql/updatedatabase.pl<br>+++ b/installer/data/mysql/updatedatabase.pl<br>

@@ -2529,6 +2529,13 @@ if (C4::Context-&gt;preference(&quot;Version&quot;) =
&lt; TransformToNum($DBversion)) {<br>=C2=A0=C2=A0=C2=A0=C2=A0 print &quot;=
 Upgrade to $DBversion done (fixed language and typos in notices.)\n&quot;;=
<br>=C2=A0}<br>=C2=A0<br>
+$DBversion =3D &#39;3.01.00.XXX&#39;;<br>
+if (C4::Context-&gt;preference(&quot;Version&quot;) &lt; TransformToNum($D=
Bversion)) {<br>+=C2=A0=C2=A0=C2=A0 $dbh-&gt;do(&quot;UPDATE permissions SE=
T description =3D &#39;Perform inventory (stocktaking) of your catalog&#39;=
 WHERE code =3D &#39;inventory&#39;;&quot;);<br>

+=C2=A0=C2=A0=C2=A0=C2=A0 SetVersion ($DBversion);<br>+=C2=A0=C2=A0=C2=A0 p=
rint &quot; Upgrade to $DBversion done (changed catalogue to catalog per th=
e standard)\n&quot;;<br>+}<br>+<br>=C2=A0=3Ditem DropAllForeignKeys($table)=
<br>=C2=A0<br>=C2=A0=C2=A0 Drop all foreign keys of the table $table<br>

-- <br>1.5.6.5<br><br><br>

--001636ed69809073ea0471809510--
--001636ed69809073f10471809512
Content-Type: application/octet-stream; 
	name="0005-Changed-catlogue-to-catalog-per-the-standard.patch"
Content-Disposition: attachment; 
	filename="0005-Changed-catlogue-to-catalog-per-the-standard.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fyk6tbc70

RnJvbSAxZDgzZGUxYTExZjYwNGEyZjAxZTExNjYwMTY5MzMxZDFlYjA3MDY0IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogVHVlLCAxOCBBdWcgMjAwOSAyMzowMTo0MCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIENoYW5n
ZWQgY2F0bG9ndWUgdG8gY2F0YWxvZyBwZXIgdGhlIHN0YW5kYXJkCkNvbnRlbnQtVHlwZTogdGV4
dC9wbGFpbjsgY2hhcnNldD0idXRmLTgiCgotLS0KIC4uLi9kYXRhL215c3FsL2VuL21hbmRhdG9y
eS91c2VycGVybWlzc2lvbnMuc3FsICAgIHwgICAgNCArKy0tCiBpbnN0YWxsZXIvZGF0YS9teXNx
bC91cGRhdGVkYXRhYmFzZS5wbCAgICAgICAgICAgICB8ICAgIDcgKysrKysrKwogMiBmaWxlcyBj
aGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5z
dGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3VzZXJwZXJtaXNzaW9ucy5zcWwgYi9pbnN0
YWxsZXIvZGF0YS9teXNxbC9lbi9tYW5kYXRvcnkvdXNlcnBlcm1pc3Npb25zLnNxbAppbmRleCAy
OWIzYjA1Li5mODg5MzdhIDEwMDY0NAotLS0gYS9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9tYW5k
YXRvcnkvdXNlcnBlcm1pc3Npb25zLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9t
YW5kYXRvcnkvdXNlcnBlcm1pc3Npb25zLnNxbApAQCAtOCw3ICs4LDcgQEAgSU5TRVJUIElOVE8g
cGVybWlzc2lvbnMgKG1vZHVsZV9iaXQsIGNvZGUsIGRlc2NyaXB0aW9uKSBWQUxVRVMKICAgICgx
MywgJ2VkaXRfbm90aWNlcycsICdEZWZpbmUgbm90aWNlcycpLAogICAgKDEzLCAnZWRpdF9ub3Rp
Y2Vfc3RhdHVzX3RyaWdnZXJzJywgJ1NldCBub3RpY2Uvc3RhdHVzIHRyaWdnZXJzIGZvciBvdmVy
ZHVlIGl0ZW1zJyksCiAgICAoMTMsICd2aWV3X3N5c3RlbV9sb2dzJywgJ0Jyb3dzZSB0aGUgc3lz
dGVtIGxvZ3MnKSwKLSAgICgxMywgJ2ludmVudG9yeScsICdQZXJmb3JtIGludmVudG9yeSAoc3Rv
Y2t0YWtpbmcpIG9mIHlvdXIgY2F0YWxvZ3VlJyksCisgICAoMTMsICdpbnZlbnRvcnknLCAnUGVy
Zm9ybSBpbnZlbnRvcnkgKHN0b2NrdGFraW5nKSBvZiB5b3VyIGNhdGFsb2cnKSwKICAgICgxMywg
J3N0YWdlX21hcmNfaW1wb3J0JywgJ1N0YWdlIE1BUkMgcmVjb3JkcyBpbnRvIHRoZSByZXNlcnZv
aXInKSwKICAgICgxMywgJ21hbmFnZV9zdGFnZWRfbWFyYycsICdNYW5hZ2VkIHN0YWdlZCBNQVJD
IHJlY29yZHMsIGluY2x1ZGluZyBjb21wbGV0aW5nIGFuZCByZXZlcnNpbmcgaW1wb3J0cycpLAog
ICAgKDEzLCAnZXhwb3J0X2NhdGFsb2cnLCAnRXhwb3J0IGJpYmxpb2dyYXBoaWMgYW5kIGhvbGRp
bmdzIGRhdGEnKSwKQEAgLTE2LDQgKzE2LDQgQEAgSU5TRVJUIElOVE8gcGVybWlzc2lvbnMgKG1v
ZHVsZV9iaXQsIGNvZGUsIGRlc2NyaXB0aW9uKSBWQUxVRVMKICAgICgxMywgJ2RlbGV0ZV9hbm9u
eW1pemVfcGF0cm9ucycsICdEZWxldGUgb2xkIGJvcnJvd2VycyBhbmQgYW5vbnltaXplIGNpcmN1
bGF0aW9uIGhpc3RvcnkgKGRlbGV0ZXMgYm9ycm93ZXIgcmVhZGluZyBoaXN0b3J5KScpLAogICAg
KDEzLCAnYmF0Y2hfdXBsb2FkX3BhdHJvbl9pbWFnZXMnLCAnVXBsb2FkIHBhdHJvbiBpbWFnZXMg
aW4gYmF0Y2ggb3Igb25lIGF0IGEgdGltZScpLAogICAgKDEzLCAnc2NoZWR1bGVfdGFza3MnLCAn
U2NoZWR1bGUgdGFza3MgdG8gcnVuJykKLTsKKzsKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl
CmRpZmYgLS1naXQgYS9pbnN0YWxsZXIvZGF0YS9teXNxbC91cGRhdGVkYXRhYmFzZS5wbCBiL2lu
c3RhbGxlci9kYXRhL215c3FsL3VwZGF0ZWRhdGFiYXNlLnBsCmluZGV4IDdkNDEwZWUuLjI5M2Q5
ZmEgMTAwNzU1Ci0tLSBhL2luc3RhbGxlci9kYXRhL215c3FsL3VwZGF0ZWRhdGFiYXNlLnBsCisr
KyBiL2luc3RhbGxlci9kYXRhL215c3FsL3VwZGF0ZWRhdGFiYXNlLnBsCkBAIC0yNTI5LDYgKzI1
MjksMTMgQEAgaWYgKEM0OjpDb250ZXh0LT5wcmVmZXJlbmNlKCJWZXJzaW9uIikgPCBUcmFuc2Zv
cm1Ub051bSgkREJ2ZXJzaW9uKSkgewogICAgIHByaW50ICIgVXBncmFkZSB0byAkREJ2ZXJzaW9u
IGRvbmUgKGZpeGVkIGxhbmd1YWdlIGFuZCB0eXBvcyBpbiBub3RpY2VzLilcbiI7CiB9CiAKKyRE
QnZlcnNpb24gPSAnMy4wMS4wMC5YWFgnOworaWYgKEM0OjpDb250ZXh0LT5wcmVmZXJlbmNlKCJW
ZXJzaW9uIikgPCBUcmFuc2Zvcm1Ub051bSgkREJ2ZXJzaW9uKSkgeworICAgICRkYmgtPmRvKCJV
UERBVEUgcGVybWlzc2lvbnMgU0VUIGRlc2NyaXB0aW9uID0gJ1BlcmZvcm0gaW52ZW50b3J5IChz
dG9ja3Rha2luZykgb2YgeW91ciBjYXRhbG9nJyBXSEVSRSBjb2RlID0gJ2ludmVudG9yeSc7Iik7
CisgICAgIFNldFZlcnNpb24gKCREQnZlcnNpb24pOworICAgIHByaW50ICIgVXBncmFkZSB0byAk
REJ2ZXJzaW9uIGRvbmUgKGNoYW5nZWQgY2F0YWxvZ3VlIHRvIGNhdGFsb2cgcGVyIHRoZSBzdGFu
ZGFyZClcbiI7Cit9CisKID1pdGVtIERyb3BBbGxGb3JlaWduS2V5cygkdGFibGUpCiAKICAgRHJv
cCBhbGwgZm9yZWlnbiBrZXlzIG9mIHRoZSB0YWJsZSAkdGFibGUKLS0gCjEuNS42LjUKCg==
--001636ed69809073f10471809512--