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.

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

Forward Port of #36733 to 12.0 (fixed) #36736

Conversation

fw-bot
Copy link
Contributor

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

Cherrypicking 08d9b45 of source #36733 failed with the following

stdout:


stderr:

Performing inexact rename detection:   9% (1423185/15211866)   
Performing inexact rename detection:  10% (1524069/15211866)   
Performing inexact rename detection:  11% (1675395/15211866)   
Performing inexact rename detection:  12% (1826721/15211866)   
Performing inexact rename detection:  13% (1978047/15211866)   
Performing inexact rename detection:  14% (2132976/15211866)   
Performing inexact rename detection:  15% (2284302/15211866)   
Performing inexact rename detection:  16% (2439231/15211866)   
Performing inexact rename detection:  17% (2586954/15211866)   
Performing inexact rename detection:  18% (2738280/15211866)   
Performing inexact rename detection:  19% (2893209/15211866)   
Performing inexact rename detection:  20% (3044535/15211866)   
Performing inexact rename detection:  21% (3195861/15211866)   
Performing inexact rename detection:  21% (3231891/15211866)   
Performing inexact rename detection:  22% (3347187/15211866)   
Performing inexact rename detection:  23% (3502116/15211866)   
Performing inexact rename detection:  24% (3653442/15211866)   
Performing inexact rename detection:  25% (3804768/15211866)   
Performing inexact rename detection:  26% (3956094/15211866)   
Performing inexact rename detection:  27% (4107420/15211866)   
Performing inexact rename detection:  28% (4262349/15211866)   
Performing inexact rename detection:  29% (4413675/15211866)   
Performing inexact rename detection:  30% (4565001/15211866)   
Performing inexact rename detection:  31% (4716327/15211866)   
Performing inexact rename detection:  32% (4871256/15211866)   
Performing inexact rename detection:  33% (5022582/15211866)   
Performing inexact rename detection:  34% (5173908/15211866)   
Performing inexact rename detection:  35% (5325234/15211866)   
Performing inexact rename detection:  36% (5476560/15211866)   
Performing inexact rename detection:  37% (5631489/15211866)   
Performing inexact rename detection:  38% (5782815/15211866)   
Performing inexact rename detection:  39% (5934141/15211866)   
Performing inexact rename detection:  39% (6045834/15211866)   
Performing inexact rename detection:  40% (6085467/15211866)   
Performing inexact rename detection:  41% (6240396/15211866)   
Performing inexact rename detection:  42% (6391722/15211866)   
Performing inexact rename detection:  43% (6543048/15211866)   
Performing inexact rename detection:  44% (6694374/15211866)   
Performing inexact rename detection:  45% (6845700/15211866)   
Performing inexact rename detection:  46% (7000629/15211866)   
Performing inexact rename detection:  47% (7151955/15211866)   
Performing inexact rename detection:  48% (7303281/15211866)   
Performing inexact rename detection:  49% (7454607/15211866)   
Performing inexact rename detection:  50% (7605933/15211866)   
Performing inexact rename detection:  51% (7760862/15211866)   
Performing inexact rename detection:  52% (7912188/15211866)   
Performing inexact rename detection:  53% (8063514/15211866)   
Performing inexact rename detection:  54% (8214840/15211866)   
Performing inexact rename detection:  55% (8369769/15211866)   
Performing inexact rename detection:  55% (8402196/15211866)   
Performing inexact rename detection:  56% (8521095/15211866)   
Performing inexact rename detection:  57% (8672421/15211866)   
Performing inexact rename detection:  58% (8823747/15211866)   
Performing inexact rename detection:  59% (8975073/15211866)   
Performing inexact rename detection:  60% (9130002/15211866)   
Performing inexact rename detection:  61% (9281328/15211866)   
Performing inexact rename detection:  62% (9432654/15211866)   
Performing inexact rename detection:  63% (9583980/15211866)   
Performing inexact rename detection:  64% (9738909/15211866)   
Performing inexact rename detection:  65% (9890235/15211866)   
Performing inexact rename detection:  66% (10041561/15211866)   
Performing inexact rename detection:  67% (10192887/15211866)   
Performing inexact rename detection:  68% (10344213/15211866)   
Performing inexact rename detection:  69% (10499142/15211866)   
Performing inexact rename detection:  70% (10650468/15211866)   
Performing inexact rename detection:  71% (10801794/15211866)   
Performing inexact rename detection:  72% (10963929/15211866)   
Performing inexact rename detection:  73% (11108049/15211866)   
Performing inexact rename detection:  74% (11259375/15211866)   
Performing inexact rename detection:  74% (11266581/15211866)   
Performing inexact rename detection:  75% (11410701/15211866)   
Performing inexact rename detection:  76% (11562027/15211866)   
Performing inexact rename detection:  77% (11713353/15211866)   
Performing inexact rename detection:  78% (11868282/15211866)   
Performing inexact rename detection:  79% (12019608/15211866)   
Performing inexact rename detection:  80% (12170934/15211866)   
Performing inexact rename detection:  81% (12322260/15211866)   
Performing inexact rename detection:  82% (12477189/15211866)   
Performing inexact rename detection:  83% (12628515/15211866)   
Performing inexact rename detection:  84% (12779841/15211866)   
Performing inexact rename detection:  85% (12931167/15211866)   
Performing inexact rename detection:  86% (13082493/15211866)   
Performing inexact rename detection:  87% (13237422/15211866)   
Performing inexact rename detection:  88% (13388748/15211866)   
Performing inexact rename detection:  89% (13540074/15211866)   
Performing inexact rename detection:  90% (13691400/15211866)   
Performing inexact rename detection:  91% (13846329/15211866)   
Performing inexact rename detection:  92% (13997655/15211866)   
Performing inexact rename detection:  93% (14148981/15211866)   
Performing inexact rename detection:  93% (14228247/15211866)   
Performing inexact rename detection:  94% (14300307/15211866)   
Performing inexact rename detection:  95% (14451633/15211866)   
Performing inexact rename detection:  96% (14606562/15211866)   
Performing inexact rename detection:  97% (14757888/15211866)   
Performing inexact rename detection:  98% (14909214/15211866)   
Performing inexact rename detection:  99% (15060540/15211866)   
Performing inexact rename detection: 100% (15211866/15211866)   
Performing inexact rename detection: 100% (15211866/15211866), done.
error: could not apply 08d9b45c371... [IMP] payment: sca readyness
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/payment/controllers/portal.py'
Recorded preimage for 'addons/payment/models/payment_acquirer.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 @nim-odoo

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Sep 11, 2019
@robodoo robodoo added the CI 🤖 Robodoo has seen passing statuses label Sep 11, 2019
@nim-odoo
Copy link
Contributor

