From 3bccde7b0bd7ed63637893426bb149abb045d273 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 3 May 2018 14:46:30 +0000 Subject: [PATCH] Bug 19166: (follow-up) Reformat the new adjustments markup This follow-up makes some changes to the way invoice adjustments are displayed and added: - Move this section into a
to set it off visually from the other sections of the page. - Take the "add adjustment" fields out of the table and display them in a standard way. - Hide the "add adjustment" fields by default, shown via "add an adjustment" link. - Add deletion confirmation to adjustment deletions. To test, add, delete, and change invoice adjustments as instructed in the original test plan. Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 + .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 264 ++++++++++++--------- 2 files changed, 158 insertions(+), 110 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index c68bff6..2afce42 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -93,6 +93,10 @@ h1,h2,h3,h4,h5,h6 { margin : .3em 0; } +hr { + clear: both; +} + p { margin: .5em 0 .5em 0; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index a8db249..169df41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -76,125 +76,161 @@ -
-
- - [% UNLESS orders_loop.size %] - Delete - [% END %] +
+ + [% UNLESS orders_loop.size %] + Delete + [% END %] +
-
- - - - - - - - - - - - [% IF (adjustments.count > 0) %] - - [% total_adj = 0 %] - [% FOREACH adjustment IN adjustments %] - [% total_adj = total_adj + adjustment.adjustment %] - - - - - - - - - - - -
IdAmountReasonNoteFundEncumber while invoice open 
Current adjustments
[% adjustment.adjustment_id %] - [% reasons = AuthorisedValues.Get("ADJ_REASON") %] - [% IF reasons.0 %] - - [% ELSE %] -

None

- - [% END %] -
- + [% IF (adjustments.count > 0) %] + + + + + + + + + + + [% total_adj = 0 %] + [% FOREACH adjustment IN adjustments %] + [% total_adj = total_adj + adjustment.adjustment %] + + + + + + + [% IF adjustment.encumber_open %] + [% ELSE %] - [% END %] - [% budget.budget_name %] - - [% END %] - - - [% IF adjustment.encumber_open %] - - [% ELSE %] - - [% END %] - - - [% END %] - [% END %] - - - - + + [% END %] +
IdAmountReasonNoteFundEncumber while invoice open 
[% adjustment.adjustment_id %] + [% reasons = AuthorisedValues.Get("ADJ_REASON") %] + [% IF reasons.0 %] + + [% ELSE %] +

None

+ + [% END %] +
+ + + + + + - - - - - Delete -
Add an adjustment
New - [% reasons = AuthorisedValues.Get("ADJ_REASON") %] - [% IF reasons.0 %] - + Delete +
+ [% END %] + +

+ Add an adjustment +

+ +
- -
- - -
+ + +
  • + + + +
  • +
  • +   + +
  • + + +
    + + +
    + +

    Go to receipt page [% IF Koha.Preference('AcqEnableFiles') %]| Manage invoice files[% END %]

    Invoice details

    +
    [% IF orders_loop.size %]
    @@ -326,7 +363,7 @@ [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% END %] -- 2.1.4