gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Bug 11122: Follow up - Fix some display issues and typos" 

This reverts commit 3b2cb8a3c3.
This commit is contained in:
Mason James 2017-07-31 00:29:18 +12:00
parent c7642e11be
commit 46d6795d7d
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -518,8 +518,7 @@
[% 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.publicationyear ) %], [% books_loo.publicationyear %][% END %]
[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
[% IF ( books_loo.suggestionid ) %]
<br/>
@ -645,8 +644,7 @@
[% 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 ( order.publicationyear ) %], [% order.publicationyear %][% END %]
[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
[% IF ( order.cancellationreason ) %]
<br />

7
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
View File

@ -161,8 +161,11 @@
[% IF ( order.isbn ) %] &ndash; [% order.isbn %][% END %]
[% IF ( order.publishercode ) %]
<br/>[% order.publishercode %]
[% IF order.publicationyear %], [% order.publicationyear %]
[% ELSIF ( order.copyrightdate ) %][% order.copyrightdate %][% END %]
[% IF order.publicationyear > 0 %]
- [% order.publicationyear %]
[% ELSIF ( order.copyrightdate > 0) %]
- [% order.copyrightdate %]
[% END %]
[% END %]
</td>
<td><p>[% order.branchcode %]</p></td>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
View File

@ -273,7 +273,7 @@
[% IF ( loop_order.publishercode ) %]
<br />Publisher: [% loop_order.publishercode %]
[%- IF ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]
[%- ELSIF ( loop_order.copyrightdate > 0) -%] [% loop_order.copyrightdate %]
[%- ELSIF ( loop_order.copyrightdate > 0) -%], [% loop_order.copyrightdate %]
[% END %]
[% END %]
[% IF ( loop_order.suggestionid ) %]
@ -425,7 +425,7 @@
[% IF ( order.publishercode ) %]
<br />Publisher: [% order.publishercode %]
[%- IF ( order.publicationyear > 0) -%], [% order.publicationyear %]
[%- ELSIF ( order.copyrightdate > 0) -%] [% order.copyrightdate %]
[%- ELSIF ( order.copyrightdate > 0) -%], [% order.copyrightdate %]
[% END %]
[% END %]
[% IF ( order.suggestionid ) %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
View File

@ -101,7 +101,7 @@
[% IF ( ordersloo.publishercode ) %]
<br />Publisher: [% ordersloo.publishercode %]
[%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]
[%- ELSIF ( ordersloo.copyrightdate > 0) -%] [% ordersloo.copyrightdate %]
[%- ELSIF ( ordersloo.copyrightdate > 0) -%], [% ordersloo.copyrightdate %]
[% END %]
[% END %]
</td>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
View File

@ -114,8 +114,8 @@ function check(form) {
[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
[% IF ( uncertainpriceorder.publishercode ) %]
<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
[%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear %]
[%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate %]
[%- IF ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %]
[%- ELSIF ( uncertanpriceorder.copyrightdate > 0) -%], [% uncertanpriceorder.copyrightdate %]
[% END %]
[% END %]
[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]