Attachment #155467 for bug #34618

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

Lines 152-157 modules: Link Here

(-)a/admin/columns_settings.yml (+6 lines)
152	columnname: fund	152	columnname: fund
153	-	153	-
154	columnname: estimated_delivery_date	154	columnname: estimated_delivery_date
		155	-
		156	columnname: statistic1
		157	is_hidden: 1
		158	-
		159	columnname: statistic2
		160	is_hidden: 1
155	-	161	-
156	columnname: supplier_report	162	columnname: supplier_report
157	-	163	-

Lines 476-481 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +10 lines)
476	<th>GST</th>	476	<th>GST</th>
477	<th>Fund</th>	477	<th>Fund</th>
478	<th>Estimated delivery date</th>	478	<th>Estimated delivery date</th>
		479	<th>Statistic 1</th>
		480	<th>Statistic 2</th>
479	[% IF Koha.Preference('EDIFACT') && ediaccount %]	481	[% IF Koha.Preference('EDIFACT') && ediaccount %]
480	<th>Supplier report</th>	482	<th>Supplier report</th>
481	[% END %]	483	[% END %]
Lines 506-511 Link Here
506	<th>[% foot_loo.tax_value \| $Price %]</th>	508	<th>[% foot_loo.tax_value \| $Price %]</th>
507	<th> </th>	509	<th> </th>
508	<th> </th>	510	<th> </th>
		511	<th> </th>
		512	<th> </th>
509	[% IF Koha.Preference('EDIFACT') && ediaccount %]	513	[% IF Koha.Preference('EDIFACT') && ediaccount %]
510	<th> </th>	514	<th> </th>
511	[% END %]	515	[% END %]
Lines 534-539 Link Here
534	<th>[% total_tax_value \| $Price %]</th>	538	<th>[% total_tax_value \| $Price %]</th>
535	<th> </th>	539	<th> </th>
536	<th> </th>	540	<th> </th>
		541	<th> </th>
		542	<th> </th>
537	[% IF Koha.Preference('EDIFACT') && ediaccount %]	543	[% IF Koha.Preference('EDIFACT') && ediaccount %]
538	<th> </th>	544	<th> </th>
539	[% END %]	545	[% END %]
Lines 654-659 Link Here
654	<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>	660	<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
655	[% END %]	661	[% END %]
656	</td>	662	</td>
		663	<td>[% books_loo.sort1 \| html %]</td>
		664	<td>[% books_loo.sort2 \| html %]</td>
657	[% IF Koha.Preference('EDIFACT') && ediaccount %]	665	[% IF Koha.Preference('EDIFACT') && ediaccount %]
658	<td>[% books_loo.suppliers_report \| html %]</td>	666	<td>[% books_loo.suppliers_report \| html %]</td>
659	[% END %]	667	[% END %]
Lines 1079-1090 Link Here
1079	$(document).ready(function() {	1087	$(document).ready(function() {
1080	var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) \| $raw %];	1088	var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) \| $raw %];
1081	[% IF !(Koha.Preference('EDIFACT') && ediaccount) %]	1089	[% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1082	table_settings['columns'].splice(16, 1);	1090	table_settings['columns'].splice(18, 1);
1083	[% END %]	1091	[% END %]
1084	KohaTable("orders", {	1092	KohaTable("orders", {
1085	"sPaginationType": "full",	1093	"sPaginationType": "full",
1086	"autoWidth": false,	1094	"autoWidth": false,
1087	"exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15[% IF (Koha.Preference('EDIFACT') && ediaccount) %],16[% END %]],	1095	"exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17[% IF (Koha.Preference('EDIFACT') && ediaccount) %],18[% END %]],
1088	}, table_settings);	1096	}, table_settings);
1089		1097
1090	var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {	1098	var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
1091	-

Return to bug 34618