Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20450: Fix invoice math for partial payments. #10222

Merged
merged 4 commits into from
Apr 24, 2017
Merged

CRM-20450: Fix invoice math for partial payments. #10222

merged 4 commits into from
Apr 24, 2017

Conversation

seamuslee001
Copy link
Contributor

@seamuslee001 seamuslee001 commented Apr 24, 2017

@seamuslee001
Copy link
Contributor Author

@KarinG Tested the upgrade and looks good

@KarinG
Copy link
Contributor

KarinG commented Apr 24, 2017

@seamuslee001 Excellent - thank you for confirming that!

@@ -143,6 +143,7 @@
<td colspan = "3"></td>
<td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
<td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
<td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the closing tag should be - that is somewhere else in the tpl too

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think your comment got stripped by GitHub? I've had this line in production since: https://issues.civicrm.org/jira/browse/CRM-19837 - else an unpaid invoice -> runs off the screen [see screenshot in that JIRA issue]; did I miss a tag?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this place & 2 others in the tpl (which you probably copied one of) the opening tag is font & the closing tag is fonts. We should merge this first & then fix that

@eileenmcnaughton
Copy link
Contributor

I'm ok to merge this - I was really uncomfortable merging anything financial without a test but I took a look & it should be quite trivial to add testing. Since @seamuslee001 is already working on the additional steps & I have got the basis of adding testing I think we should get this merged. Note it is after the rc is cut & I was hell-bent on a really hard-line on any fixes post rc, but the scope of this is very limited and reading the code it is very clear cut that the main line being changed was wrong.

(test is https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:inv?expand=1 )

@eileenmcnaughton eileenmcnaughton merged commit 43110e6 into civicrm:4.7.19-rc Apr 24, 2017
@seamuslee001
Copy link
Contributor Author

Test failure unrelated

@KarinG
Copy link
Contributor

KarinG commented Apr 24, 2017

Thank you! Yeah - pretty sure this is an improvement from:
$amountDue = ($input['amount'] - $input['amount']);
Sorry about the date mixup - I really had a 'by Monday' for this in my Notes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants