Attachment #118467 for bug #27983

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




        <tr>
            <th class="NoSort"></th>
            <th>Order line</th>
            <th>Order date</th>
            <th>Estimated delivery date</th>
            <th>Vendor</th>
            <th class="anti-the">Information</th>
            <th>Quantity</th>

            <th>Budget</th>
            <th>Fund</th>
            <th>Claims count</th>
            <th>Claimed date</th>
            <th>Internal note</th>
            <th>Vendor note</th>
            <th>ISBN</th>

            <td>
                [% lateorder.ordernumber | $raw %]
            </td>
            <td data-order="[% lateorder.basket.closedate | html %]">
                [% lateorder.basket.closedate | $KohaDates %] ([% lateorder.basket.late_since_days | html %] days)
            </td>
            [% SET estimated_delivery_date = lateorder.get_column('estimated_delivery_date') %]
            <td data-order="[% estimated_delivery_date | html %]">
                [% estimated_delivery_date | $KohaDates  %]
                    <span title="[% estimated_delivery_date | html %]">[% estimated_delivery_date | $KohaDates  %]</span>
                [% END %]
            </td>
            <td>
                [% lateorder.basket.bookseller.name | html %]

            <td>[% lateorder.fund.budget.budget_period_description | html %]</td>
            <td>[% lateorder.fund.budget_name | html %]</td>
            <td>[% lateorder.claims.count | html %]</td>
            <td data-order="[% lateorder.claims.last.claimed_on | html %]">
                [% FOR claim IN lateorder.claims %]
                    [% claim.claimed_on | $KohaDates %]
                    [% UNLESS loop.last %]<br/>[% END %]
                [% END %]
            </td>




                                <th>Vendor</th>
                                <th>Library</th>
                                <th>Call number</th>
                                <th>Expiration date</th>
                                <th class="NoSort"></th>
                            </tr>
                        </thead>

                                <td>
                                    [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
                                </td>
                                <td data-order="[% sub.enddate | html %]">
                                    [% sub.enddate | $KohaDates %]
                                        <span title="[% sub.enddate | html %]">[% sub.enddate | $KohaDates %]</span>
                                    [% ELSE %]
                                        <span title="0000-00-00"></span>
                                    [% END %]
                                </td>
                                <td class="actions">
                                    [% IF (sub.alreadyOnOrder) %]

            $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
                "aoColumnDefs": [
                    { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
                ],
                "sPaginationType": "full"
            }));

Lines 33-39 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-3 / +3 lines)
33	<th> Item types </th>	33	<th> Item types </th>
34	<th> Left on order </th>	34	<th> Left on order </th>
35	<th> Estimated cost per unit </th>	35	<th> Estimated cost per unit </th>
36	<th class="title-string"> Date ordered </th>	36	<th> Date ordered </th>
37	<th> Subtotal </th>	37	<th> Subtotal </th>
38	</tr>	38	</tr>
39	</thead>	39	</thead>
Lines 67-74 Link Here
67	<td class="data cell">	67	<td class="data cell">
68	[% order.ecost_tax_included \| $Price %]	68	[% order.ecost_tax_included \| $Price %]
69	</td>	69	</td>
70	<td class="cell">	70	<td class="cell" data-order="[% order.entrydate \| html %]">
71	<span title="[% order.entrydate \| html %]">[% order.entrydate \| $KohaDates %]</span>	71	[% order.entrydate \| $KohaDates %]
72	</td>	72	</td>
73	<td class="data cell">	73	<td class="data cell">
74	[% order.subtotal \| $Price %]	74	[% order.subtotal \| $Price %]




    <thead>
        <tr>
            <th>Line</th>
            <th>Date received</th>
            <th>Invoice number</th>
            <th>Item count</th>
            <th>Biblio count</th>

            <td>
                [% searchresult.number | html %]
            </td>
            <td data-order="[% searchresult.datereceived | html %]">
                [% searchresult.datereceived | $KohaDates %]
            </td>
            <td>
                [% IF ( searchresult.code ) %]

    <script>
        $(document).ready(function() {
            var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
                'bPaginate': false
                  { "sType": "title-string", "aTargets" : [ "title-string" ] }
                ],
                'bPaginate': false,
            }));

            //keep a copy of all budgets before removing the inactives




           <th>Item types</th>
           <th>Received</th>
           <th>Unit price</th>
           <th>Date ordered</th>
           <th>Date received</th>
           <th>Subtotal</th>
        </tr>
    </thead>

            <td class="cell">
                [% order.unitprice_tax_included | $Price %]
            </td>
            <td class="cell" data-order="[% order.entrydate | html %]">
                [% order.entrydate | $KohaDates %]
            </td>
            <td class="cell" data-order="[% order.datereceived | html %]">
                [% order.datereceived | $KohaDates %]
            </td>
            <td class="data cell">
                [% order.rowtotal | $Price %]




                    <tr>
                        <th scope="col">Name</th>
                        <th scope="col">Description</th>
                        <th scope="col">Start date</th>
                        <th scope="col">End date</th>
                        [% IF CAN_user_acquisition_contracts_manage %]
                            <th scope="col" class="NoSort noExport">Actions</th>
                        [% END %]

                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | uri %]&amp;booksellerid=[% contract.booksellerid | uri %]">[% contract.contractname | html %]</a>
                        </td>
                        <td>[% contract.contractdescription | html %]</td>
                        <td data-order="[% contract.contractstartdate | html %]">[% contract.contractstartdate | $KohaDates %]</td>
                        <td data-order="[% contract.contractenddate | html %]">[% contract.contractenddate | $KohaDates %]</td>
                        [% IF CAN_user_acquisition_contracts_manage %]
                            <td class="actions">
                                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-pencil"></i> Edit</a>
