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

(-)a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql (-1 / +1 lines)
Lines 7-11 VALUES ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfe Link Here
7 
-- ********* --
 7 
-- ********* --
8 
-- STRUCTURE --
 8 
-- STRUCTURE --
9 
-- ********* --
 9 
-- ********* --
10 
ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0';
 10 
ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0' AFTER `checkprevcheckout`;
11 
UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
 11 
UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 304-310 CREATE TABLE `categories` ( -- this table shows information related to Koha patr Link Here
304 
  `hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
 304 
  `hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
305 
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
 305 
  `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
306 
  `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
 306 
  `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
307 
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
 307 
  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category
308 
  `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'.
 308 
  `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'.
309 
  `canbeguarantee` tinyint(1) NOT NULL default '0'
 309 
  `canbeguarantee` tinyint(1) NOT NULL default '0'
310 
  PRIMARY KEY  (`categorycode`),
 310 
  PRIMARY KEY  (`categorycode`),
(-)a/installer/data/mysql/sysprefs.sql (-1 lines)
Lines 7-13 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
7 
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
 7 
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
8 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
 8 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
9 
('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
 9 
('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
10 
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
11 
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
 10 
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
12 
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
 11 
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
13 
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
 12 
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 234-240 Link Here
234 
                                                    <tr>
 234 
                                                    <tr>
235 
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
 235 
                                                        [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
236 
                                                            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | html %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
 236 
                                                            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | html %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
237 
                                                            <td style='text-align:right'>[% guarantee.account.balance %]</td>
 237 
                                                            <td style='text-align:right'>[% guarantee.account.balance | html %]</td>
238 
                                                        [% ELSE %]
 238 
                                                        [% ELSE %]
239 
                                                            <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
 239 
                                                            <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
240 
                                                        [% END %]
 240 
                                                        [% END %]
Lines 242-248 Link Here
242 
                                                    [% END %]
 242 
                                                    [% END %]
243 
                                                    [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
 243 
                                                    [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
244 
                                                       <td>Total</td>
 244 
                                                       <td>Total</td>
245 
                                                       <td style='text-align:right'>[% amounttot %]</td>
 245 
                                                       <td style='text-align:right'>[% amounttot | html %]</td>
246 
                                                    [% END %]
 246 
                                                    [% END %]
247 
                                                </table>
 247 
                                                </table>
248 
                                            </li>
 248 
                                            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt (-1 / +1 lines)
Lines 18-24 Link Here
18 
                "dt_address":
 18 
                "dt_address":
19 
                    "[% INCLUDE escape_address data=data %]",
 19 
                    "[% INCLUDE escape_address data=data %]",
20 
                "dt_action":
 20 
                "dt_action":
21 
                    "<a href=\"#\" class=\"btn btn-mini select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
 21 
                    "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
22 
            }[% UNLESS loop.last %],[% END %]
 22 
            }[% UNLESS loop.last %],[% END %]
23 
        [% END %]
 23 
        [% END %]
24 
    ]
 24 
    ]
(-)a/members/moremember.pl (-2 lines)
Lines 197-203 if ( $count ) { Link Here
197 
    $template->param( guarantees => @guarantees);
 197 
    $template->param( guarantees => @guarantees);
198 
    $template->param( amounttot => sprintf("%.2f",$totalmount));
 198 
    $template->param( amounttot => sprintf("%.2f",$totalmount));
199 
}
 199 
}
200 
( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
201 

          200
          

        

        

          202
          
if (my $guarantor = $patron->guarantor){

          201
          
if (my $guarantor = $patron->guarantor){

        

        

          203
          
    $template->param(isguarantor => 1);

          202
          
    $template->param(isguarantor => 1);

        

            

              204
              
- 

              
              
            






  

  Return to bug 12446