Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 31, 2025

Hiya, @meval1006! I've got a pretty small file here with some new photos. Just updating the language from 17.0 to 18.0. I'm going to open another PR after this one to further update from 18.0 to 19.0 with slightly altered language and a few 19.0-specific pictures, so I'll tag you in that one, too, since the jobs are related. Thanks!

This 18.0 PR can be FWP up to saas-18.4.

Forward-Port-Of: #15827

@robodoo
Copy link
Collaborator

robodoo commented Dec 31, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 31, 2025

@theRealThagomizer @Felicious cherrypicking of pull request #15827 failed.

stdout:

Auto-merging content/applications/sales/sales/sales_quotations/different_addresses.rst
CONFLICT (content): Merge conflict in content/applications/sales/sales/sales_quotations/different_addresses.rst
warning: Cannot merge binary files: content/applications/sales/sales/sales_quotations/different_addresses/contact-form-add-address.png (96c6ae8ac0cf406d04cfb24bbc54da88e1b8809b vs. b2f436a0b94b19a7ce82cd059fbab1ce460b3cec)
Auto-merging content/applications/sales/sales/sales_quotations/different_addresses/contact-form-add-address.png
CONFLICT (content): Merge conflict in content/applications/sales/sales/sales_quotations/different_addresses/contact-form-add-address.png
warning: Cannot merge binary files: content/applications/sales/sales/sales_quotations/different_addresses/create-contact-window.png (96c6ae8ac0cf406d04cfb24bbc54da88e1b8809b vs. b2f436a0b94b19a7ce82cd059fbab1ce460b3cec)
Auto-merging content/applications/sales/sales/sales_quotations/different_addresses/create-contact-window.png
CONFLICT (content): Merge conflict in content/applications/sales/sales/sales_quotations/different_addresses/create-contact-window.png

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

@theRealThagomizer theRealThagomizer self-assigned this Dec 31, 2025
X-original-commit: eeab0f8
Co-authored-by: Megan Valenzuela <[email protected]>
@theRealThagomizer theRealThagomizer force-pushed the 19.0-18.0-sales-different-addresses-update-thjud-487136-fw branch from 987fd8d to 8ecfaca Compare December 31, 2025 20:03
@theRealThagomizer
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 31, 2025
closes #15866

X-original-commit: eeab0f8
Signed-off-by: Felicia Kuan (feku) <[email protected]>
Signed-off-by: Thomas Jude Cavazos (thjud) <[email protected]>
Co-authored-by: Megan Valenzuela <[email protected]>
robodoo pushed a commit that referenced this pull request Dec 31, 2025
closes #15866

X-original-commit: eeab0f8
Signed-off-by: Felicia Kuan (feku) <[email protected]>
Signed-off-by: Thomas Jude Cavazos (thjud) <[email protected]>
Co-authored-by: Megan Valenzuela <[email protected]>
@robodoo
Copy link
Collaborator

robodoo commented Dec 31, 2025

@theRealThagomizer @Felicious staging failed: ci/upgrade_enterprise on 0802c83a166b525d139208c02ad8c4d5341bbc38 (view more at https://runbot.odoo.com/runbot/batch/2300932/build/96898148)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants