Bug 12648: Fix conflict with bug 8096
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Patch fixes the regression found while testing. Thanks for the fast response Jonathan
This commit is contained in:
parent
58ee5a15c0
commit
855c8f47b7
|
|
@ -8,9 +8,9 @@
|
|||
[%- borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %]
|
||||
[%- END -%]
|
||||
[%- END -%]
|
||||
[% IF ( borrower.cardnumber ) %]
|
||||
[%- IF ( borrower.cardnumber ) -%]
|
||||
([% borrower.cardnumber %])
|
||||
[% END %]
|
||||
[%- END %]
|
||||
[%- ELSIF ( borrowernumber ) %]
|
||||
[%- IF category_type == 'I' %]
|
||||
[%- surname %] [% IF othernames %] ([% othernames %]) [% END %]
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
[%- firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %]
|
||||
[%- END %]
|
||||
[%- END -%]
|
||||
[% IF ( cardnumber ) %]
|
||||
[%- IF ( cardnumber ) -%]
|
||||
([% cardnumber %])
|
||||
[% END %]
|
||||
[%- END %]
|
||||
[%- END -%]
|
||||
|
|
|
|||
Loading…
Reference in New Issue