Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 26, 2025

Steps to reproduce:

  • In Accounting create a new Payment Term with an early discount set on "Always(upon invoice)"
  • Create a new Contact and add the payment term to this contact
  • Open POS and create an order
  • Select the new contact as the customer
  • Go to payment, select the option to create an invoice and validate
  • The receipt and the generated invoice have different amounts: the payment terms were applied on the invoice but not on the receipt

Cause:

POS does not consider at any point the payment terms so the total to be paid does not include the payment terms. Payment terms were included in invoices from POS with this commit

Solution:

Remove the payment terms on invoices from POS.

opw-4458036

Forward-Port-Of: #203252
Forward-Port-Of: #199385

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

robodoo commented Mar 26, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 26, 2025

@mathcoutant @adgu-odoo cherrypicking of pull request #199385 failed.

stdout:

Auto-merging addons/point_of_sale/models/pos_order.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_order.py
Auto-merging addons/point_of_sale/tests/test_frontend.py
CONFLICT (content): Merge conflict in addons/point_of_sale/tests/test_frontend.py
Auto-merging addons/pos_sale/models/pos_order.py
Auto-merging addons/pos_sale/static/tests/tours/pos_sale_tour.js
Auto-merging addons/pos_sale/tests/test_pos_sale_flow.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 OE the report is linked to a support ticket (opw-...) label Mar 26, 2025
@mathcoutant mathcoutant force-pushed the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch from 47cfaea to 920b0e5 Compare March 26, 2025 13:12
@C3POdoo C3POdoo requested review from a team and vlst-odoo and removed request for a team March 26, 2025 13:16
@mathcoutant mathcoutant force-pushed the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch from 920b0e5 to 50faf2b Compare March 27, 2025 08:43
@mathcoutant
Copy link
Contributor

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Mar 27, 2025

@mathcoutant @adgu-odoo unable to stage: merge conflict

@mathcoutant mathcoutant force-pushed the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch from 50faf2b to 8f5afa4 Compare April 2, 2025 09:12
@mathcoutant
Copy link
Contributor

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Apr 2, 2025

@mathcoutant @adgu-odoo unable to stage: merge conflict

@mathcoutant
Copy link
Contributor

@robodoo retry

@robodoo
Copy link
Contributor

robodoo commented Apr 2, 2025

@mathcoutant @adgu-odoo unable to stage: merge conflict

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 3, 2025

@mathcoutant @adgu-odoo this forward port of #199385 is awaiting action (not merged or closed).

@mathcoutant mathcoutant force-pushed the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch 2 times, most recently from 8c6d9b6 to 92a87ac Compare April 4, 2025 08:19
…rom POS

Steps to reproduce:
- In Accounting create a new Payment Term with an early discount set on "Always(upon invoice)"
- Create a new Contact and add the payment term to this contact
- Open POS and create an order
- Select the new contact as the customer
- Go to payment, select the option to create an invoice and validate
- The receipt and the generated invoice have different amounts: the payment terms were applied on the invoice but not on the receipt

Cause:
POS does not consider at any point the payment terms so the total to be paid does not include the payment terms.
Payment terms were included in invoices from POS with this [commit](odoo/odoo@c1cd62f)

Solution:
Remove the payment terms on invoices from POS.

opw-4458036

X-original-commit: e74b1e2
@mathcoutant mathcoutant force-pushed the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch from 92a87ac to 5f597f9 Compare April 4, 2025 08:20
@mathcoutant
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 4, 2025
…rom POS

Steps to reproduce:
- In Accounting create a new Payment Term with an early discount set on "Always(upon invoice)"
- Create a new Contact and add the payment term to this contact
- Open POS and create an order
- Select the new contact as the customer
- Go to payment, select the option to create an invoice and validate
- The receipt and the generated invoice have different amounts: the payment terms were applied on the invoice but not on the receipt

Cause:
POS does not consider at any point the payment terms so the total to be paid does not include the payment terms.
Payment terms were included in invoices from POS with this [commit](c1cd62f)

Solution:
Remove the payment terms on invoices from POS.

opw-4458036

closes #203485

X-original-commit: e74b1e2
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Mathieu Coutant (mcou) <mcou@odoo.com>
@robodoo robodoo closed this Apr 4, 2025
@fw-bot fw-bot deleted the saas-18.2-17.0-opw-4458036-POS_terms_invoice-mcou-425245-fw branch April 11, 2025 13:18
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 OE the report is linked to a support ticket (opw-...)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants