From 7d3c4e39c3aa5c827f00869277cf96cf6c817613 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Tue, 7 Nov 2023 22:55:40 +0000 Subject: [PATCH] Bug 22188: Bad rebase conflict fix --- .../en/modules/serials/subscription-detail.tt | 213 +----------------- 1 file changed, 2 insertions(+), 211 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 3ef18927c0a..c015ca116ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -82,221 +82,12 @@

[% END %] -
-
-
-
-
    -
  1. Beginning date: [% startdate | html %] -
  2. -
  3. Frequency: - [% frequency.description | html %] -
  4. -
  5. - Manual history: - [% IF ( manualhistory ) %] - Enabled Edit history - [% ELSE %] - Disabled - [% END %] -
  6. -
  7. Number pattern: + [% IF ( numberpattern ) %] [% numberpattern.label | html %] [% ELSE %] - Uses publication date - [% dateformat %] format - [% END %] -
  8. - [% IF ( numberpattern ) %] -
  9. - - - [% IF (has_X) %] - - [% END %] - [% IF (has_Y) %] - - [% END %] - [% IF (has_Z) %] - - [% END %] - - - - [% IF (has_X) %] - - [% END %] - [% IF (has_Y) %] - + Uses publication date [% END %] - [% IF (has_Z) %] - - [% END %] - -
    Starting with:[% lastvalue1 | html %][% lastvalue2 | html %][% lastvalue3 | html %]
    Rollover:[% numberpattern.whenmorethan1 | html %][% numberpattern.whenmorethan2 | html %][% numberpattern.whenmorethan3 | html %]
  10. - [% END %] - [% IF ( irregular_issues ) %] -
  11. Irregularity: [% irregular_issues | html %] issues -
  12. - [% END %] -
  13. First arrival: [% firstacquidate | html %] -
  14. - [% IF ( numberlength ) %]
  15. Number of issues: [% numberlength | html %]
  16. [% END %] - [% IF ( weeklength ) %]
  17. Number of weeks: [% weeklength | html %]
  18. [% END %] - [% IF ( monthlength ) %]
  19. Number of months: [% monthlength | html %]
  20. [% END %] -
-
-
-
-
- -
- - - - - - - - - [% FOREACH serialslis IN serialslist %] - - - - - - - - [% END %] -
Issue numberPlanned datePublished datePublished date (text)Status
- [% serialslis.serialseq | html %] - - [% IF serialslis.planneddate %] - [% serialslis.planneddate | html %] - [% ELSE %] - Unknown - [% END %] - - [% IF serialslis.publisheddate %] - [% serialslis.publisheddate | html %] - [% ELSE %] - Unknown - [% END %] - - [% serialslis.publisheddatetext | html %] - - [% IF ( serialslis.status1 ) %]Expected[% END %] - [% IF ( serialslis.status2 ) %]Arrived[% END %] - [% IF ( serialslis.status3 ) %]Late[% END %] - [% IF ( serialslis.status4 ) %]Missing[% END %] - [% IF ( serialslis.status41 ) %]Missing (never received)[% END %] - [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %] - [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %] - [% IF ( serialslis.status44 ) %]Missing (lost)[% END %] - [% IF ( serialslis.status5 ) %]Not issued[% END %] - [% IF ( serialslis.status6 ) %]Delete[% END %] - [% IF ( serialslis.status7 ) %] - Claimed - [% IF ( serialslis.claimdate ) %] - [% serialslis.claimdate | html %] - [% END %] - [% END %] - [% IF ( serialslis.status8 ) %]Stopped[% END %] -
-
-
-
-
-
-
    -
  1. Start date: [% startdate | html %]
  2. -
  3. End date: [% enddate | html %]
  4. -
  5. History start date: [% histstartdate | html %]
  6. -
  7. History end date: [% histenddate | html %]
  8. -
  9. Received issues:[% recievedlist | html | html_line_break %]
  10. -
  11. Missing issues:[% missinglist | html | html_line_break %]
  12. -
  13. Nonpublic note:[% internalnotes | html | html_line_break %]
  14. -
  15. Public note:[% notes | html | html_line_break %]
  16. -
  17. History staff note:[% librariannote | html | html_line_break %]
  18. -
  19. History OPAC note:[% opacnote | html | html_line_break %]
  20. -
-
-
-
-
- - [% IF orders_grouped.size %] -
-

Acquisition details

- - [% WRAPPER tabs id= "subscription_description" %] [% WRAPPER tabs_nav %] -- 2.20.1
- - Hide already received orders - | Show all orders - | Expand all - | Collapse all - -