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

(-)a/C4/Acquisition.pm (+29 lines)
Lines 265-270 sub ReopenBasket { Link Here
265
        WHERE basketno = ?
265
        WHERE basketno = ?
266
        AND orderstatus NOT IN ( 'complete', 'cancelled' )
266
        AND orderstatus NOT IN ( 'complete', 'cancelled' )
267
        }, {}, $basketno);
267
        }, {}, $basketno);
268
269
    # Log the basket reopening
270
    if (C4::Context->preference("AcqLog")) {
271
        logaction(
272
            'ACQUISITIONS',
273
            'REOPEN_BASKET',
274
            $basketno
275
        );
276
    }
268
    return;
277
    return;
269
}
278
}
270
279
Lines 633-638 sub ModBasketHeader { Link Here
633
        $sth2->execute($contractnumber,$basketno);
642
        $sth2->execute($contractnumber,$basketno);
634
    }
643
    }
635
644
645
    # Log the basket update
646
    if (C4::Context->preference("AcqLog")) {
647
        logaction(
648
            'ACQUISITIONS',
649
            'MODIFY_BASKET_HEADER',
650
            $basketno
651
        );
652
    }
653
654
    return;
636
    return;
655
    return;
637
}
656
}
638
657
Lines 813-818 sub ModBasketUsers { Link Here
813
    foreach my $basketuser_id (@basketusers_ids) {
832
    foreach my $basketuser_id (@basketusers_ids) {
814
        $sth->execute($basketno, $basketuser_id);
833
        $sth->execute($basketno, $basketuser_id);
815
    }
834
    }
835
836
    # Log the basket update
837
    if (C4::Context->preference("AcqLog")) {
838
        logaction(
839
            'ACQUISITIONS',
840
            'MODIFY_BASKET_USERS',
841
            $basketno
842
        );
843
    }
844
816
    return;
845
    return;
817
}
846
}
818
847
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +4 lines)
Lines 76-83 fieldset.rows label.viewlog { Link Here
76
[%        CASE 'STATUS_CHANGE'  %]Change ILL request status
76
[%        CASE 'STATUS_CHANGE'  %]Change ILL request status
77
[%        CASE 'ADD_BASKET' %]Create an acquisitions basket
77
[%        CASE 'ADD_BASKET' %]Create an acquisitions basket
78
[%        CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
78
[%        CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
79
[%        CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header
80
[%        CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users
79
[%        CASE 'CLOSE_BASKET' %]Close an acquisitions basket
81
[%        CASE 'CLOSE_BASKET' %]Close an acquisitions basket
80
[%        CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
82
[%        CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
83
[%        CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket
81
[%        CASE 'Run'    %]Run
84
[%        CASE 'Run'    %]Run
82
[%        CASE %][% action | html %]
85
[%        CASE %][% action | html %]
83
[%    END %]
86
[%    END %]
Lines 150-156 fieldset.rows label.viewlog { Link Here
150
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
153
                                        <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
151
                                    [% END %]
154
                                    [% END %]
152
155
153
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'CLOSE_BASKET' 'APPROVE_BASKET' ] %]
156
                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]
154
                                        [% IF actions.grep(actx).size %]
157
                                        [% IF actions.grep(actx).size %]
155
                                            <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
158
                                            <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
156
                                        [% ELSE %]
159
                                        [% ELSE %]
157
- 

Return to bug 23971