@@ -, +, @@ --- .../prog/en/modules/members/mancredit.tt | 2 +- .../prog/en/modules/members/maninvoice.tt | 34 ++----------------- members/mancredit.pl | 12 +++++++ members/maninvoice.pl | 33 ++++++++++++------ 4 files changed, 38 insertions(+), 43 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -83,7 +83,7 @@
  • -
  • Example: 5[% IF Koha.Preference("CurrencyFormat") == 'FR' %],[% ELSE %].[% END %]12
  • +
  • Example: 5[% decimal_delimiter | html %]12
  • [% INCLUDE 'transaction_types.inc' type="credit" %] [% IF Koha.Preference('UseCashRegisters') %]
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -16,35 +16,6 @@ [% WRAPPER 'header.inc' %] [% INCLUDE 'patron-search-header.inc' %] [% END %] -<<<<<<< HEAD -======= -[% ELSE %] -
    - -
    - Manual invoice -
      -
    1. - - -
    2. -
    3. -
    4. -
    5. -
    6. Example: 5[% IF Koha.Preference("CurrencyFormat") == 'FR' %],[% ELSE %].[% END %]12
    7. -
    -
    Cancel
    -
    ->>>>>>> WIP Bug 21507 - Fix decimal separators issues in patrons payments/fines [% WRAPPER 'sub-header.inc' %]