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

(-)a/acqui/neworderempty.pl (+1 lines)
Lines 539-544 $template->param( Link Here
539
    users                                            => \@order_users,
539
    users                                            => \@order_users,
540
    ( uc( C4::Context->preference("marcflavour") ) ) => 1,
540
    ( uc( C4::Context->preference("marcflavour") ) ) => 1,
541
    estimated_delivery_date                          => $data->{estimated_delivery_date},
541
    estimated_delivery_date                          => $data->{estimated_delivery_date},
542
    relink_invoiceid => ( C4::Context->preference('KeepInvoiceOnOrderRelink') and $input->param("relink") ) ? $data->{invoiceid} : undef,
542
);
543
);
543
544
544
output_html_with_http_headers $input, $cookie, $template->output;
545
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/installer/data/mysql/atomicupdate/bug_27063_-_KeepInvoiceOnOrderRelink_syspref.pl (+16 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number  => "27063",
5
    description => "Allow changing which record an order is linked to",
6
    up          => sub {
7
        my ($args) = @_;
8
        my ( $dbh, $out ) = @$args{qw(dbh out)};
9
10
        $dbh->do(
11
            q{ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('KeepInvoiceOnOrderRelink', '0', NULL, 'Keep or empty the invoice when an order is relinked in Acquisitions', 'YesNo') }
12
        );
13
14
        say $out "Added system preference 'KeepInvoiceOnOrderRelink'";
15
    },
16
};
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
Lines 363-368 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
363
('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
363
('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
364
('ItemsDeniedRenewal','','','This syspref allows to define custom rules for denying renewal of specific items.','Textarea'),
364
('ItemsDeniedRenewal','','','This syspref allows to define custom rules for denying renewal of specific items.','Textarea'),
365
('JobsNotificationMethod','STOMP','polling|STOMP','Define the preferred job worker notification method','Choice'),
365
('JobsNotificationMethod','STOMP','polling|STOMP','Define the preferred job worker notification method','Choice'),
366
('KeepInvoiceOnOrderRelink', '0', NULL, 'Keep or empty the invoice when an order is relinked in Acquisitions', 'YesNo'),
366
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
367
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
367
('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
368
('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
368
('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
369
('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (+3 lines)
Lines 357-362 Link Here
357
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst | html %]" />
357
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst | html %]" />
358
        <input type="hidden" name="suggestionid" value="[% suggestionid | html %]" />
358
        <input type="hidden" name="suggestionid" value="[% suggestionid | html %]" />
359
        <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
359
        <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
360
        [% IF relink_invoiceid %]
361
            <input type="hidden" name="invoiceid" id="invoiceid" value="[% relink_invoiceid | html %]" />
362
        [% END %]
360
363
361
        [% FOREACH c IN currencies %]
364
        [% FOREACH c IN currencies %]
362
            <input type="hidden" id="currency_rate_[% c.currency | html %]"  name="[% c.currency | html %]" value="[% c.rate | html %]" />
365
            <input type="hidden" id="currency_rate_[% c.currency | html %]"  name="[% c.currency | html %]" value="[% c.rate | html %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
Lines 92-98 Link Here
92
                                        [% END %]
92
                                        [% END %]
93
                                        [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
93
                                        [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
94
                                            [% IF ordernumber %]
94
                                            [% IF ordernumber %]
95
                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]&amp;ordernumber=[% ordernumber | uri %]" title="Order this one" class="btn btn-default btn-xs">
95
                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" title="Order this one" class="btn btn-default btn-xs">
96
                                            [% ELSE %]
96
                                            [% ELSE %]
97
                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
97
                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
98
                                            [% END %]
98
                                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +2 lines)
Lines 102-114 Link Here
102
                            <td class="actions">
102
                            <td class="actions">
103
                                [% IF ( suggestion.biblionumber ) %]
103
                                [% IF ( suggestion.biblionumber ) %]
104
                                    [% IF ordernumber %]
104
                                    [% IF ordernumber %]
105
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]&amp;ordernumber=[% ordernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
105
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
106
                                    [% ELSE %]
106
                                    [% ELSE %]
107
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
107
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
108
                                    [% END %]
108
                                    [% END %]
109
                                [% ELSE %]
109
                                [% ELSE %]
110
                                    [% IF ordernumber %]
110
                                    [% IF ordernumber %]
111
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;ordernumber=[% ordernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
111
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
112
                                    [% ELSE %]
112
                                    [% ELSE %]
113
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
113
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
114
                                    [% END %]
114
                                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
Lines 225-231 tr.selected td { Link Here
225
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData dropdown-item" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>
225
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData dropdown-item" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>
226
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData dropdown-item" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>
226
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData dropdown-item" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>
227
                        [% IF ordernumber %]
227
                        [% IF ordernumber %]
228
                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;ordernumber=[% ordernumber | uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') | html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
228
                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" class="chosen dropdown-item" title="[% tp('verb', 'Order') | html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
229
                        [% ELSE %]
229
                        [% ELSE %]
230
                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') | html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
230
                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') | html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></li>
231
                        [% END %]
231
                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (+7 lines)
Lines 145-150 Acquisitions: Link Here
145
                1: Enable
145
                1: Enable
146
                0:  Disable
146
                0:  Disable
147
            - automatic order line creation from MARC records.
147
            - automatic order line creation from MARC records.
148
        -
149
            - pref: KeepInvoiceOnOrderRelink
150
              default: no
151
              choices:
152
                1: "Keep"
153
                0: "Do not keep"
154
            - " a link to the invoice when an order is relinked."
148
    Printing:
155
    Printing:
149
        -
156
        -
150
            - Use the
157
            - Use the
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-2 / +1 lines)
Lines 594-600 Link Here
594
                                                    [% IF ( CAN_user_acquisition_order_manage ) %]
594
                                                    [% IF ( CAN_user_acquisition_order_manage ) %]
595
                                                        [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
595
                                                        [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
596
                                                            [% IF searchtoorder_ordernumber %]
596
                                                            [% IF searchtoorder_ordernumber %]
597
                                                            | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;ordernumber=[% searchtoorder_ordernumber | uri %]">Relink to order</a>
597
                                                            | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;ordernumber=[% searchtoorder_ordernumber | uri %]&amp;relink=1">Relink to order</a>
598
                                                            [% ELSE %]
598
                                                            [% ELSE %]
599
                                                            | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a>
599
                                                            | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a>
600
                                                            [% END %]
600
                                                            [% END %]
601
- 

Return to bug 27063