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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt (-2 / +3 lines)
Lines 6-12 Link Here
6
    </style>
6
    </style>
7
    <script type="text/javascript">
7
    <script type="text/javascript">
8
        <!--
8
        <!--
9
        function fillguarantor(id, surname, firstname, streetnumber, address, address2, city, state, zipcode, country) {
9
        function fillguarantor(id, surname, firstname, streetnumber, address, address2, city, state, zipcode, country, branchcode) {
10
            var $ = window.opener.$;
10
            var $ = window.opener.$;
11
            var form = $('#entryform').get(0);
11
            var form = $('#entryform').get(0);
12
12
Lines 35-40 Link Here
35
            form.state.value = state;
35
            form.state.value = state;
36
            form.zipcode.value = zipcode;
36
            form.zipcode.value = zipcode;
37
            form.country.value = country;
37
            form.country.value = country;
38
            form.branchcode.value = branchcode;
38
39
39
            form.guarantorsearch.value = 'Change';
40
            form.guarantorsearch.value = 'Change';
40
            self.close();
41
            self.close();
Lines 79-85 Link Here
79
				<td><p>[% resultsloo.address %] [% resultsloo.address2 %] [% resultsloo.city %] [% resultsloo.state %] [% resultsloo.zipcode %] [% resultsloo.country %]</p></td>
80
				<td><p>[% resultsloo.address %] [% resultsloo.address2 %] [% resultsloo.city %] [% resultsloo.state %] [% resultsloo.zipcode %] [% resultsloo.country %]</p></td>
80
                <td>
81
                <td>
81
                    <form action="">
82
                    <form action="">
82
                        <input type="button" onclick="fillguarantor('[% resultsloo.borrowernumber %]', '[% resultsloo.surname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.firstname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.streetnumber |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.address |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.address2 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.city |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.state |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.zipcode |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.country |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]'); return false;" value="Select"/>
83
                        <input type="button" onclick="fillguarantor('[% resultsloo.borrowernumber %]', '[% resultsloo.surname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.firstname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.streetnumber |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.address |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.address2 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.city |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]', '[% resultsloo.state |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.zipcode |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.country |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]','[% resultsloo.branchcode |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]'); return false;" value="Select"/>
83
                    </form>
84
                    </form>
84
                </td>
85
                </td>
85
			</tr>
86
			</tr>
(-)a/members/memberentry.pl (-4 / +5 lines)
Lines 380-386 if ($nok or !$nodouble){ Link Here
380
} 
380
} 
381
if (C4::Context->preference("IndependantBranches")) {
381
if (C4::Context->preference("IndependantBranches")) {
382
    my $userenv = C4::Context->userenv;
382
    my $userenv = C4::Context->userenv;
383
    if ($userenv->{flags} % 2 != 1 && $data{branchcode}){
383
    if ($userenv->{flags} % 2 != 1 && $data{'branchcode'}){
384
        unless ($userenv->{branch} eq $data{'branchcode'}){
384
        unless ($userenv->{branch} eq $data{'branchcode'}){
385
            print $input->redirect("/cgi-bin/koha/members/members-home.pl");
385
            print $input->redirect("/cgi-bin/koha/members/members-home.pl");
386
            exit;
386
            exit;
Lines 498-504 my $borrotitlepopup = CGI::popup_menu(-name=>'title', Link Here
498
        -default=>$default_borrowertitle
498
        -default=>$default_borrowertitle
499
        );    
499
        );    
500
500
501
my @relationships = split /,|\|/, C4::Context->preference('BorrowerRelationship');
501
my @relationships = split /,|\|/, C4::Context->preference('borrowerRelationship');
502
my @relshipdata;
502
my @relshipdata;
503
while (@relationships) {
503
while (@relationships) {
504
  my $relship = shift @relationships || '';
504
  my $relship = shift @relationships || '';
Lines 554-560 if(scalar(@select_branch) > 0){ Link Here
554
# --------------------------------------------------------------------------------------------------------
554
# --------------------------------------------------------------------------------------------------------
555
  #in modify mod :default value from $CGIbranch comes from borrowers table
555
  #in modify mod :default value from $CGIbranch comes from borrowers table
556
  #in add mod: default value come from branches table (ip correspendence)
556
  #in add mod: default value come from branches table (ip correspendence)
557
$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C' && $data{'branchcode'}));
557
if (defined ($data{'branchcode'}) and ( $op eq 'modify' || ( $op eq 'add' && $category_type eq 'C' ) )) {
558
    $default = $data{'branchcode'};
559
}
558
$CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
560
$CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
559
            -name   => 'branchcode',
561
            -name   => 'branchcode',
560
            -values => \@select_branch,
562
            -values => \@select_branch,
561
- 

Return to bug 6116