From fabb74b43c25676a76b742d8b063fff837bfa354 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 9 Sep 2005 10:11:38 +0000
Subject: [PATCH] * removing the limit to delete a subscription * adding serial
 note column to the subscription-detail

---
 C4/Bull.pm                                     | 14 +++++---------
 bull/subscription-detail.pl                    |  1 -
 .../default/en/bull/statecollection.tmpl       |  2 +-
 .../default/en/bull/subscription-detail.tmpl   | 18 ++++++++++++------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/C4/Bull.pm b/C4/Bull.pm
index bf5a66cd8f..3885fdd4a6 100755
--- a/C4/Bull.pm
+++ b/C4/Bull.pm
@@ -289,15 +289,11 @@ sub modsubscription {
 
 sub delsubscription {
 	my ($subscriptionid) = @_;
-	# check again there is only one issue (the subscription is new)
-	my ($totalissues) = getserials($subscriptionid);
-	if ($totalissues eq 1) {
-		my $dbh = C4::Context->dbh;
-		$subscriptionid=$dbh->quote($subscriptionid);
-		$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
-		$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
-		$dbh->do("delete from serial where subscriptionid=$subscriptionid");
-	}
+	my $dbh = C4::Context->dbh;
+	$subscriptionid=$dbh->quote($subscriptionid);
+	$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
+	$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
+	$dbh->do("delete from serial where subscriptionid=$subscriptionid");
 }
 sub getsubscriptions {
 	my ($title,$ISSN,$biblionumber) = @_;
diff --git a/bull/subscription-detail.pl b/bull/subscription-detail.pl
index 1eece43104..c9bed507e3 100755
--- a/bull/subscription-detail.pl
+++ b/bull/subscription-detail.pl
@@ -77,7 +77,6 @@ if ($op eq 'del') {
 }
 my $subs = &getsubscription($subscriptionid);
 my ($totalissues,@serialslist) = getserials($subscriptionid);
-warn " => $totalissues";
 $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
index f71b89e0f6..9bc8a797a4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
@@ -71,7 +71,7 @@
 				</select>
 			</td>
 			<td>
-				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=10 maxlength=15>
+				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
index 474da4ad35..a7b4f35525 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
@@ -7,11 +7,9 @@
 <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="All issues on this title">Issue history</a>
 <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
 <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Back to biblio</a>
-<!-- TMPL_UNLESS name="totalissues" -->
-		<a href="javascript:confirm_deletion()" class="button bull">
-			delete
-		</a>
-<!-- /TMPL_UNLESS -->
+<a href="javascript:confirm_deletion()" class="button bull">
+	delete
+</a>
 <form method="post" name="f">
 <div id="bloc25">
 	<h2 class="bull">Subscription information</h2>
@@ -151,6 +149,7 @@
 		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;</th>
 		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;</th>
 		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
+		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Note&nbsp;&nbsp;&nbsp;&nbsp;</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
@@ -175,6 +174,9 @@
 					<!-- /TMPL_IF -->
 				</select>
 			</td>
+			<td>
+				<!-- TMPL_VAR name="notes" -->
+			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
@@ -183,7 +185,11 @@
 <script>
 function _(s) { return s } // dummy function for gettext
 function confirm_deletion() {
-	var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+	<!-- TMPL_IF name="totalissues" -->
+		var is_confirmed = confirm(_('You already made <!-- TMPL_VAR name="totalissues"--> receipts. Do you confirm deletion?'));
+	<!-- TMPL_ELSE -->
+		var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+	<!-- /TMPL_IF -->	
 	if (is_confirmed) {
 		window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
 	}
-- 
2.39.5