Attachment #63540 for bug #11122

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




                                [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
                                [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
                                [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %]
                                [% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate %][% END %]
                                [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                                [% IF ( books_loo.suggestionid ) %]
                                    <br/>

                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
                        [% IF ( order.issn ) %] - [% order.issn %][% END %]
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %]
                        [% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate %][% END %]
                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                        [% IF ( order.cancellationreason ) %]
                          <br />

Lines 167-177 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-5 / +2 lines)
167	[% IF ( order.isbn ) %] – [% order.isbn %][% END %]	167	[% IF ( order.isbn ) %] – [% order.isbn %][% END %]
168	[% IF ( order.publishercode ) %]	168	[% IF ( order.publishercode ) %]
169	<br/>[% order.publishercode %]	169	<br/>[% order.publishercode %]
170	[% IF order.publicationyear > 0 %]	170	[% IF order.publicationyear %], [% order.publicationyear %]
171	- [% order.publicationyear %]	171	[% ELSIF ( order.copyrightdate ) %][% order.copyrightdate %][% END %]
172	[% ELSIF ( order.copyrightdate > 0) %]
173	- [% order.copyrightdate %]
174	[% END %]
175	[% END %]	172	[% END %]
176	</td>	173	</td>
177	<td><p>[% order.branchcode %]</p></td>	174	<td><p>[% order.branchcode %]</p></td>

Lines 106-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-1 / +1 lines)
106	[% IF ( ordersloo.publishercode ) %]	106	[% IF ( ordersloo.publishercode ) %]
107	<br />Publisher: [% ordersloo.publishercode %]	107	<br />Publisher: [% ordersloo.publishercode %]
108	[%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]	108	[%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]
109	[%- ELSIF ( ordersloo.copyrightdate > 0) -%], [% ordersloo.copyrightdate %]	109	[%- ELSIF ( ordersloo.copyrightdate > 0) -%] [% ordersloo.copyrightdate %]
110	[% END %]	110	[% END %]
111	[% END %]	111	[% END %]
112	</td>	112	</td>

Lines 112-119 var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-3 / +2 lines)
112	[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]	112	[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
113	[% IF ( uncertainpriceorder.publishercode ) %]	113	[% IF ( uncertainpriceorder.publishercode ) %]
114	<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]	114	<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
115	[%- IF ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %]	115	[%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear %]
116	[%- ELSIF ( uncertanpriceorder.copyrightdate > 0) -%], [% uncertanpriceorder.copyrightdate %]	116	[%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate %]
117	[% END %]	117	[% END %]
118	[% END %]	118	[% END %]
119	[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]	119	[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
120	-

Return to bug 11122

Lines 556-562 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +4 lines)
556	[% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]	556	[% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
557	[% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]	557	[% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
558	[% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]	558	[% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
559	[% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]	559	[% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %]
		560	[% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate %][% END %]
560	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]	561	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
561	[% IF ( books_loo.suggestionid ) %]	562	[% IF ( books_loo.suggestionid ) %]
562	<br/>	563	<br/>
Lines 682-688 Link Here
682	[% IF ( order.isbn ) %] - [% order.isbn %][% END %]	683	[% IF ( order.isbn ) %] - [% order.isbn %][% END %]
683	[% IF ( order.issn ) %] - [% order.issn %][% END %]	684	[% IF ( order.issn ) %] - [% order.issn %][% END %]
684	[% IF ( order.publishercode ) %], [% order.publishercode %][% END %]	685	[% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
685	[% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]	686	[% IF ( order.publicationyear ) %], [% order.publicationyear %]
		687	[% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate %][% END %]
686	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]	688	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
687	[% IF ( order.cancellationreason ) %]	689	[% IF ( order.cancellationreason ) %]
688	<br />	690	<br />

Lines 273-279 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +2 lines)
273	[% IF ( loop_order.publishercode ) %]	273	[% IF ( loop_order.publishercode ) %]
274	<br />Publisher: [% loop_order.publishercode %]	274	<br />Publisher: [% loop_order.publishercode %]
275	[%- IF ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]	275	[%- IF ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]
276	[%- ELSIF ( loop_order.copyrightdate > 0) -%], [% loop_order.copyrightdate %]	276	[%- ELSIF ( loop_order.copyrightdate > 0) -%] [% loop_order.copyrightdate %]
277	[% END %]	277	[% END %]
278	[% END %]	278	[% END %]
279	[% IF ( loop_order.suggestionid ) %]	279	[% IF ( loop_order.suggestionid ) %]
Lines 425-431 Link Here
425	[% IF ( order.publishercode ) %]	425	[% IF ( order.publishercode ) %]
426	<br />Publisher: [% order.publishercode %]	426	<br />Publisher: [% order.publishercode %]
427	[%- IF ( order.publicationyear > 0) -%], [% order.publicationyear %]	427	[%- IF ( order.publicationyear > 0) -%], [% order.publicationyear %]
428	[%- ELSIF ( order.copyrightdate > 0) -%], [% order.copyrightdate %]	428	[%- ELSIF ( order.copyrightdate > 0) -%] [% order.copyrightdate %]
429	[% END %]	429	[% END %]
430	[% END %]	430	[% END %]
431	[% IF ( order.suggestionid ) %]	431	[% IF ( order.suggestionid ) %]