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

(-)a/cataloguing/addbiblio.pl (-12 / +22 lines)
Lines 39-44 use C4::Charset; Link Here
39
use Date::Calc qw(Today);
39
use Date::Calc qw(Today);
40
use MARC::File::USMARC;
40
use MARC::File::USMARC;
41
use MARC::File::XML;
41
use MARC::File::XML;
42
use URI::Escape;
42
43
43
if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
44
if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
44
    MARC::File::XML->default_record_format('UNIMARC');
45
    MARC::File::XML->default_record_format('UNIMARC');
Lines 725-732 my $redirect = $input->param('redirect'); Link Here
725
my $dbh           = C4::Context->dbh;
726
my $dbh           = C4::Context->dbh;
726
my $hostbiblionumber = $input->param('hostbiblionumber');
727
my $hostbiblionumber = $input->param('hostbiblionumber');
727
my $hostitemnumber = $input->param('hostitemnumber');
728
my $hostitemnumber = $input->param('hostitemnumber');
729
# fast cataloguing datas in transit
730
my $fa_circborrowernumber = $input->param('circborrowernumber');
731
my $fa_barcode            = $input->param('barcode');
732
my $fa_branch             = $input->param('branch');
733
my $fa_stickyduedate      = $input->param('stickyduedate');
734
my $fa_duedatespec        = $input->param('duedatespec');
728
735
729
    
730
my $userflags = 'edit_catalogue';
736
my $userflags = 'edit_catalogue';
731
if ($frameworkcode eq 'FA'){
737
if ($frameworkcode eq 'FA'){
732
    $userflags = 'fast_cataloging';
738
    $userflags = 'fast_cataloging';
Lines 748-758 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
748
754
749
if ($frameworkcode eq 'FA'){
755
if ($frameworkcode eq 'FA'){
750
    # We need to grab and set some variables in the template for use on the additems screen
756
    # We need to grab and set some variables in the template for use on the additems screen
751
    $template->{VARS}->{'circborrowernumber'} = $input->param('borrowernumber');
757
    $template->param(
752
    $template->{VARS}->{'barcode'} = $input->param('barcode');
758
        'circborrowernumber' => $fa_circborrowernumber,
753
    $template->{VARS}->{'branch'} = $input->param('branch');
759
        'barcode'            => $fa_barcode,
754
    $template->{VARS}->{'stickyduedate'} = $input->param('stickyduedate');
760
        'branch'             => $fa_branch,
755
    $template->{VARS}->{'duedatespec'} = $input->param('duedatespec');
761
        'stickyduedate'      => $fa_stickyduedate,
762
        'duedatespec'        => $fa_duedatespec,
763
    );
756
}
764
}
757
765
758
# Getting the list of all frameworks
766
# Getting the list of all frameworks
Lines 865-877 if ( $op eq "addbiblio" ) { Link Here
865
        }
873
        }
866
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
874
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
867
	    if ($frameworkcode eq 'FA'){
875
	    if ($frameworkcode eq 'FA'){
868
		my $borrowernumber = $input->param('circborrowernumber');
869
		my $barcode = $input->param('barcode');
870
		my $branch = $input->param('branch');
871
		my $stickyduedate = $input->param('stickyduedate');
872
		my $duedatespec = $input->param('duedatespec');
873
		print $input->redirect(
876
		print $input->redirect(
874
                "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&borrowernumber=$borrowernumber&branch=$branch&barcode=$barcode&stickyduedate=$stickyduedate&duedatespec=$duedatespec"
877
            '/cgi-bin/koha/cataloguing/additem.pl?'
878
            .'biblionumber='.$biblionumber
879
            .'&frameworkcode='.$frameworkcode
880
            .'&circborrowernumber='.$fa_circborrowernumber
881
            .'&branch='.$fa_branch
882
            .'&barcode='.uri_escape($fa_barcode)
883
            .'&stickyduedate='.$fa_stickyduedate
884
            .'&duedatespec='.$fa_duedatespec
875
		);
885
		);
876
		exit;
886
		exit;
877
	    }
887
	    }
(-)a/cataloguing/additem.pl (-12 / +24 lines)
Lines 314-319 my $itemnumber = $input->param('itemnumber'); Link Here
314
my $op           = $input->param('op');
314
my $op           = $input->param('op');
315
my $hostitemnumber = $input->param('hostitemnumber');
315
my $hostitemnumber = $input->param('hostitemnumber');
316
my $marcflavour  = C4::Context->preference("marcflavour");
316
my $marcflavour  = C4::Context->preference("marcflavour");
317
# fast cataloguing datas
318
my $fa_circborrowernumber = $input->param('circborrowernumber');
319
my $fa_barcode            = $input->param('barcode');
320
my $fa_branch             = $input->param('branch');
321
my $fa_stickyduedate      = $input->param('stickyduedate');
322
my $fa_duedatespec        = $input->param('duedatespec');
317
323
318
my $frameworkcode = &GetFrameworkCode($biblionumber);
324
my $frameworkcode = &GetFrameworkCode($biblionumber);
319
325
Lines 506-518 if ($op eq "additem") { Link Here
506
	    undef($itemrecord);
512
	    undef($itemrecord);
507
	}
513
	}
