Attachment 19488 Details for Bug 9673 – Bug 9673 - Track when items are marked as lost or withdrawn - QA Followup 2 - Change wthdrawn_on to withdrawn_on

[patch] Bug 9673 - Track when items are marked as lost or withdrawn - QA Followup 2 - Change wthdrawn_on to withdrawn_on

Bug-9673---Track-when-items-are-marked-as-lost-or-.patch (text/plain), 4.82 KB, created by Kyle M Hall (khall) on 2013-07-08 17:32:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2013-07-08 17:32:47 UTC

Size: 4.82 KB

patch

obsolete

>From eee16a74e3ee893a1096ca1c7c8c653781f40009 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 8 Jul 2013 13:26:01 -0400
>Subject: [PATCH] Bug 9673 - Track when items are marked as lost or withdrawn - QA Followup 2 - Change wthdrawn_on to withdrawn_on
>
>---
> installer/data/mysql/kohastructure.sql             |   10 +++-------
> installer/data/mysql/updatedatabase.pl             |    4 ++--
> .../prog/en/modules/catalogue/moredetail.tt        |    2 +-
> 3 files changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index ac9afa0..0b293cf 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -868,7 +868,7 @@ CREATE TABLE `deleteditems` (
>   `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
>   `itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost
>   `withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
>-  `wthdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
>+  `withdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
>   `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
>   `coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
>   `issues` smallint(6) default NULL, -- number of times this item has been checked out
>@@ -1160,13 +1160,9 @@ CREATE TABLE `items` ( -- holdings/item information
>   `notforloan` tinyint(1) NOT NULL default 0, -- authorized value defining why this item is not for loan (MARC21 952$7)
>   `damaged` tinyint(1) NOT NULL default 0, -- authorized value defining this item as damaged (MARC21 952$4)
>   `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
>-<<<<<<< HEAD
>-  `withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
>-=======
>   `itemlost_on` datetime DEFAULT NULL, -- the date and time an item was last marked as lost, NULL if not lost
>-  `wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
>-  `wthdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
>->>>>>>> Bug 9673 - Track when items are marked as lost or withdrawn
>+  `withdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
>+  `withdrawn_on` datetime DEFAULT NULL, -- the date and time an item was last marked as withdrawn, NULL if not withdrawn
>   `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
>   `coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
>   `issues` smallint(6) default NULL, -- number of times this item has been checked out/issued
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 8dce1a1..ad52f39 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -7045,9 +7045,9 @@ if ( CheckVersion($DBversion) ) {
> $DBversion = "3.13.00.XXX";
> if ( CheckVersion($DBversion) ) {
>    $dbh->do("ALTER TABLE items ADD itemlost_on DATETIME NULL AFTER itemlost");
>-   $dbh->do("ALTER TABLE items ADD wthdrawn_on DATETIME NULL AFTER wthdrawn");
>+   $dbh->do("ALTER TABLE items ADD withdrawn_on DATETIME NULL AFTER wthdrawn");
>    $dbh->do("ALTER TABLE deleteditems ADD itemlost_on DATETIME NULL AFTER itemlost");
>-   $dbh->do("ALTER TABLE deleteditems ADD wthdrawn_on DATETIME NULL AFTER wthdrawn");
>+   $dbh->do("ALTER TABLE deleteditems ADD withdrawn_on DATETIME NULL AFTER wthdrawn");
>    print "Upgrade to $DBversion done (Bug 9673 - Track when items are marked as lost or withdrawn)\n";
>    SetVersion ($DBversion);
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>index bc475b8..dbd5550 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -166,7 +166,7 @@
>                     </form>
>                 [% END %]
>             </li>
>-            [% IF ITEM_DAT.wthdrawn_on %]<li><span class="label">Withdrawn on:</span>[% ITEM_DAT.wthdrawn_on | $KohaDates %] &nbsp;</li>[% END %]
>+            [% IF ITEM_DAT.withdrawn_on %]<li><span class="label">Withdrawn on:</span>[% ITEM_DAT.withdrawn_on | $KohaDates %] &nbsp;</li>[% END %]
>             </ol></div>
>             <div class="listgroup"><h4>History</h4>
>             <ol class="bibliodetails">
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 9673: 15567 | 15890 | 16002 | 16003 | 16032 | 16033 | 16642 | 16643 | 16644 | 16645 | 16646 | 18031 | 18032 | 18033 | 18034 | 19013 | 19014 | 19079 | 19080 | 19120 | 19121 | 19483 | 19484 | 19485 | 19486 | 19487 | 19488 | 19489 | 19490 | 19492 | 21730 | 21731 | 22690 | 22691