@xmo-odoo this one also faced the issue

- Activate variants
- On a product variant without BOM, go to Action > Compute Price from
  BOM

A zero-division is raised because of `... / bom.product_qty`.

opw-2067520

closes odoo#36733

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
@nim-odoo nim-odoo force-pushed the 12.0-saas-11.3-opw-2067520-bom_cost-nim-ZVT2FO2M-forwardport branch from c9fc841 to 87608cd Compare September 12, 2019 06:06
@nim-odoo nim-odoo changed the title Forward Port of #36733 to 12.0 (failed) Forward Port of #36733 to 12.0 (fixed) Sep 12, 2019
@nim-odoo
Copy link
Contributor

robodoo r+

@robodoo robodoo added r+ 👌 and removed CI 🤖 Robodoo has seen passing statuses labels Sep 12, 2019
@robodoo robodoo added CI 🤖 Robodoo has seen passing statuses merging 👷 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/616501)

@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 robodoo closed this in e17c562 Sep 12, 2019
@robodoo
Copy link
Contributor

robodoo commented Sep 12, 2019

Merged at e17c562, thanks!

@nim-odoo nim-odoo deleted the 12.0-saas-11.3-opw-2067520-bom_cost-nim-ZVT2FO2M-forwardport branch September 12, 2019 08:27
nim-odoo added a commit to odoo-dev/odoo that referenced this pull request Sep 12, 2019
- Activate variants
- On a product variant without BOM, go to Action > Compute Price from
  BOM

A zero-division is raised because of `... / bom.product_qty`.

opw-2067520

closes odoo#36733

closes odoo#36736

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
robodoo pushed a commit that referenced this pull request Sep 12, 2019
- Activate variants
- On a product variant without BOM, go to Action > Compute Price from
  BOM

A zero-division is raised because of `... / bom.product_qty`.

opw-2067520

closes #36733

closes #36736

closes #36749

Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI 🤖 Robodoo has seen passing statuses OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants