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

[FW][FIX] account,purchase: display of analytic_tag_ids #62876

Closed
wants to merge 1 commit into from
Closed

[FW][FIX] account,purchase: display of analytic_tag_ids #62876

wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 4, 2020

account: the field was present twice in the view
purchase: was not using the right group, same as c9e8ec5

Fixes #35073

Forward-Port-Of: #62868
Forward-Port-Of: #62863

@robodoo robodoo added conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot labels Dec 4, 2020
@robodoo
Copy link
Contributor

robodoo commented Dec 4, 2020 •
edited

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 4, 2020

Ping @mart-e
Cherrypicking 8b6b63d of source #62863 failed

stderr:

error: could not apply 8b6b63d2292... [FIX] account,purchase: display analytic_tag_ids correctly
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@C3POdoo C3POdoo added the RD research & development, internal work label Dec 4, 2020
@alexis-via @mart-e
[FIX] account,purchase: display analytic_tag_ids correctly
1ace70d 
account: the field was present twice in the view
purchase: was not using the right group, same as c9e8ec5

Fixes odoo#35073

X-original-commit: 8797651
@mart-e mart-e force-pushed the 13.0-12.0-fixes-mat-WmTK-fw branch from ef654ee to 1ace70d Compare December 4, 2020 12:48
@mart-e
Copy link
Contributor

mart-e commented Dec 4, 2020

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 4, 2020
@alexis-via @mart-e
[FIX] account,purchase: display analytic_tag_ids correctly
68260e5 
account: the field was present twice in the view
purchase: was not using the right group, same as c9e8ec5

Fixes #35073

closes #62876

X-original-commit: 8797651
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
@robodoo robodoo closed this Dec 4, 2020
@robodoo robodoo temporarily deployed to merge December 4, 2020 14:20 Inactive
@fw-bot fw-bot mentioned this pull request Dec 4, 2020
Closed
@fw-bot fw-bot deleted the 13.0-12.0-fixes-mat-WmTK-fw branch December 18, 2020 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@fw-bot @robodoo @mart-e @C3POdoo @alexis-via