Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 23, 2025

Steps to reproduce:

  1. Create two companies: Company A and Company B
  2. Create a service product
  3. Configure the product to be purchased on Company A and not on Company B
  4. Create a sales order on Company B, while logged in Company A
  5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #194432
Forward-Port-Of: #177659

@robodoo
Copy link
Contributor

robodoo commented Jan 23, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jan 23, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 23, 2025

@ivantodorovich @ticodoo cherrypicking of pull request #177659 failed.

stdout:

Auto-merging addons/sale_purchase/models/sale_order_line.py
Auto-merging addons/sale_purchase/tests/test_sale_purchase.py
CONFLICT (content): Merge conflict in addons/sale_purchase/tests/test_sale_purchase.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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo C3POdoo added the RD research & development, internal work label Jan 23, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

X-original-commit: 9b85412
@ticodoo ticodoo force-pushed the 18.0-16.0-fix-service-to-purchase-multi-company-xC5v-fw branch from b2a07fc to 5819623 Compare January 24, 2025 10:15
@ticodoo
Copy link
Contributor

ticodoo commented Jan 24, 2025

@robodoo r+

@robodoo robodoo closed this in 26b840b Jan 24, 2025
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 26, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

closes odoo#194947

X-original-commit: 9b85412
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Jan 27, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

closes odoo/odoo#194947

X-original-commit: 9b854120ad68ab011bd9bfafb47ac4ad4cb5ca87
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 29, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

closes odoo#194947

X-original-commit: 9b85412
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 29, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

closes odoo#194947

X-original-commit: 9b85412
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
StephaneMangin pushed a commit to camptocamp/odoo that referenced this pull request Feb 6, 2025
Previous fix: eacb2a7 fixed the
following bug:

Steps to reproduce:

1. Create two companies: Company A and Company B
2. Create a service product
3. Configure the product to be purchased on Company A and not on Company B
4. Create a sales order on Company B, while logged in Company A
5. Confirm the order

Expected result:

The service PO is created on Company B, even though it was configured not to.

---
But this fix did not update the other associated spots that suffer from the
same issue, specifically:
- When to display the applicable decreased qty - PO adjustment warning
- When POs are associated with increased/decreased SO values

So this commit fixes them now.

closes odoo#194947

X-original-commit: 9b85412
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
@fw-bot fw-bot deleted the 18.0-16.0-fix-service-to-purchase-multi-company-xC5v-fw branch February 7, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

5 participants