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.

Sign up for GitHub

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

Jump to bottom

primeng: acquisitions #3816

Merged
merged 1 commit into from
Mar 13, 2025
Merged

primeng: acquisitions #3816

merged 1 commit into from
Mar 13, 2025

Conversation

jma
Copy link
Contributor

@jma jma commented Jan 22, 2025 •
edited
Loading

  • Fixes poetry shell plugins.
  • Removes is_canceled, send_now, exange_rate, receipt_date useless acquistions fields.
  • Moves order_date from order lines to orders.
  • Removes order type as it is useless.
  • Uses primeng css class in the JSONSchemas.
  • Adds the number of children in the acquisition acounts serializer.
  • Adjusts acquistion permissions.
  • Removes toggle-switch type in JSONSchemas.
  • Fixes the multi-select type in JSONSchemas.
  • Fixes invalid user name regular expression.
  • Uniformizes placeholders.

Co-Authored-by: Johnny Mariéthoz [email protected]
Co-Authored-by: Pascal Repond [email protected]

@github-actions github-actions bot added f: search f: data migration Data migration from a legacy system or a previous version dev: fixtures Fixtures data used for ils.test and ilsdev.test dev: DB Database structure (models.py) labels Jan 22, 2025
@jma jma force-pushed the maj-next-acquisitions branch 3 times, most recently from aef3f77 to cb518ed Compare January 28, 2025 13:32
@jma jma force-pushed the maj-next-acquisitions branch 2 times, most recently from ebb016f to 73d6672 Compare February 4, 2025 07:50
@github-actions github-actions bot added the dev: documentation About changelog, release notes, installation procedures, gh templates... label Feb 4, 2025
@jma jma force-pushed the maj-next-acquisitions branch from 73d6672 to 43a0290 Compare February 4, 2025 09:39
@github-actions github-actions bot added the f: data About data model, importation, transformation, exportation of data, specific for bibliographic data label Feb 4, 2025
@jma jma force-pushed the maj-next-acquisitions branch from 43a0290 to 70c258e Compare February 10, 2025 13:15
@github-actions github-actions bot added f: circulation Concerns the circulation interface or backend f: user management f: permissions Concerns the rights management labels Feb 10, 2025
@jma jma force-pushed the maj-next-acquisitions branch from 70c258e to f514f54 Compare February 10, 2025 13:28
@jma jma force-pushed the maj-next-acquisitions branch 3 times, most recently from abad94a to 57df4d8 Compare February 12, 2025 07:47
@github-actions github-actions bot added the f: statistics Related to the usage statistics either for pricing or for the libaries reports label Feb 12, 2025
@jma jma force-pushed the maj-next-acquisitions branch from 57df4d8 to a8da8b7 Compare February 12, 2025 12:11
@jma jma force-pushed the maj-next-acquisitions branch 2 times, most recently from 224b749 to e2c0823 Compare February 12, 2025 12:23
@jma jma marked this pull request as ready for review February 12, 2025 12:23
@jma jma requested review from Garfield-fr and rerowep February 12, 2025 12:23
@jma jma requested a review from PascalRepond February 12, 2025 12:24
@Garfield-fr Garfield-fr changed the title primeng: acquistion (in progress) primeng: acquistion Feb 12, 2025
@jma jma force-pushed the maj-next-acquisitions branch 4 times, most recently from d4fccb9 to 279ad14 Compare February 17, 2025 10:36
@github-actions github-actions bot added the developers From a developer point of view. label Feb 17, 2025
@jma jma force-pushed the maj-next-acquisitions branch 4 times, most recently from 87e4bc0 to 71cda4e Compare February 20, 2025 07:30
@jma jma changed the title primeng: acquistion primeng: acquisitions Feb 20, 2025
Garfield-fr
Garfield-fr approved these changes Feb 20, 2025
View reviewed changes
rero_ils/modules/acquisition/acq_orders/api.py Outdated

@classmethod
def get_status_by_pid(cls, pid):
"""."""
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing doc

rero_ils/modules/acquisition/acq_receipt_lines/api.py
def extended_validation(self, **kwargs):
"""Add additional record validation.

:return: False if
Copy link
Contributor

Choose a reason for hiding this comment

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

if ?

rero_ils/modules/acquisition/acq_receipts/api.py
def extended_validation(self, **kwargs):
"""Add additional record validation.

:return: False if
Copy link
Contributor

Choose a reason for hiding this comment

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

if ?

scripts/bootstrap Outdated
Comment on lines 126 to 127
# info_msg "Install poetry shell"
# poetry self add poetry-plugin-shell
Copy link
Contributor

Choose a reason for hiding this comment

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

uncomment ?

rerowep
rerowep reviewed Feb 20, 2025
View reviewed changes
Dockerfile.base Outdated
@@ -20,7 +20,7 @@ FROM python:3.9-slim-bullseye
# require debian packages
RUN apt-get update -y && apt-get upgrade -y
RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc gnupg libc6-dev procps imagemagick && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade setuptools wheel pip poetry
RUN pip install --upgrade setuptools wheel pip poetry && poetry self add poetry-plugin-shell
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not second line:
RUN poetry self add poetry-plugin-shell

@jma jma force-pushed the maj-next-acquisitions branch from 71cda4e to 0d02abd Compare February 24, 2025 09:36
@jma jma force-pushed the maj-next-acquisitions branch from 0d02abd to b9454ec Compare March 13, 2025 09:40
@jma @PascalRepond
chore: acquisitions
191a773 
* Fixes poetry shell plugins.
* Removes is_canceled, send_now, exange_rate, receipt_date useless acquistions fields.
* Moves order_date from order lines to orders.
* Removes order type as it is useless.
* Uses primeng css class in the JSONSchemas.
* Adds the number of children in the acquisition acounts serializer.
* Adjusts acquistion permissions.
* Removes toggle-switch type in JSONSchemas.
* Fixes the multi-select type in JSONSchemas.
* Fixes invalid user name regular expression.
* Uniformizes placeholders.

Co-Authored-by: Johnny Mariéthoz <[email protected]>
Co-Authored-by: Pascal Repond <[email protected]>
@jma jma force-pushed the maj-next-acquisitions branch from b9454ec to 191a773 Compare March 13, 2025 10:00
@jma jma merged commit 7047be6 into rero:next-version Mar 13, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rerowep rerowep rerowep left review comments

@Garfield-fr Garfield-fr Garfield-fr approved these changes

@PascalRepond PascalRepond PascalRepond approved these changes

Assignees
No one assigned
Labels
dev: DB Database structure (models.py) dev: documentation About changelog, release notes, installation procedures, gh templates... dev: fixtures Fixtures data used for ils.test and ilsdev.test developers From a developer point of view. f: circulation Concerns the circulation interface or backend f: data migration Data migration from a legacy system or a previous version f: data About data model, importation, transformation, exportation of data, specific for bibliographic data f: permissions Concerns the rights management f: search f: statistics Related to the usage statistics either for pricing or for the libaries reports f: user management
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jma @Garfield-fr @rerowep @PascalRepond