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

[16.0][IMP] report_csv: support attachment use #793

Merged
merged 1 commit into from
Jul 20, 2024
Merged

[16.0][IMP] report_csv: support attachment use #793

merged 1 commit into from
Jul 20, 2024

Conversation

sbejaoui
Copy link
Contributor

@sbejaoui sbejaoui commented Sep 26, 2023 •
edited
Loading

No description provided.

@sbejaoui sbejaoui marked this pull request as draft September 26, 2023 21:02
@sbejaoui sbejaoui marked this pull request as ready for review September 26, 2023 21:03
@sbejaoui sbejaoui marked this pull request as draft September 26, 2023 21:04
@sbejaoui sbejaoui marked this pull request as ready for review September 27, 2023 07:37
@gurneyalex
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

@gurneyalex The merge process could not start, because command `git merge --no-ff -m 'Merge PR #793 into 16.0

Signed-off-by gurneyalex' tmp-pr-793` failed with output:

Auto-merging report_csv/tests/test_report.py
Auto-merging report_csv/models/ir_report.py
CONFLICT (content): Merge conflict in report_csv/models/ir_report.py
Automatic merge failed; fix conflicts and then commit the result.

ivantodorovich
ivantodorovich approved these changes Feb 29, 2024
View reviewed changes
Copy link
Contributor

@ivantodorovich ivantodorovich left a comment

Choose a reason for hiding this comment

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

LGTM

@ivantodorovich
Copy link
Contributor

@sbejaoui could you please rebase on top 16.0 ? It seems the merge command failed due to unresolved conflicts

@github-actions GitHub Actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Jun 30, 2024
@sbejaoui
Copy link
Contributor Author

sbejaoui commented Jul 1, 2024

@sbejaoui could you please rebase on top 16.0 ? It seems the merge command failed due to unresolved conflicts

done

@github-actions github-actions bot removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Jul 7, 2024
@gurneyalex
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-793-by-gurneyalex-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 69f43d7 into OCA:16.0 Jul 20, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at e2d07fd. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivantodorovich ivantodorovich ivantodorovich approved these changes

@gurneyalex gurneyalex gurneyalex approved these changes

Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sbejaoui @gurneyalex @OCA-git-bot @ivantodorovich