fix(invoices): improve receipt currency rendering #7293
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes two bugs in receipt rendering: 1. The subsidies now follow the deb/cred convention we have previously established (Closes Third-Culture-Software#6923). 2. The currency is properly rendered for totals of billing services (found while fixing this issue). In addition, I also found a typo in the French translation of the period limit text and fixed that here. Closes Third-Culture-Software#6923.
jmcameron
approved these changes
Oct 12, 2023
| @@ -114,7 +114,7 @@ | |||
| <table style="width: 100%;" class="table-report"> | |||
| <tr style="border:0px"> | |||
| <td class="text-right" style="border:0px"> | |||
| <b>-{{currency (sum subsidy 'value') metadata.enterprise.currency_id}}</b> | |||
| <b>{{debcred (multiply (sum subsidy 'value') -1) metadata.enterprise.currency_id}}</b> | |||
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Oct 12, 2023
7293: fix(invoices): improve receipt currency rendering r=jmcameron a=jniles This commit fixes two bugs in receipt rendering: 1. The subsidies now follow the deb/cred convention we have previously established (Closes #6923). 2. The currency is properly rendered for totals of billing services (found while fixing this issue). In addition, I also found a typo in the French translation of the period limit text and fixed that here. Closes #6923. Screenshots of changes: <img width="915" alt="Screenshot 2023-10-09 at 3 20 12 PM" src="https://github.com/IMA-WorldHealth/bhima/assets/896472/6f99747d-918e-474e-a2ee-50b2fa256d57"> <img width="915" alt="Screenshot 2023-10-09 at 3 25 54 PM" src="https://github.com/IMA-WorldHealth/bhima/assets/896472/e517c424-d7d3-476c-b500-5b6701f739a0"> Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>
|
Build failed: |
|
If at first you don't succeed... bors r+ |
|
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes two bugs in receipt rendering:
In addition, I also found a typo in the French translation of the period limit text and fixed that here.
Closes #6923.
Screenshots of changes:
