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

(-)a/admin/smart-rules.pl (+2 lines)
Lines 262-267 elsif ($op eq 'add') { Link Here
262 
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
 262 
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
263 
    my $maxonsiteissueqty  = strip_non_numeric($input->param('maxonsiteissueqty'));
 263 
    my $maxonsiteissueqty  = strip_non_numeric($input->param('maxonsiteissueqty'));
264 
    my $renewalsallowed  = $input->param('renewalsallowed');
 264 
    my $renewalsallowed  = $input->param('renewalsallowed');
265 
    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
265 
    my $renewalperiod    = $input->param('renewalperiod');
 266 
    my $renewalperiod    = $input->param('renewalperiod');
266 
    my $norenewalbefore  = $input->param('norenewalbefore');
 267 
    my $norenewalbefore  = $input->param('norenewalbefore');
267 
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
 268 
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
Lines 306-311 elsif ($op eq 'add') { Link Here
306 
        hardduedate                   => $hardduedate,
 307 
        hardduedate                   => $hardduedate,
307 
        hardduedatecompare            => $hardduedatecompare,
 308 
        hardduedatecompare            => $hardduedatecompare,
308 
        renewalsallowed               => $renewalsallowed,
 309 
        renewalsallowed               => $renewalsallowed,
310 
        unseen_renewals_allowed       => $unseen_renewals_allowed,
309 
        renewalperiod                 => $renewalperiod,
 311 
        renewalperiod                 => $renewalperiod,
310 
        norenewalbefore               => $norenewalbefore,
 312 
        norenewalbefore               => $norenewalbefore,
311 
        auto_renew                    => $auto_renew,
 313 
        auto_renew                    => $auto_renew,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +12 lines)
Lines 105-110 Link Here
105 
                <th>Max. suspension duration (day)</th>
 105 
                <th>Max. suspension duration (day)</th>
106 
                <th>Suspension charging interval</th>
 106 
                <th>Suspension charging interval</th>
107 
                <th>Renewals allowed (count)</th>
 107 
                <th>Renewals allowed (count)</th>
108 
                [% IF Koha.Preference('UnseenRenewals') %]
109 
                <th>Unseen renewals allowed (count)</th>
110 
                [% END %]
108 
                <th>Renewal period</th>
 111 
                <th>Renewal period</th>
109 
                <th>No renewal before</th>
 112 
                <th>No renewal before</th>
110 
                <th>Automatic renewal</th>
 113 
                <th>Automatic renewal</th>
Lines 143-148 Link Here
143 
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
 146 
                        [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
144 
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
 147 
                        [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
145 
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
 148 
                        [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
149 
                        [% SET unseenrenewalsallowed = all_rules.$c.$i.unseen_renewals_allowed %]
146 
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
 150 
                        [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
147 
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
 151 
                        [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
148 
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
 152 
                        [% SET auto_renew = all_rules.$c.$i.auto_renew %]
Lines 156-162 Link Here
156 
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
 160 
                        [% SET article_requests = all_rules.$c.$i.article_requests %]
157 
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
 161 
                        [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
158 

          162
          

        

          
            

              159
              
                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]


              163
              
                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]

            

        

          160
          
                        [% IF show_rule %]

          164
          
                        [% IF show_rule %]

        

        

          161
          
                            [% SET row_count = row_count + 1 %]

          165
          
                            [% SET row_count = row_count + 1 %]

        

        

          162
          
                            <tr row_countd="row_[% row_count | html %]">

          166
          
                            <tr row_countd="row_[% row_count | html %]">

        

  

    
      
            Lines 239-244
          
      
      
        Link Here
      
    
  

        

          239
          
                                    <td>[% maxsuspensiondays | html %]</td>

          243
          
                                    <td>[% maxsuspensiondays | html %]</td>

        

        

          240
          
                                    <td>[% suspension_chargeperiod | html %]</td>

          244
          
                                    <td>[% suspension_chargeperiod | html %]</td>

        

        

          241
          
                                    <td>[% renewalsallowed | html %]</td>

          245
          
                                    <td>[% renewalsallowed | html %]</td>

        

            

              
              
              246
              
                                    [% IF Koha.Preference('UnseenRenewals') %]

            

            

              247
              
                                        <td>[% unseenrenewalsallowed | html %]</td>

            

            

              248
              
                                    [% END %]

            

        

          242
          
                                    <td>[% renewalperiod | html %]</td>

          249
          
                                    <td>[% renewalperiod | html %]</td>

        

        

          243
          
                                    <td>[% norenewalbefore | html %]</td>

          250
          
                                    <td>[% norenewalbefore | html %]</td>

        

        

          244
          
                                    <td>

          251
          
                                    <td>

        

  

    
      
            Lines 365-370
          
      
      
        Link Here
      
    
  

        

          365
          
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>

          372
          
                    <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>

        

        

          366
          
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>

          373
          
                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>

        

        

          367
          
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>

          374
          
                    <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>

        

            

              
              
              375
              
                    <td><input type="text" name="unseen_renewals_allowed" id="unseen_renewals_allowed" size="2" /></td>

            

        

          368
          
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>

          376
          
                    <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>

        

        

          369
          
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>

          377
          
                    <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>

        

        

          370
          
                    <td>

          378
          
                    <td>

        

  

    
      
            Lines 431-436
          
      
      
        Link Here
      
    
  

        

          431
          
                      <th>Max. suspension duration (day)</th>

          439
          
                      <th>Max. suspension duration (day)</th>

        

        

          432
          
                      <th>Suspension charging interval</th>

          440
          
                      <th>Suspension charging interval</th>

        

        

          433
          
                      <th>Renewals allowed (count)</th>

          441
          
                      <th>Renewals allowed (count)</th>

        

            

              
              
              442
              
                      [% IF Koha.Preference('UnseenRenewals') %]

            

            

              443
              
                      <th>Unseen renewals allowed (count)</th>

            

            

              444
              
                      [% END %]

            

        

          434
          
                      <th>Renewal period</th>

          445
          
                      <th>Renewal period</th>

        

        

          435
          
                      <th>No renewal before</th>

          446
          
                      <th>No renewal before</th>

        

        

          436
          
                      <th>Automatic renewal</th>

          447
          
                      <th>Automatic renewal</th>

        

            

              437
              
- 

              
              
            






  

  Return to bug 24083