- 

Return to bug 27983

Lines 355-362 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-5 / +4 lines)
355	<tr>	355	<tr>
356	<th scope="col">Name</th>	356	<th scope="col">Name</th>
357	<th scope="col">Description</th>	357	<th scope="col">Description</th>
358	<th scope="col" class="title-string">Start date</th>	358	<th scope="col">Start date</th>
359	<th scope="col" class="title-string">End date</th>	359	<th scope="col">End date</th>
360	[% IF CAN_user_acquisition_contracts_manage %]	360	[% IF CAN_user_acquisition_contracts_manage %]
361	<th scope="col" class="NoSort noExport">Actions</th>	361	<th scope="col" class="NoSort noExport">Actions</th>
362	[% END %]	362	[% END %]
Lines 369-376 Link Here
369	<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber \| uri %]&booksellerid=[% contract.booksellerid \| uri %]">[% contract.contractname \| html %]</a>	369	<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber \| uri %]&booksellerid=[% contract.booksellerid \| uri %]">[% contract.contractname \| html %]</a>
370	</td>	370	</td>
371	<td>[% contract.contractdescription \| html %]</td>	371	<td>[% contract.contractdescription \| html %]</td>
372	<td><span title="[% contract.contractstartdate \| html %]">[% contract.contractstartdate \| $KohaDates %]</span></td>	372	<td data-order="[% contract.contractstartdate \| html %]">[% contract.contractstartdate \| $KohaDates %]</td>
373	<td><span title="[% contract.contractenddate \| html %]">[% contract.contractenddate \| $KohaDates %]</span></td>	373	<td data-order="[% contract.contractenddate \| html %]">[% contract.contractenddate \| $KohaDates %]</td>
374	[% IF CAN_user_acquisition_contracts_manage %]	374	[% IF CAN_user_acquisition_contracts_manage %]
375	<td class="actions">	375	<td class="actions">
376	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber \| html %]&booksellerid=[% contract.booksellerid \| html %]"><i class="fa fa-pencil"></i> Edit</a>	376	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber \| html %]&booksellerid=[% contract.booksellerid \| html %]"><i class="fa fa-pencil"></i> Edit</a>
377	-

