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

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 8800-8805 if ( CheckVersion($DBversion) ) { Link Here
8800
    SetVersion($DBversion);
8800
    SetVersion($DBversion);
8801
}
8801
}
8802
8802
8803
$DBversion = 'XXX';
8804
if ( CheckVersion($DBversion) ) {
8805
    $dbh->do("
8806
        INSERT INTO systempreferences (variable,value,explanation,type) VALUES ('AcqLateOrderUseCreationDate',  'closing',  'creation|closing',  'Change late order default sort.', 'Choice')");
8807
    print "Upgrade to $DBversion done (Bug 12732 - Sort late orders by basket creation or closing date)\n";
8808
    SetVersion($DBversion);
8809
}
8803
8810
8804
=head1 FUNCTIONS
8811
=head1 FUNCTIONS
8805
8812
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-1 / +5 lines)
Lines 111-117 $(document).ready(function() { Link Here
111
            [% ELSE %]
111
            [% ELSE %]
112
                <th></th>
112
                <th></th>
113
            [% END %]
113
            [% END %]
114
            <th class="title-string">Order [% lateOrderSort %] date</th>
114
            [% IF ( lateOrderSort == "creation") %]
115
                <th class="title-string">Order creation date</th>
116
            [% ELSE %]
117
                <th class="title-string">Order closing date</th>
118
            [% END %]
115
            <th class="title-string">Estimated delivery date</th>
119
            <th class="title-string">Estimated delivery date</th>
116
            <th>Vendor</th>
120
            <th>Vendor</th>
117
            <th class="anti-the">Information</th>
121
            <th class="anti-the">Information</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-4 / +4 lines)
Lines 61-71 Acquisitions: Link Here
61
            - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
61
            - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
62
            - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
62
            - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
63
        -
63
        -
64
            - Use
64
            - pref: AcqLateOrderUseCreationDate
65
            - pref: AcqLateOrderUseCreationDate
65
              choices:
66
              choices:
66
                  creation: Do
67
                  creation: creation date
67
                  closing: Don't
68
                  closing: closing date
68
            - Use the creation date of the basket to sort late order.
69
            - of the basket to sort late order.
69
70
70
    Printing:
71
    Printing:
71
        -
72
        -
72
- 

Return to bug 12732