Attachment #77139 for bug #20828

View | Details | Raw Unified | Return to bug 20828
Collapse All | Expand All

Lines 147-153 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-2 / +5 lines)
147	<input type="hidden" name="op" value="insert" />	147	<input type="hidden" name="op" value="insert" />
148	[% ELSE %]	148	[% ELSE %]
149	<input type="hidden" name="op" value="save" />	149	<input type="hidden" name="op" value="save" />
150	[% IF step == 4 \|\| step == 5 \|\| step == 6 \|\| step == 2 \|\| step == 1 %]	150	[% IF step == 4 \|\| step == 5 \|\| step == 6 \|\| step == 2 \|\| step == 1 \|\| step == 7 %]
151	[%# Only put the cardnumber if we arent showing it in the form later %]	151	[%# Only put the cardnumber if we arent showing it in the form later %]
152	[% IF cardnumber %]	152	[% IF cardnumber %]
153	<input type="hidden" name="cardnumber" value="[% cardnumber %]" />	153	<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
Lines 976-982 Link Here
976		976
977	[% END %]	977	[% END %]
978		978
979	[% IF ( step_4 ) %]	979	[% IF ( step_7 ) %]
980	[% IF Koha.Preference('HouseboundModule') %]	980	[% IF Koha.Preference('HouseboundModule') %]
981	<fieldset class="rows" id="memberentry_housebound_roles">	981	<fieldset class="rows" id="memberentry_housebound_roles">
982	<legend id="housebound_roles">Housebound roles</legend>	982	<legend id="housebound_roles">Housebound roles</legend>
Lines 1026-1031 Link Here
1026	</ol>	1026	</ol>
1027	</fieldset>	1027	</fieldset>
1028	[% END # hide fieldset %]	1028	[% END # hide fieldset %]
		1029	[% END # IF step_7 %]
		1030
		1031	[% IF ( step_4 ) %]
1029	[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]	1032	[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
1030	<fieldset class="rows" id="memberentry_patron_attributes">	1033	<fieldset class="rows" id="memberentry_patron_attributes">
1031	<legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>	1034	<legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>

Lines 302-308 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
302	</div>	302	</div>
303	</div>	303	</div>
304	<div class="action">	304	<div class="action">
305	<a href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber %]&step=4">Edit</a>	305	<a href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber %]&step=7">Edit</a>
306	</div>	306	</div>
307	[% END %]	307	[% END %]
308		308




    %data=%newdata; 
    $template->param( updtype => ($op eq 'add' ?'I':'M'));	# used to check for $op eq "insert"... but we just changed $op!
    unless ($step){  
        $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 );
    }  
} 
if (C4::Context->preference("IndependentBranches")) {

    }
}
if ($op eq 'add'){
    $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1);
}
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, step_7 => 1) unless $step;
    if ( $step == 4 ) {
        $template->param( categorycode => $borrower_data->{'categorycode'} );
    }

}
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, step_7 => 1 ) unless $step;
    $data{'cardnumber'} = "";
}

- 

Return to bug 20828

Lines 569-575 if ($nok or !$nodouble){ Link Here

(-)a/members/memberentry.pl (-5 / +4 lines)
569	%data=%newdata;	569	%data=%newdata;
570	$template->param( updtype => ($op eq 'add' ?'I':'M')); # used to check for $op eq "insert"... but we just changed $op!	570	$template->param( updtype => ($op eq 'add' ?'I':'M')); # used to check for $op eq "insert"... but we just changed $op!
571	unless ($step){	571	unless ($step){
572	$template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1);	572	$template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 );
573	}	573	}
574	}	574	}
575	if (C4::Context->preference("IndependentBranches")) {	575	if (C4::Context->preference("IndependentBranches")) {
Lines 582-592 if (C4::Context->preference("IndependentBranches")) { Link Here
582	}	582	}
583	}	583	}
584	if ($op eq 'add'){	584	if ($op eq 'add'){
585	$template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1);	585	$template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1);
586	}	586	}
587	if ($op eq "modify") {	587	if ($op eq "modify") {
588	$template->param( updtype => 'M',modify => 1 );	588	$template->param( updtype => 'M',modify => 1 );
589	$template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1) unless $step;	589	$template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1, step_7 => 1) unless $step;
590	if ( $step == 4 ) {	590	if ( $step == 4 ) {
591	$template->param( categorycode => $borrower_data->{'categorycode'} );	591	$template->param( categorycode => $borrower_data->{'categorycode'} );
592	}	592	}
Lines 602-608 if ($op eq "modify") { Link Here
602	}	602	}
603	if ( $op eq "duplicate" ) {	603	if ( $op eq "duplicate" ) {
604	$template->param( updtype => 'I' );	604	$template->param( updtype => 'I' );
605	$template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;	605	$template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1, step_7 => 1 ) unless $step;
606	$data{'cardnumber'} = "";	606	$data{'cardnumber'} = "";
607	}	607	}
608		608
609	-