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

[IMP] Specificare un conto nell'ammortamento del cespite diverso dal conto nella categoria #4166

Merged
merged 3 commits into from
Oct 18, 2024
Merged

[IMP] Specificare un conto nell'ammortamento del cespite diverso dal conto nella categoria #4166

merged 3 commits into from
Oct 18, 2024

Conversation

SirAionTech
Copy link
Contributor

@SirAionTech SirAionTech commented May 27, 2024 •
edited
Loading

Risolve #4164 e #4165 per 16.0.

Ho usato la stessa PR per entrambe le issues per sfruttare lo stesso commit di refactoring dei test.

This was referenced May 27, 2024
Open
Open
@SirAionTech SirAionTech marked this pull request as ready for review May 27, 2024 13:15
@francesco-ooops francesco-ooops linked an issue May 28, 2024 that may be closed by this pull request
L'importo della plusvalenza non è proporzionale all'importo ammortizzato del cespite #4164
Open
2 tasks
@SirAionTech SirAionTech marked this pull request as draft June 13, 2024 14:33
@SirAionTech SirAionTech force-pushed the 16.0-imp-l10n_it_asset_management-line_accounts branch 3 times, most recently from ee1a7ea to 21a3da9 Compare June 17, 2024 12:38
@SirAionTech SirAionTech marked this pull request as ready for review June 17, 2024 13:02
@francesco-ooops francesco-ooops linked an issue Jun 17, 2024 that may be closed by this pull request
Specificare un conto nell'ammortamento del cespite diverso dal conto nella categoria #4165
Open
2 tasks
@SirAionTech SirAionTech force-pushed the 16.0-imp-l10n_it_asset_management-line_accounts branch from 21a3da9 to 06ac4fd Compare July 10, 2024 12:56
@SirAionTech
Copy link
Contributor Author

Fatto rebase per risolvere i conflitti

@SirAionTech SirAionTech mentioned this pull request Jul 11, 2024
Open
@SirAionTech SirAionTech force-pushed the 16.0-imp-l10n_it_asset_management-line_accounts branch 3 times, most recently from 2db16f2 to b68c4cf Compare October 9, 2024 12:47
@SirAionTech
Copy link
Contributor Author

Fatto rebase per risolvere i conflitti

MaurizioConte
MaurizioConte reviewed Oct 11, 2024
View reviewed changes
Copy link

@MaurizioConte MaurizioConte left a comment

Choose a reason for hiding this comment

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

Non si riesce a cambiare il conto per indicarne uno diverso da quello indicato in categoria ma non ho visto proprio il campo del conto sul calcolo ammortamenti.

@SirAionTech
Copy link
Contributor Author

Non si riesce a cambiare il conto per indicarne uno diverso da quello indicato in categoria ma non ho visto proprio il campo del conto sul calcolo ammortamenti.

I conti sono negli ammortamenti, ad esempio in un cespite l'ammortamento presenta i campi Depreciation Account, ...
image

Prima di questa PR quei campi non ci sono:
image

MaurizioPellegrinet
MaurizioPellegrinet approved these changes Oct 14, 2024
View reviewed changes
Copy link

@MaurizioPellegrinet MaurizioPellegrinet left a comment

Choose a reason for hiding this comment

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

Test funzionale: OK

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@sergiocorato
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-4166-by-sergiocorato-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 18, 2024
@OCA-git-bot
Merge PR #4166 into 16.0
d4fd926 
Signed-off-by sergiocorato
@OCA-git-bot
Copy link
Contributor

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

Signed-off-by sergiocorato' tmp-pr-4166` failed with output:

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

@OCA-git-bot
Copy link
Contributor

@sergiocorato The merge process could not be finalized, because command `git merge --no-ff -m 'Merge PR #4166 into 16.0

Signed-off-by sergiocorato' tmp-pr-4166` failed with output:

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

@SirAionTech SirAionTech force-pushed the 16.0-imp-l10n_it_asset_management-line_accounts branch from b68c4cf to 337c38f Compare October 18, 2024 09:28
@SirAionTech
Copy link
Contributor Author

@sergiocorato ho risolto i conflitti, se per te è ancora ok riprovo il merge

@SirAionTech
Copy link
Contributor Author

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-4166-by-SirAionTech-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit f9d7852 into OCA:16.0 Oct 18, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 918a72c. 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

@sergiocorato sergiocorato sergiocorato approved these changes

@MaurizioPellegrinet MaurizioPellegrinet MaurizioPellegrinet approved these changes

@MaurizioConte MaurizioConte Awaiting requested review from MaurizioConte

Assignees
No one assigned
Labels
16.0 approved merged 🎉 ready to merge
Projects
None yet
Milestone
No milestone
6 participants
@SirAionTech @OCA-git-bot @sergiocorato @MaurizioConte @MaurizioPellegrinet @francesco-ooops