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

Convert cost allocation basis units to translation token for predefined bases #5954

Merged
merged 3 commits into from
Oct 1, 2021

Conversation

jmcameron
Copy link
Collaborator

@jmcameron jmcameron commented Sep 29, 2021

Converts the 'units' field cost allocation basis items to be a translation token for predefined basis items so that they can be translated when possible.

Cleaned up/reorganized many of the cost allocation translation items into cost_center.json. Deleted the old fee_center.json files (not needed after the reorganization). Reworded some of the terms related to cost allocations.

Temporarily disabled the display of the old cost distribution pages. No code was deleted yet.

Closes #5926

Partially implements #5926: the cost allocation basis table is modified with the new data items but the formatting of the tabular display was not done yet.

TESTING

  • Use bhima_test
  • yarn; yarn build; yarn build:db
  • Load the test data in server/models/migration/next/sample_cost_center_data.sql
  • Try the functions under the Cost Center Management page and notice that the units for predefined basis items work properly (in English and French).
  • Please review the French translations!

Copy link
Contributor

@mbayopanda mbayopanda left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏽

@mbayopanda
Copy link
Contributor

The translation works fine, and the PR is LGTM. @jmcameron could you fix the mergin conflict so that this PR can be merged

@jmcameron
Copy link
Collaborator Author

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 1, 2021

Merge conflict.

@jmcameron
Copy link
Collaborator Author

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 1, 2021

Build succeeded:

@bors bors bot merged commit 50dfad2 into IMA-WorldHealth:master Oct 1, 2021
@jmcameron jmcameron deleted the cost-basis-item-improvements branch October 1, 2021 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add formatting information in the cost_center_allocation_basis table
2 participants