---
.../data/mysql/en/mandatory/sample_notices.sql | 4 ++--
installer/data/mysql/en/mandatory/sysprefs.sql | 2 +-
.../data/mysql/en/mandatory/userpermissions.sql | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql
b/installer/data/mysql/en/mandatory/sample_notices.sql
index 04704f0..f576124 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -1,6 +1,6 @@
INSERT INTO `letter` (module, code, name, title, content)
-VALUES ('circulation','ODUE','Overdue Notice','Item Overdue',''Dear
<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nAccording to our records,
you have items that are overdue. Your library does not charge late fines, but
please return or renew them as soon as
possible.\r\n\r\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n<<branches.branchaddress3>>\n<<branches.branchphone>>\n<<branches.branchfax>>\n<<branches.branchemail>>\r\n\r\nIf
you have registered a password with the library, you may use it with your
library card number to renew online. If an item becomes more than 30 days
overdue, you will be unable to use your library card until the item is
returned. The following item is currently overdue:\r\n\r\n<<items.content>>'),
-('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not
Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber
<<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered)
($<<aqorders.listprice>> each) has not been received.'),
+VALUES ('circulation','ODUE','Overdue Notice','Item Overdue',"Dear
<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nAccording to our records,
you have items that are overdue. Your library does not charge late fines, but
please return or renew them as soon as
possible.\r\n\r\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n<<branches.branchaddress3>>\n<<branches.branchphone>>\n<<branches.branchfax>>\n<<branches.branchemail>>\r\n\r\nIf
you have registered a password with the library, you may use it with your
library card number to renew online. If an item becomes more than 30 days
overdue, you will be unable to use your library card until the item is
returned. The following item is currently overdue:\r\n\r\n<<items.content>>"),
+('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not
Received',"<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber
<<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered)
($<<aqorders.listprice>> each) has not been received."),
('serial','RLIST','Routing List','Serial is now
available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following
issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>>
(<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'),
('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha
account details.','Hello <<borrowers.title>> <<borrowers.firstname>>
<<borrowers.surname>>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser:
<<borrowers.userid>>\r\nPassword: <<borrowers.password>>\r\n\r\nIf you have any
problems or questions regarding your account, please contact your Koha
Administrator.\r\n\r\nThank you,\r\nKoha
administrator\r\[email protected]'),
('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear
<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is now
due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'),
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index 9e907b7..b9d912a 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -1,5 +1,5 @@
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('acquisitions','normal','Choose Normal, budget-based acquisitions, or
Simple bibliographic-data acquisitions','simple|normal','Choice');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('advancedMARCeditor',0,'If ON, the MARC editor won\'t display
field/subfield descriptions','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('advancedMARCeditor',0,"If ON, the MARC editor won't display
field/subfield descriptions",'','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES ('AllowHoldDateInFuture','0','If set a date field is displayed on the
Hold screen of the Staff Interface, allowing the hold date to be set in the
future.','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES ('OPACAllowHoldDateInFuture','0','If set, along with the
AllowHoldDateInFuture system preference, OPAC users can set the date of a hold
to be in the future.','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonEnabled',0,'Turn ON Amazon Content - You MUST set AWSAccessKeyID,
AWSPrivateKey, and AmazonAssocTag if enabled','','YesNo');
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql
b/installer/data/mysql/en/mandatory/userpermissions.sql
index bbd1a8d..80f060d 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -17,7 +17,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(13, 'batch_upload_patron_images', 'Upload patron images in batch or one at
a time'),
(13, 'schedule_tasks', 'Schedule tasks to run'),
(13, 'batchmod', 'Perform batch modification of items'),
- (13, 'batchdel', 'Perform batch deletion of items')
+ (13, 'batchdel', 'Perform batch deletion of items'),
(11, 'vendors_manage', 'Manage vendors'),
(11, 'contracts_manage', 'Manage contracts'),
(11, 'period_manage', 'Manage periods'),
@@ -28,5 +28,4 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(11, 'group_manage', 'Manage orders & basketgroups'),
(11, 'order_receive', 'Manage orders & basket'),
(11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)')
-;
->>>>>>> granular perms for
acquisitions:installer/data/mysql/en/mandatory/userpermissions.sql
+;
\ No newline at end of file
--
1.6.0.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
