From 49953fcada27f41e2a37fad13b04608973eea6c5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 29 Mar 2022 16:14:35 +0000 Subject: [PATCH] Bug 30398: Reindent invoices template MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch updates the invoices template so that the indentation is consistent. To test, apply the patch and go to Acquisitions. - Locate a vendor which has multiple invoices associated with it. - View the vendor details, and click the "Invoices" link in the sidebar. - The display of invoices should look correct. The DataTable should work correctly. - Test the search filters in the sidebar to confirm that they work too. Signed-off-by: Séverine Queune Signed-off-by: Kyle M Hall Signed-off-by: Fridolin Somers --- .../prog/en/modules/acqui/invoices.tt | 662 +++++++++--------- 1 file changed, 344 insertions(+), 318 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 3809d071f7..0edb5427cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -35,335 +35,361 @@ [% INCLUDE 'blocking_errors.inc' %] -

Invoices

- [% IF ( do_search ) %] - [% IF invoices %] - [% BLOCK invoices_table %] - [% IF closed %] - [% SET tab = 'closed' %] - [% ELSE %] - [% SET tab = 'opened' %] - [% END %] - - - - - - [% IF CAN_user_acquisition_merge_invoices %] - - [% END %] - - - - - - - - - - - - - [% FOREACH invoice IN invoices %] - - [% IF CAN_user_acquisition_merge_invoices %] - - [% END %] - - - - - - - - - - - [% END %] - -
  Invoice numberVendorShipment dateBilling dateReceived bibliographic recordsReceived itemsStatus 
[% invoice.is_linked_to_subscriptions | html %][% invoice.invoicenumber | html %][% invoice.suppliername | html %] - [% invoice.shipmentdate | $KohaDates %] - - [% invoice.billingdate | $KohaDates %] - [% invoice.receivedbiblios | html %][% invoice.receiveditems | html %] - [% IF invoice.closedate %] - Closed on [% invoice.closedate | $KohaDates %] - [% ELSE %] - Open - [% END %] - +

Invoices

+ [% IF ( do_search ) %] + [% IF invoices %] + [% BLOCK invoices_table %] + [% IF closed %] + [% SET tab = 'closed' %] + [% ELSE %] + [% SET tab = 'opened' %] + [% END %] + + + + + + [% IF CAN_user_acquisition_merge_invoices %] + + [% END %] + + + + + + + + + + + + + [% FOREACH invoice IN invoices %] + + [% IF CAN_user_acquisition_merge_invoices %] + + [% END %] + + + + + + + + + + + [% END %] + +
  Invoice numberVendorShipment dateBilling dateReceived bibliographic recordsReceived itemsStatus 
[% invoice.is_linked_to_subscriptions | html %][% invoice.invoicenumber | html %][% invoice.suppliername | html %] + [% invoice.shipmentdate | $KohaDates %] + + [% invoice.billingdate | $KohaDates %] + [% invoice.receivedbiblios | html %][% invoice.receiveditems | html %] + [% IF invoice.closedate %] + Closed on [% invoice.closedate | $KohaDates %] + [% ELSE %] + Open + [% END %] + + +
+ + Actions + + +
+
-
- - Actions - - -
-
- [% IF CAN_user_acquisition_merge_invoices %] - [% IF tab == 'closed' %] - Merge selected invoices - Reopen selected invoices - [% ELSE %] - Merge selected invoices - Close selected invoices - [% END %] - [% END %] - [% END %] -
- -
- [% IF openedinvoices %] - [% INCLUDE invoices_table invoices = openedinvoices %] - [% ELSE %] -
-

Your search returned no open invoices.

-
- [% END %] -
-
- [% IF closedinvoices %] - [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %] - [% ELSE %] -
-

Your search returned no closed invoices.

-
- [% END %] -
-
+ + -
-
-
-
    -

  1. Merge invoices

    2. -
  2. - - - -
    Invoice numberShipment dateBilling dateShipment cost
    3. -
  3. - - Required -
    4. -
  4. - - -
    [% INCLUDE 'date-format.inc' %]
    -
    5. +
    + +
    +
      +

    1. Merge invoices

      2. +
    2. + + + + + + + + + + + +
      Invoice numberShipment dateBilling dateShipment cost
      +
      3. -
    3. - - -
      [% INCLUDE 'date-format.inc' %]
      -
      4. +
    4. + + + Required +
      5. -
    5. -
      6. -
    6. -
      7. +
    7. + + +
      [% INCLUDE 'date-format.inc' %]
      +
      8. -
    8. Status:
      9. -
      10. -
    - - -
    - -
    - [% ELSE %] -

    Sorry, but there are no results for your search.

    -

    Search was: -

      - [% IF ( invoicenumber ) %] -
    • Invoice number: [% invoicenumber | html %]
      • - [% END %] - [% IF booksellerid %] -
    • Vendor: [% suppliername | html %]
      • - [% END %] - [% IF shipmentdatefrom %] -
    • Shipment date: - [% IF shipmentdateto %] - From [% shipmentdatefrom | $KohaDates %] - To [% shipmentdateto | $KohaDates %] - [% ELSE %] - All since [% shipmentdatefrom | $KohaDates %] - [% END %] -
      • - [% ELSE %] - [% IF shipmentdateto %] -
    • Shipment date: - All until [% shipmentdateto | $KohaDates %] -
      • - [% END %] - [% END %] - [% IF billingdatefrom %] -
    • Billing date: - [% IF billingdateto %] - From [% billingdatefrom | $KohaDates %] - To [% billingdateto | $KohaDates %] - [% ELSE %] - All since [% billingdatefrom | $KohaDates %] - [% END %] -
      • - [% ELSE %] - [% IF billingdateto %] -
    • Billing date: - All until [% billingdateto | $KohaDates %] -
      • - [% END %] - [% END %] - [% IF ( isbneanissn ) %] -
    • ISBN/EAN/ISSN: [% isbneanissn | html %]
      • - [% END %] - [% IF ( title ) %] -
    • Title: [% title | html %]
      • - [% END %] - [% IF ( author ) %] -
    • Author: [% author | html %]
      • - [% END %] - [% IF ( publisher ) %] -
    • Publisher: [% publisher | html %]
      • - [% END %] - [% IF ( publicationyear ) %] -
    • Publication year: [% publicationyear | html %]
      • - [% END %] - [% IF ( branch ) %] -
    • Library: [% Branches.GetName( branch ) | html %]
      • - [% END %] -
    -

    - [% END %] - [% ELSE %] -

    Use the search form on the left to find invoices.

    - [% END %] - -
+
  • + + +
    [% INCLUDE 'date-format.inc' %]
    +
    • -
    -
    + [% ELSE %] +

    Sorry, but there are no results for your search.

    +

    Search was: +

      + [% IF ( invoicenumber ) %] +
    • Invoice number: [% invoicenumber | html %]
      • + [% END %] + [% IF booksellerid %] +
    • Vendor: [% suppliername | html %]
      • + [% END %] + [% IF shipmentdatefrom %] +
    • + Shipment date: + [% IF shipmentdateto %] + From [% shipmentdatefrom | $KohaDates %] + To [% shipmentdateto | $KohaDates %] + [% ELSE %] + All since [% shipmentdatefrom | $KohaDates %] + [% END %] +
      • + [% ELSE %] + [% IF shipmentdateto %] +
    • + Shipment date: + All until [% shipmentdateto | $KohaDates %] +
      • + [% END %] + [% END %] + [% IF billingdatefrom %] +
    • + Billing date: + [% IF billingdateto %] + From [% billingdatefrom | $KohaDates %] + To [% billingdateto | $KohaDates %] + [% ELSE %] + All since [% billingdatefrom | $KohaDates %] + [% END %] +
      • + [% ELSE %] + [% IF billingdateto %] +
    • + Billing date: + All until [% billingdateto | $KohaDates %] +
      • + [% END %] + [% END %] + [% IF ( isbneanissn ) %] +
    • ISBN/EAN/ISSN: [% isbneanissn | html %]
      • + [% END %] + [% IF ( title ) %] +
    • Title: [% title | html %]
      • + [% END %] + [% IF ( author ) %] +
    • Author: [% author | html %]
      • + [% END %] + [% IF ( publisher ) %] +
    • Publisher: [% publisher | html %]
      • + [% END %] + [% IF ( publicationyear ) %] +
    • Publication year: [% publicationyear | html %]
      • + [% END %] + [% IF ( branch ) %] +
    • Library: [% Branches.GetName( branch ) | html %]
      • + [% END %] +
    +

    + [% END %] [% ELSE %] - - [% END %] - [% END %] - - -
  • -
    - Shipment date -
      -
    1. - - -
      [% INCLUDE 'date-format.inc' %]
      -
      2. -
    2. - - -
      [% INCLUDE 'date-format.inc' %]
      -
      3. -
    -
    -
    • -
  • -
    - Billing date -
      -
    1. - - -
      [% INCLUDE 'date-format.inc' %]
      -
      2. -
    2. - - -
      [% INCLUDE 'date-format.inc' %]
      -
      3. -
    -
    -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • - -
    - -
    - - - - [% INCLUDE 'acquisitions-menu.inc' %] - - - +

    Use the search form on the left to find invoices.

    + [% END %] + + + +
    + +
    + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] -- 2.39.5