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

Acquisition #709

Merged
merged 9 commits into from
Jan 23, 2020
Merged

Acquisition #709

merged 9 commits into from
Jan 23, 2020

Conversation

iGormilhit
Copy link

Why are you opening this PR?

  • To integrate acquisition branch to dev

Code review check list

  • Commit message template compliance.
  • Commit message without typos.
  • File names.
  • Functions names.
  • Functions docstrings.
  • Unnecessary commited files?

lauren-d and others added 8 commits January 23, 2020 08:36
* Adds vendor resource.
* Creates tests.
* Creates fixtures.

Co-Authored-by: Lauren-D <[email protected]>
* Adds a new acq_account and budget resources.
* Creates fixtures and units testing for the two resources.
* Limits acq_account manipulation (edit, delete , update) to librarian of same library.
* Allows system librarians to manipulate acq_accounts of its organisation.
* Limits budget manipulation (edit, delete , update) to system_librarian of same organisation.
* Allows librarians to read its library budgets.
* Inherits acq_account currencies from its organisation default currency.
* Adds library name to acq_account serializer.
* Allows organisation editing for organistions system_librarians.
* Adds current_budget_pid to the resource organisation

Co-Authored-by: Aly Badr <[email protected]>
* Fixes organisation api query and access
* Fixes budget api query

Co-Authored-by: Bertrand Zuchuat <[email protected]>
* Improves tests and fixtures.

Co-Authored-by: Aly Badr <[email protected]>
* Updates budget and acq_account for formly.
* Fixes translation for new options form.
* Updates babel config to extract new label key.

Co-Authored-by: Bertrand Zuchuat <[email protected]>
* Adds currency and TVA rate to vendor resource.
* Updates elasticsearch mapping.
* Updates fixtures.

Co-Authored-by: Lauren-D <[email protected]>
* Adds order resource for acquisition.
* Adds permissions for order resource.
* Adds order line resource for acquisition.
* Adds library and order_status facets for orders.
* Adds sort to order lines.
* Creates tests.
* Creates fixtures for tests.
* Fixes fuzzy translations for vendors.

Co-Authored-by: Lauren-D <[email protected]>
@iGormilhit iGormilhit merged commit c89e90b into dev Jan 23, 2020
@BadrAly BadrAly deleted the acquisition branch January 28, 2020 08:20
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.

3 participants