Lines 37-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-9 / +4 lines)
37	<th>Vendor</th>	37	<th>Vendor</th>
38	<th>Library</th>	38	<th>Library</th>
39	<th>Call number</th>	39	<th>Call number</th>
40	<th class="title-string">Expiration date</th>	40	<th>Expiration date</th>
41	<th class="NoSort"></th>	41	<th class="NoSort"></th>
42	</tr>	42	</tr>
43	</thead>	43	</thead>
Lines 61-72 Link Here
61	<td>	61	<td>
62	[% IF (sub.callnumber) %][% sub.callnumber \| html %][% END %]	62	[% IF (sub.callnumber) %][% sub.callnumber \| html %][% END %]
63	</td>	63	</td>
64	<td>	64	<td data-order="[% sub.enddate \| html %]">
65	[% IF (sub.enddate) %]	65	[% sub.enddate \| $KohaDates %]
66	<span title="[% sub.enddate \| html %]">[% sub.enddate \| $KohaDates %]</span>
67	[% ELSE %]
68	<span title="0000-00-00"></span>
69	[% END %]
70	</td>	66	</td>
71	<td class="actions">	67	<td class="actions">
72	[% IF (sub.alreadyOnOrder) %]	68	[% IF (sub.alreadyOnOrder) %]
Lines 118-125 Link Here
118	$("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {	114	$("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
119	"aoColumnDefs": [	115	"aoColumnDefs": [
120	{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },	116	{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
121	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },	117	{ "sType": "anti-the", "aTargets" : [ "anti-the" ] }
122	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
123	],	118	],
124	"sPaginationType": "full"	119	"sPaginationType": "full"
125	}));	120	}));

Lines 66-72 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-7 / +4 lines)
66	<thead>	66	<thead>
67	<tr>	67	<tr>
68	<th>Line</th>	68	<th>Line</th>
69	<th class="title-string">Date received</th>	69	<th>Date received</th>
70	<th>Invoice number</th>	70	<th>Invoice number</th>
71	<th>Item count</th>	71	<th>Item count</th>
72	<th>Biblio count</th>	72	<th>Biblio count</th>
Lines 80-87 Link Here
80	<td>	80	<td>
81	[% searchresult.number \| html %]	81	[% searchresult.number \| html %]
82	</td>	82	</td>
83	<td>	83	<td data-order="[% searchresult.datereceived \| html %]">
84	<span title="[% searchresult.datereceived \| html %]">[% searchresult.datereceived \| $KohaDates %]</span>	84	[% searchresult.datereceived \| $KohaDates %]
85	</td>	85	</td>
86	<td>	86	<td>
87	[% IF ( searchresult.code ) %]	87	[% IF ( searchresult.code ) %]
Lines 216-225 Link Here
216	<script>	216	<script>
217	$(document).ready(function() {	217	$(document).ready(function() {
218	var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {	218	var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
219	"aoColumnDefs": [	219	'bPaginate': false
220	{ "sType": "title-string", "aTargets" : [ "title-string" ] }
221	],
222	'bPaginate': false,
223	}));	220	}));
224		221
225	//keep a copy of all budgets before removing the inactives	222	//keep a copy of all budgets before removing the inactives

Lines 34-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-6 / +6 lines)
34	<th>Item types</th>	34	<th>Item types</th>
35	<th>Received</th>	35	<th>Received</th>
36	<th>Unit price</th>	36	<th>Unit price</th>
37	<th class="title-string">Date ordered</th>	37	<th>Date ordered</th>
38	<th class="title-string">Date received</th>	38	<th>Date received</th>
39	<th>Subtotal</th>	39	<th>Subtotal</th>
40	</tr>	40	</tr>
41	</thead>	41	</thead>
Lines 68-78 Link Here
68	<td class="cell">	68	<td class="cell">
69	[% order.unitprice_tax_included \| $Price %]	69	[% order.unitprice_tax_included \| $Price %]
70	</td>	70	</td>
71	<td class="cell">	71	<td class="cell" data-order="[% order.entrydate \| html %]">
72	<span title="[% order.entrydate \| html %]">[% order.entrydate \| $KohaDates %]</span>	72	[% order.entrydate \| $KohaDates %]
73	</td>	73	</td>
74	<td class="cell">	74	<td class="cell" data-order="[% order.datereceived \| html %]">
75	<span title="[% order.datereceived \| html %]">[% order.datereceived \| $KohaDates %]</span>	75	[% order.datereceived \| $KohaDates %]
76	</td>	76	</td>
77	<td class="data cell">	77	<td class="data cell">
78	[% order.rowtotal \| $Price %]	78	[% order.rowtotal \| $Price %]