508
    }	
514
    }	
509
    if ($frameworkcode eq 'FA' && $input->param('borrowernumber')){
515
    if ($frameworkcode eq 'FA' && $fa_circborrowernumber){
510
	my $redirect_string = 'borrowernumber=' . uri_escape($input->param('borrowernumber')) .
516
        print $input->redirect(
511
	  '&barcode=' . uri_escape($input->param('barcode'));
517
           '/cgi-bin/koha/circ/circulation.pl?'
512
	$redirect_string .= '&duedatespec=' . uri_escape($input->param('duedatespec')) . 
518
           .'borrowernumber='.$fa_circborrowernumber
513
	  '&stickyduedate=1';
519
           .'&barcode='.uri_escape($fa_barcode)
514
	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?" . $redirect_string);
520
           .'&duedatespec='.$fa_duedatespec
515
	exit;
521
           .'&stickyduedate=1'
522
        );
523
        exit;
516
    }
524
    }
517
525
518
526
Lines 814-824 $template->param( Link Here
814
);
822
);
815
823
816
if ($frameworkcode eq 'FA'){
824
if ($frameworkcode eq 'FA'){
817
    $template->{VARS}->{'borrowernumber'}=$input->param('borrowernumber');
825
    # fast cataloguing datas
818
    $template->{VARS}->{'barcode'}=$input->param('barcode');
826
    $template->param(
819
    $template->{VARS}->{'stickyduedate'}=$input->param('stickduedate');
827
        'circborrowernumber' => $fa_circborrowernumber,
820
    $template->{VARS}->{'duedatespec'}=$input->param('duedatespec');
828
        'barcode'            => $fa_barcode,
821
}    
829
        'branch'             => $fa_branch,
830
        'stickyduedate'      => $fa_stickyduedate,
831
        'duedatespec'        => $fa_duedatespec,
832
    );
833
}
822
834
823
foreach my $error (@errors) {
835
foreach my $error (@errors) {
824
    $template->param($error => 1);
836
    $template->param($error => 1);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +2 lines)
Lines 571-583 function Changefwk(FwkList) { Link Here
571
571
572
</div><!-- tabs -->
572
</div><!-- tabs -->
573
573
574
<!-- Fields for fast add cataloguing -->
574
[%# Fields for fast cataloguing %]
575
<input type="hidden" name="barcode" value="[% barcode %]" />
575
<input type="hidden" name="barcode" value="[% barcode %]" />
576
<input type="hidden" name="branch" value="[% branch %]" />
576
<input type="hidden" name="branch" value="[% branch %]" />
577
<input type="hidden" name="circborrowernumber" value="[% circborrowernumber %]" />
577
<input type="hidden" name="circborrowernumber" value="[% circborrowernumber %]" />
578
<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
578
<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
579
<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
579
<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
580
<!-- /End of fast add fields -->
580
[%# End of fields for fast cataloguing %]
581
581
582
</form>
582
</form>
583
583
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +3 lines)
Lines 215-224 $(document).ready(function() { Link Here
215
    <input type="submit" value="Save changes" onclick="return Check(this.form)" />
215
    <input type="submit" value="Save changes" onclick="return Check(this.form)" />
216
    [% END %]</fieldset>
216
    [% END %]</fieldset>
217
    
217
    
218
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
218
    [%# Fields for fast cataloguing %]
219
    <input type="hidden" name="circborrowernumber" value="[% circborrowernumber %]" />
219
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
220
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
220
    <input type="hidden" name="barcode" value="[% barcode %]" />
221
    <input type="hidden" name="barcode" value="[% barcode %]" />
221
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
222
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
223
    [%# End fields for fast cataloguing %]
222
224
223
225
224
    </form>
226
    </form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +3 lines)
Lines 400-406 function validate1(date) { Link Here
400
</p>
400
</p>
401
[% END %]
401
[% END %]
402
402
403
    <input type="hidden" name="barcode" value="[% barcode %]" />
403
    <input type="hidden" name="barcode" value="[% barcode |html %]" />
404
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
404
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
405
    <input type="hidden" name="issueconfirmed" value="1" />
405
    <input type="hidden" name="issueconfirmed" value="1" />
406
    [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]
406
    [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]
Lines 454-463 function validate1(date) { Link Here
454
        [% END %]
454
        [% END %]
455
455
456
        [% IF ( UNKNOWN_BARCODE ) %]
456
        [% IF ( UNKNOWN_BARCODE ) %]
457
            <li>The barcode was not found [% barcode %]</li>
457
            <li>The barcode was not found [% barcode |html %]</li>
458
	    [% IF ( fast_cataloging ) %]
458
	    [% IF ( fast_cataloging ) %]
459
	        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
459
	        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
460
                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode %]&amp;borrowernumber=[% borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]">Fast cataloging</a>
460
            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]">Fast cataloging</a>
461
		[% END %]
461
		[% END %]
462
	    [% END %]
462
	    [% END %]
463
        [% END %]
463
        [% END %]
464
- 

Return to bug 7253