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

Forward Port of #36685 to saas-12.3 (fixed) #36727

Closed
wants to merge 1 commit into from
Closed

Forward Port of #36685 to saas-12.3 (fixed) #36727

wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Sep 11, 2019

Cherrypicking 01fe5da of source #36685 failed with the following

stdout:

stderr:

Performing inexact rename detection:  47% (1544032/3265696)   
Performing inexact rename detection:  48% (1569408/3265696)   
Performing inexact rename detection:  49% (1600640/3265696)   
Performing inexact rename detection:  50% (1633824/3265696)   
Performing inexact rename detection:  51% (1667008/3265696)   
Performing inexact rename detection:  52% (1698240/3265696)   
Performing inexact rename detection:  53% (1731424/3265696)   
Performing inexact rename detection:  54% (1764608/3265696)   
Performing inexact rename detection:  55% (1797792/3265696)   
Performing inexact rename detection:  56% (1829024/3265696)   
Performing inexact rename detection:  57% (1862208/3265696)   
Performing inexact rename detection:  58% (1895392/3265696)   
Performing inexact rename detection:  59% (1928576/3265696)   
Performing inexact rename detection:  60% (1959808/3265696)   
Performing inexact rename detection:  61% (1992992/3265696)   
Performing inexact rename detection:  62% (2026176/3265696)   
Performing inexact rename detection:  63% (2057408/3265696)   
Performing inexact rename detection:  64% (2090592/3265696)   
Performing inexact rename detection:  65% (2123776/3265696)   
Performing inexact rename detection:  66% (2156960/3265696)   
Performing inexact rename detection:  67% (2188192/3265696)   
Performing inexact rename detection:  68% (2221376/3265696)   
Performing inexact rename detection:  69% (2254560/3265696)   
Performing inexact rename detection:  70% (2287744/3265696)   
Performing inexact rename detection:  71% (2318976/3265696)   
Performing inexact rename detection:  72% (2352160/3265696)   
Performing inexact rename detection:  73% (2385344/3265696)   
Performing inexact rename detection:  74% (2418528/3265696)   
Performing inexact rename detection:  75% (2449760/3265696)   
Performing inexact rename detection:  76% (2482944/3265696)   
Performing inexact rename detection:  77% (2516128/3265696)   
Performing inexact rename detection:  78% (2547360/3265696)   
Performing inexact rename detection:  79% (2580544/3265696)   
Performing inexact rename detection:  80% (2613728/3265696)   
Performing inexact rename detection:  81% (2646912/3265696)   
Performing inexact rename detection:  82% (2678144/3265696)   
Performing inexact rename detection:  83% (2711328/3265696)   
Performing inexact rename detection:  84% (2744512/3265696)   
Performing inexact rename detection:  85% (2777696/3265696)   
Performing inexact rename detection:  86% (2808928/3265696)   
Performing inexact rename detection:  87% (2842112/3265696)   
Performing inexact rename detection:  88% (2875296/3265696)   
Performing inexact rename detection:  89% (2906528/3265696)   
Performing inexact rename detection:  90% (2939712/3265696)   
Performing inexact rename detection:  91% (2972896/3265696)   
Performing inexact rename detection:  92% (3006080/3265696)   
Performing inexact rename detection:  93% (3037312/3265696)   
Performing inexact rename detection:  94% (3070496/3265696)   
Performing inexact rename detection:  95% (3103680/3265696)   
Performing inexact rename detection:  96% (3136864/3265696)   
Performing inexact rename detection:  97% (3168096/3265696)   
Performing inexact rename detection:  98% (3201280/3265696)   
Performing inexact rename detection:  99% (3234464/3265696)   
Performing inexact rename detection: 100% (3265696/3265696)   
Performing inexact rename detection: 100% (3265696/3265696), done.
error: could not apply 01fe5da9cde... [FIX] stock: correctly works on non unique recordsets
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'
Recorded preimage for 'addons/stock/models/stock_warehouse.py'
Recorded preimage for 'addons/stock/tests/test_warehouse.py'

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.

@robodoo
Copy link
Contributor

robodoo commented Sep 11, 2019

Ping @alt-odoo, @nim-odoo

@C3POdoo C3POdoo added the RD research & development, internal work label Sep 11, 2019
@nim-odoo
Copy link
Contributor

@xmo-odoo this shouldn't have failed, the diff was trivial

@nim-odoo
Copy link
Contributor

@xmo-odoo for this PR and https://github.com/odoo/enterprise/pull/5532 the last commit was the last manual forward-port. In this case: 9bf0b04

@alt-odoo @nim-odoo
[FIX] account_analytic_default: missing analytic tag on invoice
c1bd21a 
When adding an analytic tag on a sale order line, if there is
a default analytic tag defined matching the criteria, the tag
on the SO line is overwritten in the invoice while it should be
kept.

opw-2068196

closes odoo#36685

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
@nim-odoo nim-odoo force-pushed the saas-12.3-12.0-missing-analytic-tag-alt-HMDPOJDL-forwardport branch from b56d0d1 to c1bd21a Compare September 12, 2019 06:29
@nim-odoo nim-odoo changed the title Forward Port of #36685 to saas-12.3 (failed) Forward Port of #36685 to saas-12.3 (fixed) Sep 12, 2019
@nim-odoo
Copy link
Contributor

robodoo r+

@robodoo robodoo added r+ 👌 CI 🤖 Robodoo has seen passing statuses labels Sep 12, 2019
@robodoo
Copy link
Contributor

robodoo commented Sep 12, 2019

Staging failed: ci/runbot (view more at http://runbot.odoo.com/runbot/build/616548)

@robodoo robodoo added error 🙅 and removed CI 🤖 Robodoo has seen passing statuses merging 👷 labels Sep 12, 2019
@nim-odoo
Copy link
Contributor

robodoo retry

@robodoo robodoo added CI 🤖 Robodoo has seen passing statuses r+ 👌 and removed error 🙅 labels Sep 12, 2019
robodoo pushed a commit that referenced this pull request Sep 12, 2019
@alt-odoo @nim-odoo
[FIX] account_analytic_default: missing analytic tag on invoice
e7697ea 
When adding an analytic tag on a sale order line, if there is
a default analytic tag defined matching the criteria, the tag
on the SO line is overwritten in the invoice while it should be
kept.

opw-2068196

closes #36685

closes #36727

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
@robodoo
Copy link
Contributor

robodoo commented Sep 12, 2019

Merged at e7697ea, thanks!

@robodoo robodoo closed this Sep 12, 2019
@fw-bot fw-bot deleted the saas-12.3-12.0-missing-analytic-tag-alt-HMDPOJDL-forwardport branch October 18, 2019 13: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
CI 🤖 Robodoo has seen passing statuses 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 @nim-odoo @C3POdoo @alt-odoo