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

(-)a/acqui/addorderiso2709.pl (-2 / +4 lines)
Lines 99-105 if ($op eq ""){ Link Here
99
                     "allmatch" => $allmatch,
99
                     "allmatch" => $allmatch,
100
                     );
100
                     );
101
    import_biblios_list($template, $cgiparams->{'import_batch_id'});
101
    import_biblios_list($template, $cgiparams->{'import_batch_id'});
102
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
102
    my $basket = GetBasket($cgiparams->{basketno});
103
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
103
        # prepare empty item form
104
        # prepare empty item form
104
        my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
105
        my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
105
106
Lines 238-244 if ($op eq ""){ Link Here
238
        # 4th, add items if applicable
239
        # 4th, add items if applicable
239
        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
240
        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
240
        # this is not optimised, but it's working !
241
        # this is not optimised, but it's working !
241
        if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
242
        my $basket = GetBasket($cgiparams->{basketno});
243
        if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
242
            my @tags         = $input->multi_param('tag');
244
            my @tags         = $input->multi_param('tag');
243
            my @subfields    = $input->multi_param('subfield');
245
            my @subfields    = $input->multi_param('subfield');
244
            my @field_values = $input->multi_param('field_value');
246
            my @field_values = $input->multi_param('field_value');
(-)a/acqui/basketheader.pl (+1 lines)
Lines 123-128 if ( $op eq 'add_form' ) { Link Here
123
                    booksellers => \@booksellers,
123
                    booksellers => \@booksellers,
124
                    deliveryplace => $basket->{deliveryplace},
124
                    deliveryplace => $basket->{deliveryplace},
125
                    billingplace => $basket->{billingplace},
125
                    billingplace => $basket->{billingplace},
126
                    is_standing => $basket->{is_standing},
126
    );
127
    );
127
128
128
    my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};
129
    my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};
(-)a/installer/data/mysql/atomicupdate/bug_15531-add_is_standing_to_aqbasket.sql (-1 / +1 lines)
Line 1 Link Here
1
ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0;
1
ALTER TABLE aqbasket ADD COLUMN is_standing TINYINT(1) NOT NULL DEFAULT 0 AFTER branch;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +1 lines)
Lines 317-323 Link Here
317
                [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>[% END %]
317
                [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>[% END %]
318
                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
318
                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
319
                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
319
                [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
320
                <li><span class="label">Is standing order basket:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
320
                <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
321
321
322
322
323
                </ol>
323
                </ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-2 / +5 lines)
Lines 115-121 Link Here
115
                [% END %]
115
                [% END %]
116
                <li>
116
                <li>
117
                    <label for="is_standing">Orders are standing:</label>
117
                    <label for="is_standing">Orders are standing:</label>
118
                    <input type="checkbox" id="is_standing" name="is_standing"/>
118
                    [% IF is_standing %]
119
                        <input type="checkbox" id="is_standing" name="is_standing" checked="checked" />
120
                    [% ELSE %]
121
                        <input type="checkbox" id="is_standing" name="is_standing"/>
122
                    [% END %]
119
                    <div class="hint">Standing orders do not close when received.</div>
123
                    <div class="hint">Standing orders do not close when received.</div>
120
                </li>
124
                </li>
121
            </ol>
125
            </ol>
122
- 

Return to bug 15531