Attachment #31064 for bug #12732

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

Lines 8613-8618 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
8613	SetVersion($DBversion);	8613	SetVersion($DBversion);
8614	}	8614	}
8615		8615
		8616	$DBversion = 'XXX';
		8617	if ( CheckVersion($DBversion) ) {
		8618	$dbh->do("
		8619	INSERT INTO systempreferences (variable,value,explanation,type) VALUES ('AcqLateOrderUseCreationDate', 'closing', 'creation\|closing', 'Change late order default sort.', 'Choice')");
		8620	print "Upgrade to $DBversion done (Bug 12732 - Sort late orders by basket creation or closing date)\n";
		8621	SetVersion($DBversion);
		8622	}
		8623
8616	=head1 FUNCTIONS	8624	=head1 FUNCTIONS
8617		8625
8618	=head2 TableExists($table)	8626	=head2 TableExists($table)

Lines 111-117 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-1 / +5 lines)
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>




            - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
            - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
        -
            - Use 
            - pref: AcqLateOrderUseCreationDate
              choices:
                  creation: creation date
                  closing: closing date
            - of the basket to sort late order.

    Printing:
        -
- 

Return to bug 12732

Lines 58-68 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-4 / +4 lines)
58	- "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"	58	- "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
59	- "<br/>For example:<br/>price: 947$a\|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"	59	- "<br/>For example:<br/>price: 947$a\|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
60	-	60	-
		61	- Use
61	- pref: AcqLateOrderUseCreationDate	62	- pref: AcqLateOrderUseCreationDate
62	choices:	63	choices:
63	creation: Do	64	creation: creation date
64	closing: Don't	65	closing: closing date
65	- Use the creation date of the basket to sort late order.	66	- of the basket to sort late order.
66		67
67	Printing:	68	Printing:
68	-	69	-
69	-