Bug 42330: (follow-up) Tidy
Something very messy happened during the last rebase before push.
Sorry!
I've restored the original version:
git rebase -i HEAD~258
Edit commit b02ca1270d and remove the next one (Tidy)
perl misc/devel/tidy.pl $(git diff --name-only HEAD~1)
git commit -a
git rebase --continue
Luckily there was no conflict!
I then picked the version of those files and here is the commit.
Use this to confirm:
`git show -w ad694a3411e677fcea96f315758793fd1fe0f203`
You should see changes that are not related to tidiness
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Jonathan Druart
Pedro Amorim
parent
dfea147183
commit
08a4e352af
|
|
@ -4,6 +4,7 @@
|
|||
[% USE AuthorisedValues %]
|
||||
[% USE KohaDates %]
|
||||
[% USE Branches %]
|
||||
[% USE Price %]
|
||||
[% SET footerjs = 1 %]
|
||||
[% PROCESS 'i18n.inc' %]
|
||||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
|
|
@ -171,6 +172,7 @@
|
|||
<th>Billing date</th>
|
||||
<th>Received bibliographic records</th>
|
||||
<th>Received items</th>
|
||||
<th>Total</th>
|
||||
<th>Status</th>
|
||||
<th class="no-sort"> </th>
|
||||
</tr>
|
||||
|
|
@ -196,6 +198,13 @@
|
|||
<td data-order="[% invoice.billingdate | html %]"> [% invoice.billingdate | $KohaDates %] </td>
|
||||
<td>[% invoice.receivedbiblios | html %]</td>
|
||||
<td>[% invoice.receiveditems | html %]</td>
|
||||
<td>
|
||||
[% IF invoice.invoiceincgst %]
|
||||
[% invoice.total_tax_included + invoice.total_adj + invoice.shipmentcost | $Price %]
|
||||
[% ELSE %]
|
||||
[% invoice.total_tax_excluded + invoice.total_adj + invoice.shipmentcost | $Price %]
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
[% IF invoice.closedate %]
|
||||
<span>Closed on [% invoice.closedate | $KohaDates %]</span>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
[% USE Koha %]
|
||||
[% USE Asset %]
|
||||
[% USE KohaDates %]
|
||||
[% USE Price %]
|
||||
[% PROCESS 'i18n.inc' %]
|
||||
[% SET footerjs = 1 %]
|
||||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
|
|
@ -142,6 +143,7 @@
|
|||
<th>Item count</th>
|
||||
<th>[% tp("Bibliographic record", "Record count") | html %]</th>
|
||||
<th>Items expected</th>
|
||||
<th>Total</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -160,6 +162,7 @@
|
|||
<td> [% searchresult.reccount | html %] </td>
|
||||
<td> [% searchresult.bibcount | html %] </td>
|
||||
<td> [% searchresult.itemcount | html %] </td>
|
||||
<td> [% searchresult.totalamount | $Price %] </td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -345,237 +345,21 @@
|
|||
[% END %]
|
||||
</h1>
|
||||
<fieldset class="fg">
|
||||
<legend class="sr-only">Fund details</legend>
|
||||
<legend class="visually-hidden">Fund details</legend>
|
||||
|
||||
<!-- ********************************************************************************************** -->
|
||||
<!-- create add/mod entry form -->
|
||||
[% IF op == 'add_form' && !error_not_authorised_to_modify %]
|
||||
<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
|
||||
[% INCLUDE 'csrf-token.inc' %]
|
||||
<h1>
|
||||
[% IF ( budget_id ) %]
|
||||
[% IF ( budget_period_description ) %]
|
||||
[% tx("Modify fund '{fund_name}' for budget '{budget}'", { fund_name = budget_name, budget = budget_period_description }) | html %]
|
||||
[% ELSE %]
|
||||
[% tx("Modify fund '{fund_name}'", { fund_name = budget_name }) | html %]
|
||||
[% END %]
|
||||
[% ELSE %]
|
||||
[% IF ( budget_parent_name ) %]
|
||||
[% tx("Add fund to '{fund_parent}'", {fund_parent = budget_parent_name}) %]
|
||||
[% ELSE %]
|
||||
[% t("New fund") | html %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
</h1>
|
||||
<fieldset class="fg">
|
||||
<legend class="visually-hidden">Fund details</legend>
|
||||
|
||||
<input type="hidden" name="op" value="cud-add_validate" />
|
||||
<input type="hidden" name="checked" value="0" />
|
||||
[% IF ( budget_parent_id ) %]
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<span class="label">Fund parent: </span>
|
||||
</div>
|
||||
<div class="fg-text">
|
||||
[% budget_parent_name | html %]
|
||||
[% budget_parent_id | html %]
|
||||
- [% budget_parent_name | html %]
|
||||
<input type="hidden" name="budget_parent_id" value="[% budget_parent_id | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
[% END %]
|
||||
<div class="fg-row input-md">
|
||||
<div class="fg-label">
|
||||
<label class="required" for="budget_code">Fund code: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="text" name="budget_code" id="budget_code" class="focus" value="[% budget_code | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<label class="required" for="budget_name">Fund name: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="text" name="budget_name" id="budget_name" value="[% budget_name | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row input-sm">
|
||||
<div class="fg-label">
|
||||
<label for="budget_amount" class="required">Amount: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row input-sm">
|
||||
<div class="fg-label">
|
||||
<label for="budget_encumb">Warning at (%): </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb | html %]" />
|
||||
</div>
|
||||
<div class="hint">0 to disable</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row input-sm">
|
||||
<div class="fg-label">
|
||||
<label for="budget_expend">Warning at (amount): </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 %]" />
|
||||
</div>
|
||||
<div class="hint">0 to disable</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<span class="label">Owner: </span>
|
||||
</div>
|
||||
<div class="fg-text">
|
||||
[% IF budget_owner %]
|
||||
<span id="budget_owner_name">
|
||||
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]"> [% budget_owner.firstname | html %] [% budget_owner.surname | html %] </a> |
|
||||
</span>
|
||||
[% ELSE %]
|
||||
<span id="budget_owner_name"></span>
|
||||
[% END %]
|
||||
<a id="edit_owner" href="#patron_search_modal_owner" data-bs-toggle="modal"><i class="fa fa-search"></i> Select owner</a>
|
||||
<a id="remove_owner" href="#"><i class="fa fa-trash-can"></i> Remove owner</a>
|
||||
<input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner.borrowernumber | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
[% IF budget_has_children %]
|
||||
<div class="fg-row input-checkbox">
|
||||
<div class="fg-label">
|
||||
<label>
|
||||
<span>Update all sub funds with this owner</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<input type="checkbox" id="set_owner_to_children" name="set_owner_to_children" value="1" />
|
||||
</div>
|
||||
<div class="hint">Selecting this option will overwrite existing fund owners, if any</div>
|
||||
</div>
|
||||
[% END %]
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<span class="label">Users:</span>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<ul style="float:left;" id="budget_users">
|
||||
[% FOREACH user IN budget_users %]
|
||||
<li id="user_[% user.borrowernumber | html %]">
|
||||
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | uri %]"> [% user.firstname | html %] [% user.surname | html %] </a>
|
||||
• <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash-can"></i> Remove</a>
|
||||
</li>
|
||||
[% END %]
|
||||
<li
|
||||
><a href="#patron_search_modal_users" id="add_user_button" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add users</a></li
|
||||
>
|
||||
</ul>
|
||||
<input type="hidden" name="budget_users_ids" id="budget_users_id" value="[% budget_users_ids | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<label for="budget_branchcode">Library: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<select name="budget_branchcode" id="budget_branchcode">
|
||||
<option value=""></option>
|
||||
[% PROCESS options_for_libraries libraries => Branches.all( selected => budget_branchcode, unfiltered => 1 ) %]
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row input-md">
|
||||
<div class="fg-label">
|
||||
<label for="budget_permission">Restrict access to: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<select name="budget_permission" id="budget_permission">
|
||||
<option value="0" [% IF budget_perm_0 %]selected="selected"[% END %]> None </option>
|
||||
<option value="1" [% IF budget_perm_1 %]selected="selected"[% END %]> Owner </option>
|
||||
<option value="3" [% IF budget_perm_3 %]selected="selected"[% END %]> Owner and users </option>
|
||||
<option value="2" [% IF budget_perm_2 %]selected="selected"[% END %]> Owner, users and library </option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<label for="budget_notes">Notes: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<textarea name="budget_notes" id="budget_notes" cols="80" rows="6">[% budget_notes | html %]</textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<label for="authorised_value_category1">Statistic 1 done on: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<select name="sort1_authcat" id="authorised_value_category1">
|
||||
<option value=""></option>
|
||||
[% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => sort1_authcat ) %]
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<label for="authorised_value_category2">Statistic 2 done on: </label>
|
||||
</div>
|
||||
<div class="fg-input">
|
||||
<select name="sort2_authcat" id="authorised_value_category2">
|
||||
<option value=""></option>
|
||||
[% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => sort2_authcat ) %]
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
[% IF ( budget_id ) %]
|
||||
<input type="hidden" name="budget_id" value="[% budget_id | html %]" />
|
||||
[% END %]
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="action">
|
||||
<input type="submit" class="btn btn-primary" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
|
||||
<input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
|
||||
</fieldset>
|
||||
</form>
|
||||
[% END %]
|
||||
<!-- add_form -->
|
||||
|
||||
[% IF op == 'delete_confirm' %]
|
||||
<div class="alert alert-warning">
|
||||
<h1>[% tx("Confirm deletion of fund '{fund}'?", {fund = budget_name}) %]</h1>
|
||||
<p>If you delete this fund, all orders linked to this fund will be deleted!</p>
|
||||
<table>
|
||||
<tr>
|
||||
<th scope="row">Fund amount:</th>
|
||||
<td>[% budget_amount | $Price %]</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
|
||||
[% INCLUDE 'csrf-token.inc' %]
|
||||
<input type="hidden" name="op" value="cud-delete_confirmed" />
|
||||
<input type="hidden" name="budget_id" value="[% budget_id | html %]" />
|
||||
<input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
|
||||
<button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete this fund</button>
|
||||
</form>
|
||||
<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
|
||||
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
|
||||
</form>
|
||||
<input type="hidden" name="op" value="cud-add_validate" />
|
||||
<input type="hidden" name="checked" value="0" />
|
||||
[% IF ( budget_parent_id ) %]
|
||||
<div class="fg-row">
|
||||
<div class="fg-label">
|
||||
<span class="label">Fund parent: </span>
|
||||
</div>
|
||||
<div class="fg-text">
|
||||
[% budget_parent_name | html %]
|
||||
[% budget_parent_id | html %]
|
||||
- [% budget_parent_name | html %]
|
||||
<input type="hidden" name="budget_parent_id" value="[% budget_parent_id | html %]" />
|
||||
</div>
|
||||
</div>
|
||||
[% END %]
|
||||
<div class="fg-row input-md">
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
[% USE To %]
|
||||
[% USE Koha %]
|
||||
[% USE KohaDates %]
|
||||
[% USE HtmlScrubber %]
|
||||
[% USE Branches %]
|
||||
[% PROCESS 'member-main-address-style.inc' %]
|
||||
[% PROCESS 'member-alt-address-style.inc' %]
|
||||
|
|
@ -1379,9 +1380,9 @@
|
|||
<td>[% PROCESS restriction_type_description restriction_type=restriction.type %]</td>
|
||||
<td>
|
||||
[% IF restriction.comment.search('OVERDUES_PROCESS') %]
|
||||
Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %]
|
||||
Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | scrub_html type => 'comment' | $raw %]
|
||||
[% ELSE %]
|
||||
[% restriction.comment | $raw %]
|
||||
[% restriction.comment | scrub_html type => 'comment' | $raw %]
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -1552,7 +1553,6 @@
|
|||
[% END %]
|
||||
[% END # /UNLESS ( no_add ) %]
|
||||
[% END %]
|
||||
<!-- Expiration date modal-->
|
||||
<div id="categoryChangeModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="categoryChangeModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
|
|
@ -1562,14 +1562,30 @@
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<p>Would you like to apply the defaults for the new category?</p>
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateMessaging" />
|
||||
<label class="form-check-label" for="categoryChangeUpdateMessaging"> Reset messaging preferences to category defaults </label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateExpiry" />
|
||||
<label class="form-check-label" for="categoryChangeUpdateExpiry"> Reset expiration date to category default </label>
|
||||
</div>
|
||||
[% IF Koha.Preference('UpdateMessagingPrefsOnCategoryChange') == 'softyes' %]
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateMessaging" checked />
|
||||
<label class="form-check-label" for="categoryChangeUpdateMessaging"> Reset messaging preferences to category defaults </label>
|
||||
</div>
|
||||
[% ELSIF Koha.Preference('UpdateMessagingPrefsOnCategoryChange') == 'softno' %]
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateMessaging" />
|
||||
<label class="form-check-label" for="categoryChangeUpdateMessaging"> Reset messaging preferences to category defaults </label>
|
||||
</div>
|
||||
[% END %]
|
||||
[% IF Koha.Preference('UpdateExpiryDateOnCategoryChange') == 'softno' || Koha.Preference('UpdateExpiryDateOnCategoryChange') == 'softyes' %]
|
||||
[% IF Koha.Preference('UpdateExpiryDateOnCategoryChange') == 'softyes' %]
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateExpiry" checked />
|
||||
<label class="form-check-label" for="categoryChangeUpdateExpiry"> Reset expiration date to category default </label>
|
||||
</div>
|
||||
[% ELSIF Koha.Preference('UpdateExpiryDateOnCategoryChange') == 'softno' %]
|
||||
<div class="form-check">
|
||||
<input type="checkbox" id="categoryChangeUpdateExpiry" />
|
||||
<label class="form-check-label" for="categoryChangeUpdateExpiry"> Reset expiration date to category default </label>
|
||||
</div>
|
||||
[% END %]
|
||||
[% END %]
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button id="categoryChangeConfirmBtn" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Confirm</button>
|
||||
|
|
@ -1874,6 +1890,9 @@
|
|||
|
||||
var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %];
|
||||
var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %];
|
||||
|
||||
var UpdateExpiryDateOnCategoryChange = "[% Koha.Preference('UpdateExpiryDateOnCategoryChange') | html %]";
|
||||
var UpdateMessagingPrefsOnCategoryChange = "[% Koha.Preference('UpdateMessagingPrefsOnCategoryChange') | html %]";
|
||||
</script>
|
||||
[% Asset.js("js/messaging-preference-form.js") | $raw %]
|
||||
[% Asset.js("js/members.js") | $raw %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue