Attachment #118900 for bug #27998

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




                        <th>ISSN</th>
                        <th>Issue number</th>
                        <th>Status</th>
                        <th>Since</th>
                        <th>Claims count</th>
                        <th>Claim date</th>
                        [% FOR field IN additional_fields_for_subscription %]
                          <th>[% field.name | html %]</th>
                        [% END %]

                            [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
                        </td>
                        <td class="planneddate" data-order="[% missingissue.planneddateISO | html %]">
                            [% missingissue.planneddate | html %]
                                <span title="[% missingissue.planneddateISO | html %]">[% missingissue.planneddate | html %]</span>
                            [% ELSE %]
                                <span title="0000-00-00"></span>
                            [% END %]
                        </td>
                        <td>[% missingissue.claims_count | html %]</td>
                        <td data-order="[% missingissue.claimdateISO | html %]">
                            [% missingissue.claimdate | html %]
                                <span title="[% missingissue.claimdateISO | html %]">[% missingissue.claimdate | html %]</span>
                            [% ELSE %]
                                <span title="0000-00-00"></span>
                            [% END %]
                        </td>
                        [% FOR field IN additional_fields_for_subscription %]
                          [% IF field.authorised_value_category %]




[% IF ( subscriptions.size > 1 ) %]
                <th># Subs</th>
[% END %]
                <th>Date published
                </th>
                <th>Date published (text)
                </th>
                <th>Date received
                </th>
                <th>Number
                </th>

[% IF ( subscriptions.size > 1 ) %]
                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | uri %]">[% serial.subscriptionid | html %]</a></td>
