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

FIX : HTML in ODT templates #26181

Merged
merged 6 commits into from
Oct 31, 2023

Conversation

atm-adrien
Copy link
Contributor

FIX : HTML in ODT templates

There is currently no interpretation of HTML in ODT type document templates.

Here is what we have in entry :
<p><strong><u>DESCRIPTION DES PRODUITS</u></strong><br /> Ceci est un produit &amp; un service<br /> Contr&ocirc;le des stock de ce produit&nbsp;<br /> V&eacute;rification des dispositifs d&#39;installation pour ce produit&nbsp;<br /> Vidange des filtres &agrave; carburant suppl&eacute;mentaire pour ce produit&nbsp;<br /> N&deg; de ce produit</p>

We have the same thing written in our ODT document

@atm-adrien atm-adrien changed the base branch from develop to 17.0 October 11, 2023 10:25
@eldy
Copy link
Member

eldy commented Oct 12, 2023

It seems a different fix were done in v18.
Can you check to backport done into the v18 instead of this version for v17 ?

@eldy eldy added the Discussion Some questions or discussions are opened and wait answers of author or other people to be processed label Oct 12, 2023
@atm-adrien
Copy link
Contributor Author

I copied what was done in V18, this does not seem to pose a compatibility problem

I also modified the regexp a little (it did not target all of the tags)

pclose($handlein);
fclose($handle);
}
dolChmod($outputfile);
Copy link
Member

@eldy eldy Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atm-adrien
With v17, this line of code will hang. Keep v17 code as this has no relation with the bugfix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@eldy eldy added PR to fix - See feedback in comments PR needs to be fixed to be integrated (some comments should describes the fix to do) and removed Discussion Some questions or discussions are opened and wait answers of author or other people to be processed labels Oct 13, 2023
@eldy eldy merged commit eeca89c into Dolibarr:17.0 Oct 31, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR to fix - See feedback in comments PR needs to be fixed to be integrated (some comments should describes the fix to do)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants