@@ -, +, @@ - Tools -> Access files - Tools -> HTML customizations - Additional contents, news or pages-- all use the same template. - Check the list of existing entries. - Tools -> Batch extend due dates - Choose a set of criteria that will return results and click "Continue". - Check the list of checkouts to be updated. - Tools -> Batch patron modification - Submit a batch of patrons for modification. - Check the list of patrons to be modified. - Tools -> Upload patron images - Upload one or more patron images - Check the view of results - Tools -> Upload - Upload a file and view the results, or perform a search and check the view of results. - Tools -> Patron card creator -> New patron card batch. - Submit a set of patrons and check the display of patrons in the resulting batch. - Tools -> Cash summary for and Tools -> Transaction history for - Confirm that the table of data looks correct --- .../prog/en/modules/patroncards/edit-batch.tt | 74 +++--- .../prog/en/modules/pos/register.tt | 156 ++++++------ .../prog/en/modules/pos/registers.tt | 138 +++++------ .../prog/en/modules/tools/access_files.tt | 38 +-- .../en/modules/tools/additional-contents.tt | 222 +++++++++--------- .../modules/tools/batch_extend_due_dates.tt | 66 +++--- .../prog/en/modules/tools/modborrowers.tt | 32 +-- .../prog/en/modules/tools/picture-upload.tt | 29 ++- .../prog/en/modules/tools/upload.tt | 92 ++++---- 9 files changed, 435 insertions(+), 412 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -90,46 +90,48 @@ [% IF ( table_loop ) %]

Patrons in batch number [% batch_id | html %]

- - [% FOREACH table_loo IN table_loop %] - [% IF ( table_loo.header_fields ) %] - +
+
+ [% FOREACH table_loo IN table_loop %] + [% IF ( table_loo.header_fields ) %] + + + [% FOREACH header_field IN table_loo.header_fields %] + [% SWITCH header_field.field_label -%] + [% CASE "Summary" -%] + + [% CASE "Borrower Number" %] + + [% CASE "Actions " %] + + [% CASE "Select" -%] + + [% CASE %] + + [% END -%] + [% END %] + + + + [% ELSE %] - [% FOREACH header_field IN table_loo.header_fields %] - [% SWITCH header_field.field_label -%] - [% CASE "Summary" -%] - - [% CASE "Borrower Number" %] - - [% CASE "Actions " %] - - [% CASE "Select" -%] - - [% CASE %] - - [% END -%] + [% FOREACH text_field IN table_loo.text_fields %] + [% IF ( text_field.select_field ) %] + + + [% ELSE %] + + [% END %] [% END %] - - - [% ELSE %] - - [% FOREACH text_field IN table_loo.text_fields %] - [% IF ( text_field.select_field ) %] - - - [% ELSE %] - - [% END %] - [% END %] - + [% END %] [% END %] - [% END %] - -
Patron nameBorrower numberActionsSelect[% header_field.field_label | html %]
Patron nameBorrower numberActionsSelect[% header_field.field_label | html %] + Delete + Export + [% text_field.field_value | html %]
- Delete - Export - [% text_field.field_value | html %]
+ + +
[% ELSE %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -89,85 +89,89 @@ [% ELSE %]

Transactions to date

[% END %] - - - - - - - - - - - - [% FOREACH accountline IN accountlines %] - [% IF accountline.is_credit %] - [% IF accountline.credit_offsets.count == 1 %] - - - - - - - - - +
+
IDDATATransactionDescriptionPriceTotalActions
{}[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])[% accountline.amount * -1 | $Price %]
+ + + + + + + + + + + + + [% FOREACH accountline IN accountlines %] + [% IF accountline.is_credit %] + [% IF accountline.credit_offsets.count == 1 %] + + + + + + + + + + [% ELSE %] + [% FOREACH credit IN accountline.credit_offsets %] + [% IF credit.debit %] + + + + + + + + + + [% END %] + [% END %] + [% END %] [% ELSE %] - [% FOREACH credit IN accountline.credit_offsets %] - [% IF credit.debit %] - - - - - - - - - - [% END %] - [% END %] - [% END %] - [% ELSE %] - [% FOREACH debit IN accountline.debit_offsets %] - [% IF debit.credit %] - - - - - - - - - - [% END %] + [% FOREACH debit IN accountline.debit_offsets %] + [% IF debit.credit %] + + + + + + + + + + [% END %] + [% END %] [% END %] [% END %] - [% END %] - - - - - - - - -
IDDATATransactionDescriptionPriceTotalActions
{}[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])[% accountline.amount * -1 | $Price %]
[% accountline.accountlines_id | html %]{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } + [%- PROCESS account_type_description account=credit.debit -%] + [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%] + [%- IF ( credit.debit.itemnumber ) -%] ([% credit.debit.item.biblio.title | html %])[%- END -%] + [% credit.debit.amount | $Price %] + [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %] + + [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %] + + [% END %] +
[% accountline.accountlines_id | html %]{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } - [%- PROCESS account_type_description account=credit.debit -%] - [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%] - [%- IF ( credit.debit.itemnumber ) -%] ([% credit.debit.item.biblio.title | html %])[%- END -%] - [% credit.debit.amount | $Price %] - [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %] - - [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %] - - [% END %] -
[% accountline.accountlines_id | html %]{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } - [%- PROCESS account_type_description account=debit.credit -%] - [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%] - [%- IF ( debit.credit.itemnumber ) -%] ([% debit.credit.item.biblio.title | html %])[%- END -%] - [% debit.credit.amount | $Price %] - [%- IF debit.credit.credit_type_code == 'REFUND' -%] Details[%- END -%] -
[% accountline.accountlines_id | html %]{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } + [%- PROCESS account_type_description account=debit.credit -%] + [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%] + [%- IF ( debit.credit.itemnumber ) -%] ([% debit.credit.item.biblio.title | html %])[%- END -%] + [% debit.credit.amount | $Price %] + [%- IF debit.credit.credit_type_code == 'REFUND' -%] Details[%- END -%] +
Total income: [% accountlines.total * -1 | $Price %]
+ + + + Total income: + [% accountlines.total * -1 | $Price %] + + + + + [% END %] [% IF register.cashups %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt @@ -71,74 +71,78 @@
  • Total bankable:
  • - - - - - - - - - - [% IF CAN_user_cash_management_cashup %] - - [% END %] - - - [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %] - [% FOREACH register IN registers %] - - - - - - - - - [% IF CAN_user_cash_management_cashup %] - - [% END %] - - [% END %] - - - - - - - - [% IF CAN_user_cash_management_cashup %] - +
    +
    Register nameRegister descriptionLast cashupFloatBankableIncome (cash)Outgoing (cash)Actions
    [% register.name | html %][% register.description | html %] - [%- IF register.last_cashup -%] - [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (Summary) - [%- ELSE -%] - No last cashup - [%- END -%] - [% register.starting_float | $Price %] - [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] - [% SET bankable = bankable + rbankable %] - [% rbankable | $Price %] - - [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %] - [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] - [% rctotal | $Price %] ([% rcctotal | $Price %]) - [% SET ctotal = ctotal + rctotal %] - [% SET cctotal = cctotal + rcctotal %] - - [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %] - [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] - [% rdtotal | $Price %] ([% rcdtotal | $Price %]) - [% SET dtotal = dtotal + rdtotal %] - [% SET cdtotal = cdtotal + rcdtotal %] - - -
    Totals:[% bankable | $Price %][% ctotal | $Price %] ([% cctotal | $Price %])[% dtotal | $Price %] ([% cdtotal | $Price %]) - -
    + + + + + + + + + + [% IF CAN_user_cash_management_cashup %] + + [% END %] + + + + [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %] + [% FOREACH register IN registers %] + + + + + + + + + [% IF CAN_user_cash_management_cashup %] + + [% END %] + [% END %] - - -
    Register nameRegister descriptionLast cashupFloatBankableIncome (cash)Outgoing (cash)Actions
    [% register.name | html %][% register.description | html %] + [%- IF register.last_cashup -%] + [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (Summary) + [%- ELSE -%] + No last cashup + [%- END -%] + [% register.starting_float | $Price %] + [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] + [% SET bankable = bankable + rbankable %] + [% rbankable | $Price %] + + [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %] + [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] + [% rctotal | $Price %] ([% rcctotal | $Price %]) + [% SET ctotal = ctotal + rctotal %] + [% SET cctotal = cctotal + rcctotal %] + + [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %] + [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %] + [% rdtotal | $Price %] ([% rcdtotal | $Price %]) + [% SET dtotal = dtotal + rdtotal %] + [% SET cdtotal = cdtotal + rcdtotal %] + + +
    + + + + Totals: + [% bankable | $Price %] + [% ctotal | $Price %] ([% cctotal | $Price %]) + [% dtotal | $Price %] ([% cdtotal | $Price %]) + [% IF CAN_user_cash_management_cashup %] + + + + [% END %] + + + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt @@ -40,24 +40,26 @@
    Error: Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.
    [% ELSE %] [% IF ( files_loop ) %] - - - - - - - - - - [% FOREACH file IN files_loop %] - - - - - - [% END %] - -
    NameSize (bytes)Date last modified
    [% file.name | html %][% file.size | html %][% file.date | $KohaDates %]
    +
    + + + + + + + + + + [% FOREACH file IN files_loop %] + + + + + + [% END %] + +
    NameSize (bytes)Date last modified
    [% file.name | html %][% file.size | html %][% file.date | $KohaDates %]
    +
    [% ELSE %]
    No files found.
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -340,124 +340,126 @@ [% IF additional_contents.count %] -
    - - - - - - - - - - - - [% IF category == 'pages' %] - - - [% ELSE %] - - [% END %] - - - - - [% FOREACH c IN additional_contents%] - [% IF ( c.is_expired ) %][% ELSE %][% END %] - - + + + [% END %] + +
     LocationLibraryNumberPublication dateExpiration dateTitleAuthorPage URLPageNewsActions
    - - - [% IF c.category == 'news' || c.category == 'pages' %] - [% IF c.location == 'staff_and_opac' %]All - [% ELSIF c.location == 'staff_only' %]Librarian interface - [% ELSIF c.location == 'opac_only' %]OPAC - [% ELSIF c.location == 'slip' %]Slip - [% ELSE %]Unknown ('[% location | html %]') - [% END %] +
    + + + + + + + + + + + + + [% IF category == 'pages' %] + + [% ELSE %] - [% c.location | html %] + [% END %] - - - - - - - - [% IF category == 'pages' %] - + + + + [% FOREACH c IN additional_contents%] + [% IF ( c.is_expired ) %][% ELSE %][% END %] + + + - [% END %] - + + + + + [% IF category == 'pages' %] + + [% END %] + - - - [% END %] - -
     LocationLibraryNumberPublication dateExpiration dateTitleAuthorPage URLPageNews - [% IF ( c.branchcode == "" ) -%] - All libraries - [% ELSE %][% c.library.branchname | html %] - [% END %] - [% c.number | html %][% c.published_on | $KohaDates %][% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](expired)[% END %][% c.title | html %][% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %] - [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %] - OPAC: - Default - OR - Current language + Actions
    + + + [% IF c.category == 'news' || c.category == 'pages' %] + [% IF c.location == 'staff_and_opac' %]All + [% ELSIF c.location == 'staff_only' %]Librarian interface + [% ELSIF c.location == 'opac_only' %]OPAC + [% ELSIF c.location == 'slip' %]Slip + [% ELSE %]Unknown ('[% location | html %]') + [% END %] + [% ELSE %] + [% c.location | html %] [% END %] - [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %] - [% IF c.location == 'staff_and_opac' %]
    [% END %] - Librarian interface: - Default - OR - Current language +
    + [% IF ( c.branchcode == "" ) -%] + All libraries + [% ELSE %][% c.library.branchname | html %] [% END %] - - [% c.number | html %][% c.published_on | $KohaDates %][% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](expired)[% END %][% c.title | html %][% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %] + [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %] + OPAC: + Default + OR + Current language + [% END %] + [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %] + [% IF c.location == 'staff_and_opac' %]
    [% END %] + Librarian interface: + Default + OR + Current language + [% END %] +
    + + -
    - Edit - -
    -
    - Delete -
    -
    - - -
    - -
    - - - -
    +
    +
    + Edit + +
    +
    + Delete +
    +
    + + +
    + +
    + + + +
    + [% ELSE %]
    There are no additional contents.
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -127,40 +127,42 @@ [% ELSIF view == 'list' %] [% IF checkouts.count %]
    - - - - - - - - - - - - - - - - [% FOR checkout IN checkouts %] +
     Due dateTitleItem typeHome libraryChecked out onChecked out fromNew due date
    + - - - - - - - - + + + + + + + + - [% END %] - -
    [% checkout.date_due | $KohaDates as_due_date => 1 %][% checkout.item.biblio.title | html %][% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %][% checkout.item.home_branch.branchname | html %][% checkout.issuedate | $KohaDates %][% Branches.GetName( checkout.branchcode ) | html %] - [% new_due_dates.shift | $KohaDates as_due_date => 1 %] -  Due dateTitleItem typeHome libraryChecked out onChecked out fromNew due date
    + + + [% FOR checkout IN checkouts %] + + + [% checkout.date_due | $KohaDates as_due_date => 1 %] + [% checkout.item.biblio.title | html %] + [% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %] + [% checkout.item.home_branch.branchname | html %] + [% checkout.issuedate | $KohaDates %] + [% Branches.GetName( checkout.branchcode ) | html %] + + [% new_due_dates.shift | $KohaDates as_due_date => 1 %] + + + [% END %] + + +
    Reminder: this action will modify all selected checkouts!
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -161,20 +161,22 @@

    Warning, the following card numbers were not found:

    [% END %] - - - [% IF ( useborrowernumbers ) -%] - - [% ELSE -%] - - [% END %] - - - [% FOREACH notfoundcardnumber IN notfoundcardnumbers %] - - [% END %] - -
    Borrowernumbers not found
    Card numbers not found
    [% notfoundcardnumber.cardnumber | html %]
    +
    + + + [% IF ( useborrowernumbers ) -%] + + [% ELSE -%] + + [% END %] + + + [% FOREACH notfoundcardnumber IN notfoundcardnumbers %] + + [% END %] + +
    Borrowernumbers not found
    Card numbers not found
    [% notfoundcardnumber.cardnumber | html %]
    +
    [% END %] [% IF ( op == 'show_results' ) %] @@ -205,7 +207,7 @@ [% END %] [% END %] [% IF borrowers %] -
    +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -63,14 +63,14 @@

    Patron image(s) successfully uploaded

    [% END %] -
      -
    • Unpacking completed
    • -
    • [% TOTAL | html %] directories scanned.
    • +
      +
        +
      • Unpacking completed
      • +
      • [% TOTAL | html %] directories scanned.
      • [% HANDLED | html %] directories processed.
      [% FOREACH COUNT IN COUNTS %] -
    @@ -102,16 +102,19 @@ [% END %]
    Results
    -
    [% END %] - -[% ELSE %] +
    +
    + +
    + [% ELSE %]

    Upload patron images

    [% IF ( ERRORS ) %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -199,52 +199,54 @@ [% END %] [% BLOCK table_results %] - - - - - - - - - [% IF !plugin %][% END %] - [% IF !plugin %][% END %] - - - - - [% FOREACH record IN uploads %] - - - - - - - [% IF !plugin %] - +
    FilenameSizeHashvalueDate addedCategoryPublicTemporaryActions
    [% record.filename | html %][% record.filesize | html %][% record.hashvalue | html %][% record.dtcreated | $KohaDates with_hours = 1 %] - [% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %] - - [% IF record.public %] - Yes - [% ELSE %] - No +
    + + + + + + + + + [% IF !plugin %][% END %] + [% IF !plugin %][% END %] + + + + + [% FOREACH record IN uploads %] + + + + + + + [% IF !plugin %] + + + [% END %] + + [% END %] - - - [% END %] - - - [% END %] - -
    FilenameSizeHashvalueDate addedCategoryPublicTemporaryActions
    [% record.filename | html %][% record.filesize | html %][% record.hashvalue | html %][% record.dtcreated | $KohaDates with_hours = 1 %] + [% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %] + + [% IF record.public %] + Yes + [% ELSE %] + No + [% END %] + [% IF record.permanent %]No[% ELSE %]Yes[% END %] + [% IF plugin %] + + [% END %] + + [% IF record.owner == owner || CAN_user_tools_upload_manage %] + + [% END %] +
    [% IF record.permanent %]No[% ELSE %]Yes[% END %] - [% IF plugin %] - - [% END %] - - [% IF record.owner == owner || CAN_user_tools_upload_manage %] - - [% END %] -
    +
    +
    [% END %]