Attachment 3142 Details for Bug 5432 – Proposed Patch

[patch] Proposed Patch

0001-Bug-5432-MT-4584b-Add-duplicate-support-for-borrower.patch (text/plain), 38.60 KB, created by Chris Cormack on 2011-02-14 02:07:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-02-14 02:07:51 UTC

Size: 38.60 KB

patch

obsolete

>From cb70712d2b8ea7b1519a074799a70129a4056176 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?St=C3=A9phane=20Delaune?= <stephane.delaune@biblibre.com>
>Date: Tue, 21 Sep 2010 12:58:26 +0200
>Subject: [PATCH] Bug 5432 : (MT #4584b)Add duplicate support for borrowers
>
>---
> .../prog/en/includes/members-toolbar.inc           |    4 +-
> .../prog/en/modules/members/memberentrygen.tmpl    |  117 ++++++++++----------
> members/memberentry.pl                             |   39 ++++---
> 3 files changed, 84 insertions(+), 76 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index 6f22d46..98c6d07 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -82,6 +82,7 @@ function update_child() {
> 	    new YAHOO.widget.Button("editpatron");
> 	    new YAHOO.widget.Button("addnote");
> 	    new YAHOO.widget.Button("changepassword");
>+	    new YAHOO.widget.Button("duplicate");
> 	    new YAHOO.widget.Button("printslip");
> 		new YAHOO.widget.Button("printpage");
> 	    new YAHOO.widget.Button("renewpatron");
>@@ -110,7 +111,8 @@ function update_child() {
> 	<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=&amp;category_type=C">Add child</a></li>
> ">Add Note</a></li> -->
> 	<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=">Change Password</a></li>
>-	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=&amp;print=page">Print Page</a></li>
>+	<li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=&amp;category_type=">Duplicate</a></li>
>+    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=&amp;print=page">Print Page</a></li>
> 	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=&amp;print=slip">Print Slip</a></li>
> 	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=">Renew Account</a></li><li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=">Set Permissions</a></li><li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
> </ul></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
>index a746307..67ac528 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
>@@ -1,6 +1,6 @@
> 
> <title>Koha &rsaquo; Patrons &rsaquo; 
>-Add Modify   patron Organization patron Adult patron Child patron Professional patron Staff patron , </title>
>+AddDuplicate Modify   patron Organization patron Adult patron Child patron Professional patron Staff patron , </title>
> 
> 
> <script type="text/JavaScript" language="JavaScript">
>@@ -71,9 +71,9 @@
> 		Add  patron Organization patron Adult patron Child patron Professional patron Staff patron
>  
>  
>-<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="> </a> &rsaquo; <strong>Modify  patron Organization patron Adult patron Child patron Professional patron Staff patron
>+<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber="> </a> &rsaquo; <strong>DuplicateModify  patron Organization patron Adult patron Child patron Professional patron Staff patron
> </strong></div>
>-
>+tast
> <div id="doc" class="yui-t7"><div id="doc3" class="yui-t2">
>    
>    <div id="bd">
>@@ -91,7 +91,7 @@
> 	</h1>
> 	
> 	<h1>
>-		Modify  patron Organization patron Adult patron Child patron Professional patron Staff patron
>+		DuplicateModify  patron Organization patron Adult patron Child patron Professional patron Staff patron
>   
> 	</h1>
> 	
>@@ -149,8 +149,8 @@
> 			</ul>
> 		</div>
> 	
>-	
>-  
>+
>+
> <form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post">
> <input type="hidden" name="nodouble"  value="" /> 
> 
>@@ -160,9 +160,10 @@
> <input type="hidden" name="select_roadtype" value="" />
> <input type="hidden" name="destination" value="" />
> <input type="hidden" name="check_member" value="" />
>-<input type="hidden" name="borrowernumber" value="" />
>+<input type="hidden" name="borrowernumber" value="" />
>+<input type="hidden" name="nodouble"  value="" />
> <input type="hidden" name="step"  value="" />
>-<input type="hidden" name="op" value="insert" /><input type="hidden" name="op" value="save" />
>+<input type="hidden" name="op" value="insert" /><input type="hidden" name="op" value="insert" /><input type="hidden" name="op" value="save" />
> 
> 
> 	<fieldset class="rows" id="memberentry_identity">
>@@ -190,9 +191,9 @@
> 		
> 		Surname: </label>
> 		
>-		<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="" />
>+		<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="" onclick="this.value=''" />
> 		
>-		<input type="text" id="surname" name="surname" size="20"  value="" />
>+		<input type="text" id="surname" name="surname" size="20"  value="" onclick="this.value=''" />
> 		
> 		<span class="required">Required</span>
> 		</li>
>@@ -204,7 +205,7 @@
>                 <label for="firstname">
>                 
>                 First name: </label>
>-                <input type="text" id="firstname" name="firstname" size="20"  value="" />
>+                <input type="text" id="firstname" name="firstname" size="20"  value="" />
>                 <span class="required">Required</span>
>             </li>
>             <li>
>@@ -216,9 +217,9 @@
>                 Date of birth: </label>
> 				
> 				
>-                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="" />
>+                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="" />
> 
>-                <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="" />
>+                <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="" />
> 
> 
>                 <img src="/lib/calendar/cal.gif" id="dateofbirth_button" alt="Show Calendar" />
>@@ -242,7 +243,7 @@
>                     <label for="initials">
>                 
>                 Initials: </label>
>-                <input type="text" id="initials" name="initials" size="20"  value="" />	
>+                <input type="text" id="initials" name="initials" size="20"  value="" onclick="this.value=''" />	
>                 <span class="required">Required</span>
>             </li>
>         
>@@ -253,7 +254,7 @@
> 			<label for="othernames">
> 			
> 			Other name: </label>
>-			<input type="text" id="othernames" name="othernames" size="20"  value="" />
>+			<input type="text" id="othernames" name="othernames" size="20"  value="" onclick="this.value=''" />
> <span class="required">Required</span>
> 		<input type="hidden" name="sex" value="N" />
> 		</li>
>@@ -298,7 +299,7 @@
> 	            <span></span>
> 	            <input name="contactname" id="contactname" type="hidden" size="20" value="" />
> 	            
>-	            <input name="contactname" id="contactname" type="text" size="20" value="" />
>+	            <input name="contactname" id="contactname" type="text" size="20" value="" onclick="this.value=''" />
> 	            
> 	        </li>
> 
>@@ -316,7 +317,7 @@
>      <span></span>
>      <input name="contactname" id="contactname" type="hidden" size="20" value="" />
>      
>-     <input name="contactname" id="contactname" type="text" size="20" value="" />
>+     <input name="contactname" id="contactname" type="text" size="20" value="" onclick="this.value=''" />
>      
>  </li>
>  <li>
>@@ -325,7 +326,7 @@
>      <span></span>
>      <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="" />
>      
>-     <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="" />
>+     <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="" onclick="this.value=''" />
>      
>  </li>
>  
>@@ -366,7 +367,7 @@
>       <label for="streetnumber">
>       
>       Street number: </label>
>-      <input type="text" id="streetnumber" name="streetnumber" size="5" value="" />
>+      <input type="text" id="streetnumber" name="streetnumber" size="5" value="" onclick="this.value=''" />
> <span class="required">Required</span>
>     </li>
>     
>@@ -388,7 +389,7 @@
>       <label for="address">
>       
>       Address: </label>
>-      <input type="text" id="address" name="address" size="35" value="" />
>+      <input type="text" id="address" name="address" size="35" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
>     <li>
>@@ -398,7 +399,7 @@
>       <label for="address2">
>       
>       Address 2: </label>
>-      <input type="text" id="address2" name="address2" size="35" value="" />
>+      <input type="text" id="address2" name="address2" size="35" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>  
>     <li>
>@@ -409,7 +410,7 @@
>       
>       City, State: </label>
>         
>-        <input type="text" id="city" name="city" size="20" value="" />
>+        <input type="text" id="city" name="city" size="20" value="" onclick="this.value=''" />
>         or <strong>choose</strong>
>         <select id="select_city" name="select_city">
>         
>@@ -432,7 +433,7 @@
>         <label for="zipcode">
>       
>       Zip/Postal code: </label>
>-      <input type="text" name="zipcode" id="zipcode" size="10" value="" />
>+      <input type="text" name="zipcode" id="zipcode" size="10" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
>     
>@@ -443,7 +444,7 @@
>         <label for="country">
>       
>       Country: </label>
>-      <input type="text" name="country" id="country" size="20" value="" />
>+      <input type="text" name="country" id="country" size="20" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>    
>   
>@@ -458,7 +459,7 @@
>       <label for="phone">
>       
>       Phone (home): </label>
>-      <input type="text" id="phone" name="phone" value="" />
>+      <input type="text" id="phone" name="phone" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span><div class="hint">Shows on transit slips</div>
> 
>     </li>
>@@ -469,7 +470,7 @@
>       <label for="phonepro">
>       
>       Phone (work): </label>
>-      <input type="text" id="phonepro" name="phonepro" value="" />
>+      <input type="text" id="phonepro" name="phonepro" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
>     <li>
>@@ -479,7 +480,7 @@
>       <label for="mobile">
>       
>       Phone (cell): </label>
>-      <input type="text" id="mobile" name="mobile" value="" />
>+      <input type="text" id="mobile" name="mobile" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
>     <li>
>@@ -488,8 +489,8 @@
>       
>       <label for="email">
>       
>-      Email (home): </label>
>-      <input type="text" id="email" name="email" size="45" value="" />  
>+      Primary Email: </label>
>+      <input type="text" id="email" name="email" size="45" value="" onclick="this.value=''" />  
> 	  <span class="required">Required</span><div class="hint">Shows on transit slips</div>
> 
>     </li>
>@@ -499,8 +500,8 @@
>       
>       <label for="emailpro">
>       
>-      Email (work): </label>
>-      <input type="text" id="emailpro" name="emailpro" size="45" value="" />
>+      Secondary Email: </label>
>+      <input type="text" id="emailpro" name="emailpro" size="45" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
>     <li>
>@@ -510,7 +511,7 @@
>       <label for="fax">
>       
>       Fax: </label>
>-      <input type="text" id="fax" name="fax" value="" />
>+      <input type="text" id="fax" name="fax" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>     </li>
> 	</ol>
>@@ -530,7 +531,7 @@
> 					<label for="B_address">
> 				
> 				Address: </label>
>-				<input type="text" id="B_address" name="B_address" size="40" value="" />
>+				<input type="text" id="B_address" name="B_address" size="40" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -540,9 +541,9 @@
> 					<label for="B_address2">
> 				
> 				Address 2: </label>
>-				<input type="text" id="B_address2" name="B_address2" size="40" value="" />
>+				<input type="text" id="B_address2" name="B_address2" size="40" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>-			</li>			
>+			</li>
> 			<li>
> 				
> 					<label for="B_city" class="required" >
>@@ -550,7 +551,7 @@
> 					<label for="B_city">
> 				
> 				City, State: </label>
>-				<input type="text" id="B_city" name="B_city" size="20" value="" />
>+				<input type="text" id="B_city" name="B_city" size="20" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -560,7 +561,7 @@
> 					<label for="B_zipcode">
> 				
> 				Zip/Postal code: </label>
>-				<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="" />
>+				<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -570,7 +571,7 @@
> 					<label for="B_country">
> 				
> 				Country: </label>
>-				<input type="text" id="B_country" name="B_country" size="20" value="" />
>+				<input type="text" id="B_country" name="B_country" size="20" value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
> 			</li>
>             <li>
>@@ -580,7 +581,7 @@
>                 <label for="B_phone">
>                 
>                 Phone: </label>  
>-                <input type="text" id="B_phone" name="B_phone" value="" />
>+                <input type="text" id="B_phone" name="B_phone" value="" onclick="this.value=''" />
>                 <span class="required">Required</span>
>             </li>
> 			<li> 
>@@ -590,7 +591,7 @@
>           <label for="B_email">
>         
>         Email: </label>
>-        <input type="text" id="B_email" name="B_email" size="45" value="" />
>+        <input type="text" id="B_email" name="B_email" size="45" value="" onclick="this.value=''" />
> 		<span class="required">Required</span> </li>
>             <li>
>                 
>@@ -615,7 +616,7 @@
> 				<label for="altcontactsurname">
> 				
> 				Surname:</label>
>-				<input type="text" name="altcontactsurname" id="altcontactsurname" value="" />
>+				<input type="text" name="altcontactsurname" id="altcontactsurname" value="" onclick="this.value=''" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -625,7 +626,7 @@
> 				<label for="altcontactfirstname">
> 				
> 				First name:</label>
>-				<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="" />
>+				<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="" onclick="this.value=''" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -635,7 +636,7 @@
> 				<label for="altcontactaddress1">
> 				
> 				Address:</label>
>-				<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="" size="40" />
>+				<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="" onclick="this.value=''" size="40" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -645,7 +646,7 @@
> 				<label for="altcontactaddress2">
> 				
> 				Address 2:</label>
>-				<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="" size="40" />
>+				<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="" onclick="this.value=''" size="40" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -655,7 +656,7 @@
> 				<label for="altcontactaddress3">
> 				
> 				City, State:</label>
>-				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="" size="40" />
>+				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="" onclick="this.value=''" size="40" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -665,7 +666,7 @@
> 				<label for="altcontactzipcode">
> 				
> 				Zip/Postal code:</label>
>-				<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="" size="5" />
>+				<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="" onclick="this.value=''" size="5" />
> 				<span class="required">Required</span>
> 			</li>
> 			<li>
>@@ -675,7 +676,7 @@
> 				<label for="altcontactcountry">
> 				
> 				Country:</label>
>-				<input type="text" name="altcontactcountry" id="altcontactcountry" value="" size="20" />
>+				<input type="text" name="altcontactcountry" id="altcontactcountry" value="" onclick="this.value=''" size="20" />
> 				<span class="required">Required</span>
> 			</li>			
> 			<li>
>@@ -685,7 +686,7 @@
> 				<label for="altcontactphone">
> 				
> 				Phone:</label>
>-				<input type="text" name="altcontactphone" id="altcontactphone" value="" />
>+				<input type="text" name="altcontactphone" id="altcontactphone" value="" onclick="this.value=''" />
> 				<span class="required">Required</span>
> 			</li>
>             </ol>
>@@ -722,7 +723,7 @@
>       <label for="cardnumber">
>      
>     Card number: </label>
>-    <input type="text" id="cardnumber" name="cardnumber" size="20" value="" />
>+    <input type="text" id="cardnumber" name="cardnumber" size="20" value="" />
> 	  <span class="required">Required</span></li>
>     <li>
>       
>@@ -783,7 +784,7 @@
>      
>       
>     
>-      <input  type="text" id="sort2" name="sort2" size="20"  value="" />
>+      <input  type="text" id="sort2" name="sort2" size="20"  value="" onclick="this.value=''" />
> 	  <span class="required">Required</span>
>      
>     </li>
>@@ -870,9 +871,9 @@
> 			OPAC Login: </label>
> 
> 
>-<input type="text" id="userid" name="userid" size="20" disabled="disabled" value="" />
>+<input type="text" id="userid" name="userid" size="20" disabled="disabled" value="" />
> 
>-<input type="text" id="userid" name="userid" size="20" value="" />
>+<input type="text" id="userid" name="userid" size="20" value="" />
> 
> 
> 	  <span class="required">Required</span>
>@@ -886,16 +887,16 @@
> 			Password: </label>
> 			
> 			
>-				<input type="text" id="password" name="password" size="20"  disabled="disabled" value="" />
>+				<input type="text" id="password" name="password" size="20"  disabled="disabled" value="" />
> 
>-				<input type="text" id="password" name="password" size="20" value="" />
>+				<input type="text" id="password" name="password" size="20" value="" />
> 
> 			
> 			
> 				
> 					<input type="text" id="password" name="password" size="20"  disabled="disabled" value="****" />
> 				
>-					<input type="text" id="password" name="password" size="20" value="****" />
>+					<input type="text" id="password" name="password" size="20" value="****" />
> 				
> 			
> 				
>@@ -920,14 +921,12 @@
> 				Debarred:
> 				Lost Card:
>                 </label>
>-				
> 				<label for="yes">Yes </label>
> 				
> 				<input type="radio" id="yes" name="" value="1" checked="checked" />
> 				
> 				<input type="radio" id="yes" name="" value="1" />
> 				
>-				
> 				<label for="no">No </label>
> 				
> 				<input type="radio" id="no" name="" value="0" checked="checked"/>
>@@ -975,7 +974,7 @@
>                     </select>
>                 
>                     <input type="text" maxlength="64" value=""
>-                           id="" name="" />
>+                           id="" name="" onclick="this.value=''" />
>                 
>                 
>                     (Password: <input type="password" maxlength="64" value=""
>@@ -1047,7 +1046,7 @@
>     
>     
>         <p><label for="SMSnumber">SMS number:</label> 
>-          <input type="text" id="SMSnumber" name="SMSnumber" value="" />
>+          <input type="text" id="SMSnumber" name="SMSnumber" value="" onclick="this.value=''" />
>         </p>
>     
>   </fieldset>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 063e489..cefbc7f 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -70,14 +70,15 @@ my $destination    = $input->param('destination');
> my $cardnumber     = $input->param('cardnumber');
> my $check_member   = $input->param('check_member');
> my $nodouble       = $input->param('nodouble');
>-$nodouble = 1 if $op eq 'modify'; # FIXME hack to represent fact that if we're
>-                                  # modifying an existing patron, it ipso facto
>-                                  # isn't a duplicate.  Marking FIXME because this
>-                                  # script needs to be refactored.
>-my $select_city    = $input->param('select_city');
>-my $nok            = $input->param('nok');
>-my $guarantorinfo  = $input->param('guarantorinfo');
>-my $step           = $input->param('step') || 0;
>+my $duplicate      = $input->param('duplicate');
>+$nodouble = 1 if ($op eq 'modify' or $op eq 'duplicate');    # FIXME hack to represent fact that if we're
>+                                     # modifying an existing patron, it ipso facto
>+                                     # isn't a duplicate.  Marking FIXME because this
>+                                     # script needs to be refactored.
>+my $select_city   = $input->param('select_city');
>+my $nok           = $input->param('nok');
>+my $guarantorinfo = $input->param('guarantorinfo');
>+my $step          = $input->param('step') || 0;
> my @errors;
> my $default_city;
> # $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
>@@ -98,9 +99,10 @@ my @field_check=split(/\|/,$check_BorrowerMandatoryField);
> foreach (@field_check) {
> 	$template->param( "mandatory$_" => 1);    
> }
>-$template->param("add"=>1) if ($op eq 'add');
>-$template->param("checked" => 1) if (defined($nodouble) && $nodouble eq 1);
>-($borrower_data = GetMember( 'borrowernumber'=>$borrowernumber )) if ($op eq 'modify' or $op eq 'save');
>+$template->param( "add" => 1 ) if ( $op eq 'add' );
>+$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
>+$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
>+( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
> my $categorycode  = $input->param('categorycode') || $borrower_data->{'categorycode'};
> my $category_type = $input->param('category_type');
> my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type.
>@@ -116,9 +118,9 @@ $category_type="A" unless $category_type; # FIXME we should display a error mess
> %data = %$borrower_data if ($borrower_data);
> 
> # initialize %newdata
>-my %newdata;	# comes from $input->param()
>-if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
>-    my @names= ($borrower_data && $op ne 'save') ? keys %$borrower_data : $input->param();
>+my %newdata;                                                                             # comes from $input->param()
>+if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) {
>+    my @names = ( $borrower_data && $op ne 'save' ) ? keys %$borrower_data : $input->param();
>     foreach my $key (@names) {
>         if (defined $input->param($key)) {
>             $newdata{$key} = $input->param($key);
>@@ -275,8 +277,8 @@ if ($op eq 'save' || $op eq 'insert'){
>   }
> }
> 
>-if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save') and ($step == 0 or $step == 3 )){
>-    if (exists ($newdata{'dateexpiry'}) && !($newdata{'dateexpiry'})){
>+if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate') and ($step == 0 or $step == 3 )){
>+    unless ($newdata{'dateexpiry'}){
>         my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
>         $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
>     }
>@@ -384,6 +386,11 @@ if ($op eq "modify")  {
>     $template->param( updtype => 'M',modify => 1 );
>     $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step;
> }
>+if ( $op eq "duplicate" ) {
>+    $template->param( updtype => 'I' );
>+    $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
>+}
>+
> # my $cardnumber=$data{'cardnumber'};
> $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
> if(!defined($data{'sex'})){
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 5432: 3142 | 3146 | 3232 | 3472 | 16894 | 17153 | 17154