[% END %]
                <td data-order="[% serial.publisheddate | html %]">
                    [% IF serial.publisheddate %]
                      [% IF serial.publisheddate %]
                        [% serial.publisheddate | $KohaDates %]
                    [% ELSE %]
                        Unknown
                    [% END %]
                    </span>
                </td>
                <td data-order="[% serial.publisheddatetext | html %]">
                    [% IF serial.publisheddatetext %]
                      <span title="[% serial.publisheddatetext | html %]">
                        [% serial.publisheddatetext | html %]
                    [% END %]
                   [% END %]
                </td>
                <td data-order="[% serial.planneddate | html %]">
                    [% IF serial.planneddate %]
                      [% IF serial.planneddate %]
                        [% serial.planneddate | $KohaDates %]
                    [% ELSE %]
                        Unknown
                    [% END %]
                    </span>
                </td>
                <td>
                    [% IF ( matches = serial.serialseq.match('(.*)Spring(.*)') ) %]




            <th>Location</th>
            <th>Call number</th>
            [% UNLESS closed %]
                <th>Expiration date</th>
            [% END %]
            [% FOR field IN additional_fields_for_subscription %]
              <th>[% field.name | html %]</th>

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





                                        <th>Invoice</th>
                                        <th>Basket</th>
                                        <th>Order number</th>
                                        <th>Creation date</th>
                                        <th>Receive date</th>
                                        <th>Status</th>
                                        <th>Internal note</th>
                                        <th>Vendor note</th>
                                        <th>Fund</th>

                                                </td>
                                                <td></td> [%# basket %]
                                                <td>[% order.ordernumber | html %]</td>
                                                <td data-order="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</td>
                                                <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</td>
                                                <td>
                                                    [% SWITCH order.orderstatus %]
                                                        [% CASE 'new' %]<td data-order="status_1">New
                                                        [% CASE 'ordered' %]<td data-order="status_2">Ordered
                                                        [% CASE 'partial' %]<td data-order="status_3">Partial
                                                        [% CASE 'complete' %]<td data-order="status_4">Complete
                                                        [% CASE 'cancelled' %]<td data-order="status_5">Cancelled
                                                    [% END %]
                                                </td>
                                                <td>[% order.order_internalnote | html %]</td>
- 

Return to bug 27998

Lines 91-99 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-14 / +6 lines)
91	<th>ISSN</th>	91	<th>ISSN</th>
92	<th>Issue number</th>	92	<th>Issue number</th>
93	<th>Status</th>	93	<th>Status</th>
94	<th class="title-string">Since</th>	94	<th>Since</th>
95	<th>Claims count</th>	95	<th>Claims count</th>
96	<th class="title-string">Claim date</th>	96	<th>Claim date</th>
97	[% FOR field IN additional_fields_for_subscription %]	97	[% FOR field IN additional_fields_for_subscription %]
98	<th>[% field.name \| html %]</th>	98	<th>[% field.name \| html %]</th>
99	[% END %]	99	[% END %]
Lines 142-161 Link Here
142	[% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]	142	[% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
143	[% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]	143	[% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
144	</td>	144	</td>
145	<td class="planneddate">	145	<td class="planneddate" data-order="[% missingissue.planneddateISO \| html %]">
146	[% IF ( missingissue.planneddate ) %]	146	[% missingissue.planneddate \| html %]
147	<span title="[% missingissue.planneddateISO \| html %]">[% missingissue.planneddate \| html %]</span>
148	[% ELSE %]
149	<span title="0000-00-00"></span>
150	[% END %]
151	</td>	147	</td>
152	<td>[% missingissue.claims_count \| html %]</td>	148	<td>[% missingissue.claims_count \| html %]</td>
153	<td>	149	<td data-order="[% missingissue.claimdateISO \| html %]">
154	[% IF ( missingissue.claimdate ) %]	150	[% missingissue.claimdate \| html %]
155	<span title="[% missingissue.claimdateISO \| html %]">[% missingissue.claimdate \| html %]</span>
156	[% ELSE %]
157	<span title="0000-00-00"></span>
158	[% END %]
159	</td>	151	</td>
160	[% FOR field IN additional_fields_for_subscription %]	152	[% FOR field IN additional_fields_for_subscription %]
161	[% IF field.authorised_value_category %]	153	[% IF field.authorised_value_category %]

Lines 164-174 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-20 / +14 lines)
164	[% IF ( subscriptions.size > 1 ) %]	164	[% IF ( subscriptions.size > 1 ) %]
165	<th># Subs</th>	165	<th># Subs</th>
166	[% END %]	166	[% END %]
167	<th class="title-string">Date published	167	<th>Date published
168	</th>	168	</th>
169	<th class="title-string">Date published (text)	169	<th>Date published (text)
170	</th>	170	</th>
171	<th class="title-string">Date received	171	<th>Date received
172	</th>	172	</th>
173	<th>Number	173	<th>Number
174	</th>	174	</th>
Lines 212-241 Link Here
212	[% IF ( subscriptions.size > 1 ) %]	212	[% IF ( subscriptions.size > 1 ) %]
213	<td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid \| uri %]">[% serial.subscriptionid \| html %]</a></td>	213	<td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid \| uri %]">[% serial.subscriptionid \| html %]</a></td>
214	[% END %]	214	[% END %]
215	<td>	215	<td data-order="[% serial.publisheddate \| html %]">
216	<span title="[% serial.publisheddate \| html %]">	216	[% IF serial.publisheddate %]
217	[% IF serial.publisheddate %]
218	[% serial.publisheddate \| $KohaDates %]	217	[% serial.publisheddate \| $KohaDates %]
219	[% ELSE %]	218	[% ELSE %]
220	Unknown	219	Unknown
221	[% END %]	220	[% END %]
222	</span>
223	</td>	221	</td>
224	<td>	222	<td data-order="[% serial.publisheddatetext \| html %]">
225	[% IF serial.publisheddatetext %]	223	[% IF serial.publisheddatetext %]
226	<span title="[% serial.publisheddatetext \| html %]">
227	[% serial.publisheddatetext \| html %]	224	[% serial.publisheddatetext \| html %]
228	</span>	225	[% END %]
229	[% END %]
230	</td>	226	</td>
231	<td>	227	<td data-order="[% serial.planneddate \| html %]">
232	<span title="[% serial.planneddate \| html %]">	228	[% IF serial.planneddate %]
233	[% IF serial.planneddate %]
234	[% serial.planneddate \| $KohaDates %]	229	[% serial.planneddate \| $KohaDates %]
235	[% ELSE %]	230	[% ELSE %]
236	Unknown	231	Unknown
237	[% END %]	232	[% END %]
238	</span>
239	</td>	233	</td>
240	<td>	234	<td>
241	[% IF ( matches = serial.serialseq.match('(.)Spring(.)') ) %]	235	[% IF ( matches = serial.serialseq.match('(.)Spring(.)') ) %]

Lines 57-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-7 / +3 lines)
57	<th>Location</th>	57	<th>Location</th>
58	<th>Call number</th>	58	<th>Call number</th>
59	[% UNLESS closed %]	59	[% UNLESS closed %]
60	<th class="title-string">Expiration date</th>	60	<th>Expiration date</th>
61	[% END %]	61	[% END %]
62	[% FOR field IN additional_fields_for_subscription %]	62	[% FOR field IN additional_fields_for_subscription %]
63	<th>[% field.name \| html %]</th>	63	<th>[% field.name \| html %]</th>
Lines 115-126 Link Here
115	[% IF ( subscription.callnumber ) %][% subscription.callnumber \| html %][% END %]	115	[% IF ( subscription.callnumber ) %][% subscription.callnumber \| html %][% END %]
116	</td>	116	</td>
117	[% UNLESS closed %]	117	[% UNLESS closed %]
118	<td>	118	<td data-order="[% subscription.enddate \| html %]">
119	[% IF ( subscription.enddate ) %]	119	[% subscription.enddate \| $KohaDates %]
120	<span title="[% subscription.enddate \| html %]">[% subscription.enddate \| $KohaDates %]</span>
121	[% ELSE %]
122	<span title="0000-00-00"></span>
123	[% END %]
124	</td>	120	</td>
125	[% END %]	121	[% END %]
126		122

