Attachment #157556 for bug #34954

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

Lines 318-324 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-1 / +1 lines)
318	<li>	318	<li>
319	<label class="update_dateexpiry" for="update_dateexpiry">Renew existing patrons</label>	319	<label class="update_dateexpiry" for="update_dateexpiry">Renew existing patrons</label>
320	<select class="update_dateexpiry" type="select" id="update_dateexpiry" name="update_dateexpiry" disabled/>	320	<select class="update_dateexpiry" type="select" id="update_dateexpiry" name="update_dateexpiry" disabled/>
321	<option value="">using the datexpiry value in the file, if present</option>	321	<option value="">using the dateexpiry value in the file, if present</option>
322	<option value="dateexpiry">from the current membership expiry date</option>	322	<option value="dateexpiry">from the current membership expiry date</option>
323	<option value="now">from the current date</option>	323	<option value="now">from the current date</option>
324	</select>	324	</select>

Lines 789-795 have already been fixed in maintainance releases)</p> Link Here

(-)a/misc/release_notes/release_notes_18_05_00.html (-1 / +1 lines)
789	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847">[19847]</a> tracklinks.pl accepts any url from a parameter for proxying</li>	789	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847">[19847]</a> tracklinks.pl accepts any url from a parameter for proxying</li>
790	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881">[19881]</a> authorities-list.pl can be executed by anybody</li>	790	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881">[19881]</a> authorities-list.pl can be executed by anybody</li>
791	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126">[20126]</a> Saving a biblio does no longer update MARC field lengths</li>	791	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126">[20126]</a> Saving a biblio does no longer update MARC field lengths</li>
792	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145">[20145]</a> borrowers.datexpiry eq '0000-00-00' means expired?</li>	792	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145">[20145]</a> borrowers.dateexpiry eq '0000-00-00' means expired?</li>
793	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229">[20229]</a> Remove problematic SQL modes</li>	793	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229">[20229]</a> Remove problematic SQL modes</li>
794	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299">[20299]</a> Koha is a gift</li>	794	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299">[20299]</a> Koha is a gift</li>
795	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323">[20323]</a> Batch patron modification tool broken</li>	795	<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323">[20323]</a> Batch patron modification tool broken</li>

Lines 626-632 have already been fixed in maintainance releases) Link Here

(-)a/misc/release_notes/release_notes_18_05_00.md (-1 / +1 lines)
626	- [[19847]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847) tracklinks.pl accepts any url from a parameter for proxying	626	- [[19847]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847) tracklinks.pl accepts any url from a parameter for proxying
627	- [[19881]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881) authorities-list.pl can be executed by anybody	627	- [[19881]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881) authorities-list.pl can be executed by anybody
628	- [[20126]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126) Saving a biblio does no longer update MARC field lengths	628	- [[20126]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126) Saving a biblio does no longer update MARC field lengths
629	- [[20145]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145) borrowers.datexpiry eq '0000-00-00' means expired?	629	- [[20145]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145) borrowers.dateexpiry eq '0000-00-00' means expired?
630	- [[20229]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229) Remove problematic SQL modes	630	- [[20229]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229) Remove problematic SQL modes
631	- [[20299]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299) Koha is a gift	631	- [[20299]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299) Koha is a gift
632	- [[20323]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323) Batch patron modification tool broken	632	- [[20323]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323) Batch patron modification tool broken





    is(
        $patron->dateexpiry, dt_from_string->add( months => 18, end_of_month => 'limit' )->ymd,
        "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false (i.e. use passed dateenrolled) "
    );

    $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_values );

    $patron->discard_changes();
    is(
        $patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,
        "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday true "
    );

    $csv_headers = 'cardnumber,surname,branchcode,categorycode';

    $patron->discard_changes();
    is(
        $patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,
        "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false but no dateenrolled in file (today is used) "
    );

};
- 

Return to bug 34954

Lines 1201-1207 subtest 'test update_dateexpiry when no dateexpiry in file' => sub { Link Here

(-)a/t/db_dependent/Koha/Patrons/Import.t (-4 / +3 lines)
1201		1201
1202	is(	1202	is(
1203	$patron->dateexpiry, dt_from_string->add( months => 18, end_of_month => 'limit' )->ymd,	1203	$patron->dateexpiry, dt_from_string->add( months => 18, end_of_month => 'limit' )->ymd,
1204	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday false (i.e. use passed dateenrolled) "	1204	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false (i.e. use passed dateenrolled) "
1205	);	1205	);
1206		1206
1207	$filename_1 = make_csv( $temp_dir, $csv_headers, $csv_values );	1207	$filename_1 = make_csv( $temp_dir, $csv_headers, $csv_values );
Lines 1214-1220 subtest 'test update_dateexpiry when no dateexpiry in file' => sub { Link Here
1214	$patron->discard_changes();	1214	$patron->discard_changes();
1215	is(	1215	is(
1216	$patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,	1216	$patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,
1217	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday true "	1217	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday true "
1218	);	1218	);
1219		1219
1220	$csv_headers = 'cardnumber,surname,branchcode,categorycode';	1220	$csv_headers = 'cardnumber,surname,branchcode,categorycode';
Lines 1228-1234 subtest 'test update_dateexpiry when no dateexpiry in file' => sub { Link Here
1228	$patron->discard_changes();	1228	$patron->discard_changes();
1229	is(	1229	is(
1230	$patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,	1230	$patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd,
1231	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday false but no dateenrolled in file (today is used) "	1231	"Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false but no dateenrolled in file (today is used) "
1232	);	1232	);
1233		1233
1234	};	1234	};
1235	-