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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-8 / +43 lines)
Lines 21-26 Link Here
21
	<div id="yui-main">
21
	<div id="yui-main">
22
	<div class="yui-b">
22
	<div class="yui-b">
23
23
24
    <!-- Modal -->
25
    <div id="multi_receiving" class="modal" tabindex="-1" role="dialog" aria-labelledby="multi_receiving_label" aria-hidden="true">
26
        <div class="modal-dialog">
27
            <div class="modal-content">
28
                <form action="/cgi-bin/koha/serials/serials-collection.pl" method="post">
29
                    <div class="modal-body">
30
                        <fieldset class="rows">
31
                            <legend>Multi receiving</legend>
32
                            <ol>
33
                                <li>
34
                                <label for="nbissues" class="required">How many issues do you want to receive?</label>
35
                                <input type="text"  size="25" id="nbissues" name="nbissues" required="required" />
36
                                <li>
37
                                <li>
38
                                    <label for="date_received_today">Set the date received to today?</label>
39
                                    <input type="checkbox" id="date_received_today" name="date_received_today" />
40
                                </li>
41
                            </ol>
42
                            <input type="hidden" name="op" value="gennext" />
43
                            <input type="hidden" name="subscriptionid" value="[% subscriptionidlist %]" />
44
                        </fieldset>
45
                    </div>
46
47
                    <div class="modal-footer">
48
                        <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
49
                        <input type="submit" class="btn btn-default approve" value="Multi receiving" />
50
                    </div>
51
                </form>
52
            </div>
53
        </div>
54
    </div>
55
24
56
25
[% UNLESS ( popup ) %]
57
[% UNLESS ( popup ) %]
26
	[% INCLUDE 'serials-toolbar.inc' %]
58
	[% INCLUDE 'serials-toolbar.inc' %]
Lines 112-121 Link Here
112
<div id="subscription-year-[% year.year %]">
144
<div id="subscription-year-[% year.year %]">
113
    [% IF ( CAN_user_serials_receive_serials ) %]
145
    [% IF ( CAN_user_serials_receive_serials ) %]
114
        <p>
146
        <p>
115
            <input type="submit" value="Edit serials" />&nbsp;
147
            <div class="btn-group"><input type="submit" value="Edit serials" class="btn btn-default btn-sm" /></div>
116
            [% UNLESS subscription.closed %]
148
            [% UNLESS subscription.closed %]
117
                <input type="button" value="Generate next" onclick="javascript:generateNext([% subscriptionidlist %])" />
149
                <div class="btn-group"><input type="button" value="Generate next" onclick="javascription:generateNext([% subscriptionidlist %])" class="btn btn-default btn-sm" /></div>
118
                [% IF ( subscriptions.size == 1 and !serialsadditems ) %]&nbsp;<input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %]
150
                [% IF ( subscriptions.size == 1 and !serialsadditems ) %]&nbsp;
151
                    <div class="btn-group"><a href="#multi_receiving" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Multi receiving</a></div>
152
                [% END %]
119
            [% END %]
153
            [% END %]
120
        </p>
154
        </p>
121
    [% END %]
155
    [% END %]
Lines 273-284 Link Here
273
    </script>
307
    </script>
274
    [% Asset.js("js/serials-toolbar.js") %]
308
    [% Asset.js("js/serials-toolbar.js") %]
275
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
309
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
310
276
    <script type="text/javascript">
311
    <script type="text/javascript">
277
        function generateReceive(subscriptionid) {
312
278
            if(nbissues=prompt(_("How many issues do you want to receive ?"))){
279
                document.location = 'serials-collection.pl?op=gennext&subscriptionid='+subscriptionid+'&nbissues='+nbissues;
280
            }
281
        }
282
        function print_slip(subscriptionid,issue){
313
        function print_slip(subscriptionid,issue){
283
            var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
314
            var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
284
            window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
315
            window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
Lines 316-321 Link Here
316
                "bInfo": false,
347
                "bInfo": false,
317
                "bFilter": false,
348
                "bFilter": false,
318
            } ));
349
            } ));
350
351
            $('#multi_receiving').on('show', function () {
352
               $(this).find(".modal-body").html($(".serials_multi_receiving")[0].outerHTML);
353
            });
319
        });
354
        });
320
355
321
    </script>
356
    </script>
(-)a/serials/serials-collection.pl (-3 / +7 lines)
Lines 28-39 use C4::Letters; Link Here
28
use C4::Output;
28
use C4::Output;
29
use C4::Context;
29
use C4::Context;
30
30
31
use Koha::DateUtils qw( dt_from_string );
32
31
use List::MoreUtils qw/uniq/;
33
use List::MoreUtils qw/uniq/;
32
34
33
35
34
my $query = new CGI;
36
my $query = new CGI;
35
my $op = $query->param('op') || q{};
37
my $op = $query->param('op') || q{};
36
my $nbissues=$query->param('nbissues');
38
my $nbissues=$query->param('nbissues');
39
my $date_received_today = $query->param('date_received_today') || 0;
37
my $dbh = C4::Context->dbh;
40
my $dbh = C4::Context->dbh;
38
41
39
my ($template, $loggedinuser, $cookie)
42
my ($template, $loggedinuser, $cookie)
Lines 66-73 if($op eq 'gennext' && @subscriptionid){ Link Here
66
        $sth->execute($subscriptionid);
69
        $sth->execute($subscriptionid);
67
        # modify actual expected issue, to generate the next
70
        # modify actual expected issue, to generate the next
68
        if ( my $issue = $sth->fetchrow_hashref ) {
71
        if ( my $issue = $sth->fetchrow_hashref ) {
72
            my $planneddate = $date_received_today ? dt_from_string : $issue->{planneddate};
69
            ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
73
            ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
70
                    $issue->{planneddate}, $issue->{publisheddate},
74
                    $planneddate, $issue->{publisheddate},
71
                    $issue->{publisheddatetext}, $status, "" );
75
                    $issue->{publisheddatetext}, $status, "" );
72
        } else {
76
        } else {
73
            require C4::Serials::Numberpattern;
77
            require C4::Serials::Numberpattern;
Lines 81-89 if($op eq 'gennext' && @subscriptionid){ Link Here
81
85
82
             ## We generate the next publication date
86
             ## We generate the next publication date
83
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);
87
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);
88
             my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
84
             ## Creating the new issue
89
             ## Creating the new issue
85
             NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
90
             NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
86
                     1, $nextpublisheddate, $nextpublisheddate );
91
                     1, $planneddate, $nextpublisheddate );
87
92
88
             ## Updating the subscription seq status
93
             ## Updating the subscription seq status
89
             my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
94
             my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
90
- 

Return to bug 18327