Lines 389-397 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-12 / +10 lines)
389	<th>Invoice</th>	389	<th>Invoice</th>
390	<th>Basket</th>	390	<th>Basket</th>
391	<th>Order number</th>	391	<th>Order number</th>
392	<th class="title-string">Creation date</th>	392	<th>Creation date</th>
393	<th class="title-string">Receive date</th>	393	<th>Receive date</th>
394	<th class="title-string">Status</th>	394	<th>Status</th>
395	<th>Internal note</th>	395	<th>Internal note</th>
396	<th>Vendor note</th>	396	<th>Vendor note</th>
397	<th>Fund</th>	397	<th>Fund</th>
Lines 446-460 Link Here
446	</td>	446	</td>
447	<td></td> [%# basket %]	447	<td></td> [%# basket %]
448	<td>[% order.ordernumber \| html %]</td>	448	<td>[% order.ordernumber \| html %]</td>
449	<td><span title="[% order.basket.creationdate \| uri %]">[% order.basket.creationdate \| $KohaDates%]</span></td>	449	<td data-order="[% order.basket.creationdate \| uri %]">[% order.basket.creationdate \| $KohaDates%]</td>
450	<td>[% IF order.datereceived %]<span title="[% order.datereceived \| uri %]">[% order.datereceived \| $KohaDates %]</span>[% END %]</td>	450	<td data-order="[% order.datereceived \| uri %]">[% order.datereceived \| $KohaDates %]</td>
451	<td>
452	[% SWITCH order.orderstatus %]	451	[% SWITCH order.orderstatus %]
453	[% CASE 'new' %]<span title="status_1">New</span>	452	[% CASE 'new' %]<td data-order="status_1">New
454	[% CASE 'ordered' %]<span title="status_2">Ordered</span>	453	[% CASE 'ordered' %]<td data-order="status_2">Ordered
455	[% CASE 'partial' %]<span title="status_3">Partial</span>	454	[% CASE 'partial' %]<td data-order="status_3">Partial
456	[% CASE 'complete' %]<span title="status_4">Complete</span>	455	[% CASE 'complete' %]<td data-order="status_4">Complete
457	[% CASE 'cancelled' %]<span title="status_5">Cancelled</span>	456	[% CASE 'cancelled' %]<td data-order="status_5">Cancelled
458	[% END %]	457	[% END %]
459	</td>	458	</td>
460	<td>[% order.order_internalnote \| html %]</td>	459	<td>[% order.order_internalnote \| html %]</td>
461	-

Lines 16-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc (-2 / +2 lines)
16	<th>Frequency</th>	16	<th>Frequency</th>
17	<th>Numbering pattern</th>	17	<th>Numbering pattern</th>
18	<th title="Number of libraries using this pattern"># of users</th>	18	<th title="Number of libraries using this pattern"># of users</th>
19	<th class="title-string" title="Last time a library used this pattern">Last import</th>	19	<th title="Last time a library used this pattern">Last import</th>
20	<th> Comments </th>	20	<th> Comments </th>
21	[% UNLESS search_only %]	21	[% UNLESS search_only %]
22	<th class="NoSort noExport">Actions</th>	22	<th class="NoSort noExport">Actions</th>
Lines 42-48 Link Here
42	<td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription \| html %][% END %]</td>	42	<td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription \| html %][% END %]</td>
43	<td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod \| html %][% END %]</td>	43	<td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod \| html %][% END %]</td>
44	<td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers \| html %][% END %]</td>	44	<td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers \| html %][% END %]</td>
45	<td><span title="[% subscription.lastimport \| html %]">[% subscription.lastimport \| $KohaDates %]</span></td>	45	<td data-order="[% subscription.lastimport \| html %]">[% subscription.lastimport \| $KohaDates %]</td>
46	<td>	46	<td>
47	[% FOREACH comment IN subscription.comments %]	47	[% FOREACH comment IN subscription.comments %]
48	[% comment.message \| html %] ([% comment.nb \| html %])<br />	48	[% comment.message \| html %] ([% comment.nb \| html %])<br />