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

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 319-324 CREATE TABLE `categories` ( -- this table shows information related to Koha patr Link Here
319
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
319
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
320
  `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
320
  `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
321
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
321
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
322
  `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
322
  `canbeguarantee` tinyint(1) NOT NULL default '0'
323
  `canbeguarantee` tinyint(1) NOT NULL default '0'
323
  PRIMARY KEY  (`categorycode`),
324
  PRIMARY KEY  (`categorycode`),
324
  UNIQUE KEY `categorycode` (`categorycode`)
325
  UNIQUE KEY `categorycode` (`categorycode`)
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 546-550 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
546
('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
546
('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
547
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
547
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
548
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
548
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
549
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
549
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
550
;
550
;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
Lines 148-154 function searchToHold(){ Link Here
148
148
149
    [% IF ( CAN_user_borrowers ) %]
149
    [% IF ( CAN_user_borrowers ) %]
150
        [% IF ( adultborrower AND activeBorrowerRelationship ) %]
150
        [% IF ( adultborrower AND activeBorrowerRelationship ) %]
151
            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C"><i class="icon-plus"></i> Add guarantee</a>
151
            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C"><i class="fa fa-plus"></i> Add guarantee</a>
152
        [% END %]
152
        [% END %]
153
        [% IF ( CAN_user_borrowers ) %]
153
        [% IF ( CAN_user_borrowers ) %]
154
            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
154
            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 lines)
Lines 1028-1034 $(document).ready(function() { Link Here
1028
                <li data-category_code="[% patron_attribute.category_code %]">
1028
                <li data-category_code="[% patron_attribute.category_code %]">
1029
                    <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label>
1029
                    <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label>
1030
                        <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
1030
                        <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
1031
                        <input type="hidden" id="[% patron_attribute.form_id %]_desc" name="[% patron_attribute.form_id %]_desc" value="[% patron_attribute.description |html %]" />
1032
                        [% IF ( patron_attribute.use_dropdown ) %]
1031
                        [% IF ( patron_attribute.use_dropdown ) %]
1033
                            <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
1032
                            <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
1034
                                <option value=""></option>
1033
                                <option value=""></option>
(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (+8 lines)
Lines 347-350 $(document).ready(function(){ Link Here
347
        e.preventDefault();
347
        e.preventDefault();
348
    });
348
    });
349
    $('#floating-save').css( { bottom: parseInt( $('#floating-save').css('bottom') ) + $('#changelanguage').height() + 'px' } );
349
    $('#floating-save').css( { bottom: parseInt( $('#floating-save').css('bottom') ) + $('#changelanguage').height() + 'px' } );
350
    $('#qa-save').css( {
351
        bottom: parseInt( $('#qa-save').css('bottom') ) + $('#changelanguage').height() + 'px' ,
352
        "background-color": "rgba(185, 216, 217, 0.6)",
353
        "bottom": "3%",
354
        "position": "fixed",
355
        "right": "1%",
356
        "width": "150px",
357
    } );
350
});
358
});
(-)a/members/memberentry.pl (-13 / +5 lines)
Lines 238-244 if ( ( $op eq 'insert' ) and !$nodouble ) { Link Here
238
}
238
}
239
239
240
#recover all data from guarantor address phone ,fax...
240
#recover all data from guarantor address phone ,fax...
241
if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P')) {
241
if ( $guarantorid) {
242
242
243
    if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) {
243
    if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) {
244
        $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
244
        $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
Lines 246-263 if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P')) { Link Here
246
        $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
246
        $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
247
        $newdata{'contactname'}     = $guarantordata->{'surname'};
247
        $newdata{'contactname'}     = $guarantordata->{'surname'};
248
        $newdata{'contacttitle'}    = $guarantordata->{'title'};
248
        $newdata{'contacttitle'}    = $guarantordata->{'title'};
249
249
        if ( $op eq 'add' ) {
250
        if ( $op eq 'add' ) {
250
	        foreach (qw(streetnumber address streettype address2
251
            my @attributes = @{C4::Members::Attributes::get_guarantor_shared_attributes()};
251
                        zipcode country city state phone phonepro mobile fax email emailpro branchcode
252
            foreach my $attribute (@attributes) {
252
                        B_streetnumber B_streettype B_address B_address2
253
                $newdata{$attribute} = $guarantordata->{$attribute};
253
                        B_city B_state B_zipcode B_country B_email B_phone)) {
254
                        $newdata{$_} = $guarantordata->{$_};
255
	        }
256
            my $additionalGuarantorField=C4::Context->preference("AdditionalGuarantorField");
257
            my @field_add=split(/\|/,$additionalGuarantorField);
258
            my $guarantordata=GetMember(borrowernumber => $guarantorid);
259
            foreach (@field_add) {
260
                $newdata{$_} = $guarantordata->{$_};
261
            }
254
            }
262
        }
255
        }
263
    }
256
    }
264
- 

Return to bug 12446