Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

Docs task:https://www.odoo.com/odoo/project.task/5347418

Updating Contacts doc to reflect 18 UI changes and content guidelines
Specifically, section on address types and create new contact form

Forward-Port-Of: #15595

X-original-commit: 525979e
Co-authored-by: larm-odoo <121518652+larm-odoo@users.noreply.github.com>
@robodoo
Copy link
Collaborator

robodoo commented Dec 12, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 12, 2025

@jero-odoo @Felicious cherrypicking of pull request #15595 failed.

stdout:

Auto-merging content/applications/essentials/contacts.rst
CONFLICT (content): Merge conflict in content/applications/essentials/contacts.rst
warning: Cannot merge binary files: content/applications/essentials/contacts/contact-form-add-address.png (37071f7ce99bc4315a3f9ea781a65ac799b0920a vs. 6ad40194eed0d355b734105903d472016694381c)
Auto-merging content/applications/essentials/contacts/contact-form-add-address.png
CONFLICT (content): Merge conflict in content/applications/essentials/contacts/contact-form-add-address.png
CONFLICT (modify/delete): content/applications/essentials/contacts/create-contact-window.png deleted in 6ad40194eed0d355b734105903d472016694381c and modified in 37071f7ce99bc4315a3f9ea781a65ac799b0920a.  Version 37071f7ce99bc4315a3f9ea781a65ac799b0920a of content/applications/essentials/contacts/create-contact-window.png left in tree.

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

@jero-odoo jero-odoo closed this Dec 12, 2025
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