From 73605d792f51a8ff4bd41fb32406b8e3c1cbd307 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Andr=C3=A9=20Santoni?= <jeanandre.santoni@biblibre.com>
Date: Mon, 4 Jan 2010 10:38:08 +0100
Subject: [PATCH] [MT2590] Removed root budget duplicate checkings

---
 admin/aqbudgetperiods.pl                      | 27 -----------------
 .../prog/en/includes/duplicates.inc           | 30 -------------------
 .../en/modules/admin/aqbudgetperiods.tmpl     |  3 +-
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc

diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 779f22c0d6..fadf83dbca 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -61,7 +61,6 @@ my $input       = new CGI;
 my $searchfield          = $input->param('searchfield');
 my $budget_period_id     = $input->param('budget_period_id');
 my $op                   = $input->param('op')||"else";
-my $check_duplicate      = $input->param('confirm_not_duplicate')||0;
 
 my $budget_period_hashref= $input->Vars;
 #my $sort1_authcat = $input->param('sort1_authcat');
@@ -127,7 +126,6 @@ if ( $op eq 'add_form' ) {
         );
     } # IF-MOD
     $template->param( DHTMLcalendar_dateformat 	=> C4::Dates->DHTMLcalendar(),);
-    $template->param( confirm_not_duplicate		=> $check_duplicate     	  );
 }
 
 elsif ( $op eq 'add_validate' ) {
@@ -139,31 +137,6 @@ elsif ( $op eq 'add_validate' ) {
 		my $status=ModBudgetPeriod($budget_period_hashref);
 	} 
 	else {    # ELSE ITS AN ADD
-		unless ($check_duplicate){
-			my $candidates=GetBudgetPeriods({ 
-									 		budget_period_startdate	=> $$budget_period_hashref{budget_period_startdate}
-									 		, budget_period_enddate	=> $$budget_period_hashref{budget_period_enddate}
-									 		});
-			if (@$candidates){
-				my @duplicates=map{
-									{ dupid 			   => $$_{budget_period_id}
-									, duplicateinformation =>
-											$$_{budget_period_description}." ".$$_{budget_period_startdate}." ".$$_{budget_period_enddate}
-									}
-								  } @$candidates;
-				$template->param(url			  => "aqbudgetperiods.pl", 
-								field_name		  => "budget_period_id",
-								action_dup_yes_url=> "aqbudgets.pl",
-								action_dup_no_url => "aqbudgetperiods.pl?op=add_validate",
-								confirm_not_duplicate	  => 0
-									);
-				delete $$budget_period_hashref{budget_period_id};
-				$template->param(duplicates=>\@duplicates,%$budget_period_hashref);
-				$template->param("add_form"=>1);
-				output_html_with_http_headers $input, $cookie, $template->output;
-				exit;
-			}
-		}
 		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
 	}
 	$op='else';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc
deleted file mode 100644
index a2a5bc320d..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="dialog alert">
-<script type="text/javascript">
-//<![CDATA[
-
-function confirmnotdup(){
-	$("#confirm_not_duplicate").attr("value","1");
-	// alert(_("Not a duplicate confirmed. Please click on Add biblio to save the record"));
-	var checkform =	$("#f");
-	Check(checkform);
-}
-//]]>
-</script>
-
-
-<h4>Duplicate suspected</h4>
-<p>Is this a duplicate of 
-	<ul><!--TMPL_LOOP Name="duplicates"-->
-		<li><a href="<!--TMPL_VAR Name="url"-->?<!--TMPL_VAR Name="field_name"-->=<!-- TMPL_VAR name="dupid" -->" onclick="openWindow('<!--TMPL_VAR Name="url"-->?<!--TMPL_VAR Name="field_name"-->=<!-- TMPL_VAR name="dupid" -->&amp;popup=1', 'Duplicate '; return false;)"><!-- TMPL_VAR name="duplicateinformation" --></a>?
-		<form action="<!--TMPL_VAR Name="action_dup_yes_url"-->" method="get">
-			<input type="hidden" name="<!--TMPL_VAR Name="field_name"-->" value="<!-- TMPL_VAR name="dupid" -->" />
-			<input type="submit" class="edit" value="Yes: Edit existing" />
-		</form>
-		</li>
-	<!--/TMPL_LOOP--></ul>
-</p>
-<form action="<!--TMPL_VAR Name="action_dup_no_url"-->" method="get">
-	<input type="submit" class="save" onclick="confirmnotdup(); return false;" value="No: Save as New" />
-</form>
-</div>
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 5d661c988a..41af729597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -130,7 +130,7 @@
 
 <!-- TMPL_IF name="add_form" -->
     <!--  add or modify a budget period   -->
-<!--TMPL_IF Name="duplicates"--><!--TMPL_INCLUDE Name="duplicates.inc"--><!--/TMPL_IF-->
+
     <!-- TMPL_IF name="budget_period_id" -->
         <h3>Modify root budget</h3>
     <!-- TMPL_ELSE -->
@@ -142,7 +142,6 @@
     <!-- display information about the budget period that must be added or modified -->
     <!-- ################################################################################# -->
     <input type="hidden" name="op" value="add_validate" />
-    <input type="hidden" name="confirm_not_duplicate" value="<!--TMPL_VAR Name="confirm_not_duplicate"-->" />
     <input type="hidden" name="budget_period_id" value="<!-- TMPL_VAR name="budget_period_id" -->" />
     <ol>
     <li>
-- 
2.39.5