diff --git a/dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg b/dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg
index 3d541f760b8..83c7ff089cf 100644
Binary files a/dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg and b/dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg differ
diff --git a/dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg b/dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg
index 7aff8dccefe..704d18fbbf3 100644
Binary files a/dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg and b/dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg differ
diff --git a/dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg b/dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg
index 285010bb7b3..7f5f5a9a57b 100644
Binary files a/dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg and b/dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg differ
diff --git a/dev/initdemo/documents_demo/societe/12/courrier_consult.odt b/dev/initdemo/documents_demo/societe/12/courrier_consult.odt
new file mode 100644
index 00000000000..cbb3625d922
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/courrier_consult.odt differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/person8.jpeg b/dev/initdemo/documents_demo/societe/12/logos/person8.jpeg
new file mode 100644
index 00000000000..2ae5d48084e
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/logos/person8.jpeg differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg b/dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg
deleted file mode 100644
index 8ea6696ba45..00000000000
Binary files a/dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg and /dev/null differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_mini.jpeg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_mini.jpeg
new file mode 100644
index 00000000000..399283ee190
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_mini.jpeg differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_small.jpeg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_small.jpeg
new file mode 100644
index 00000000000..1771772de3f
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_small.jpeg differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
deleted file mode 100644
index d97331762a8..00000000000
Binary files a/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg and /dev/null differ
diff --git a/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg b/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
deleted file mode 100644
index 3595b041ca2..00000000000
Binary files a/dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg and /dev/null differ
diff --git a/dev/initdemo/documents_demo/societe/12/radiography1.jpg b/dev/initdemo/documents_demo/societe/12/radiography1.jpg
new file mode 100644
index 00000000000..1f6d672f250
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/radiography1.jpg differ
diff --git a/dev/initdemo/documents_demo/societe/12/radiography2-knee.jpg b/dev/initdemo/documents_demo/societe/12/radiography2-knee.jpg
new file mode 100644
index 00000000000..adb5a6e2190
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/radiography2-knee.jpg differ
diff --git a/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_mini.jpg b/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_mini.jpg
new file mode 100644
index 00000000000..488b057073a
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_mini.jpg differ
diff --git a/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_small.jpg b/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_small.jpg
new file mode 100644
index 00000000000..f0bd4e695e4
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/thumbs/radiography1_small.jpg differ
diff --git a/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_mini.jpg b/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_mini.jpg
new file mode 100644
index 00000000000..c5640c504aa
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_mini.jpg differ
diff --git a/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_small.jpg b/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_small.jpg
new file mode 100644
index 00000000000..95d4426a1b7
Binary files /dev/null and b/dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_small.jpg differ
diff --git a/dev/initdemo/documents_demo/users/11/person4.jpeg b/dev/initdemo/documents_demo/users/11/person4.jpeg
index b3f67d8f2ce..4e3df4e1c2b 100644
Binary files a/dev/initdemo/documents_demo/users/11/person4.jpeg and b/dev/initdemo/documents_demo/users/11/person4.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/12/person6.jpeg b/dev/initdemo/documents_demo/users/12/person6.jpeg
index 0be42700a41..ba2d1f4e7b2 100644
Binary files a/dev/initdemo/documents_demo/users/12/person6.jpeg and b/dev/initdemo/documents_demo/users/12/person6.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/13/person7.jpeg b/dev/initdemo/documents_demo/users/13/person7.jpeg
index 12e84e95b5f..cb5c34b7089 100644
Binary files a/dev/initdemo/documents_demo/users/13/person7.jpeg and b/dev/initdemo/documents_demo/users/13/person7.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/14/person3.jpeg b/dev/initdemo/documents_demo/users/14/person3.jpeg
index c53c4cb9bf9..d9facac130f 100644
Binary files a/dev/initdemo/documents_demo/users/14/person3.jpeg and b/dev/initdemo/documents_demo/users/14/person3.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/16/person1.jpeg b/dev/initdemo/documents_demo/users/16/person1.jpeg
index 4eb94e3d5c6..bc6341953e8 100644
Binary files a/dev/initdemo/documents_demo/users/16/person1.jpeg and b/dev/initdemo/documents_demo/users/16/person1.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/17/person5.jpeg b/dev/initdemo/documents_demo/users/17/person5.jpeg
index 3d541f760b8..83c7ff089cf 100644
Binary files a/dev/initdemo/documents_demo/users/17/person5.jpeg and b/dev/initdemo/documents_demo/users/17/person5.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/19/person2.jpeg b/dev/initdemo/documents_demo/users/19/person2.jpeg
index 285010bb7b3..7f5f5a9a57b 100644
Binary files a/dev/initdemo/documents_demo/users/19/person2.jpeg and b/dev/initdemo/documents_demo/users/19/person2.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/2/person9.jpeg b/dev/initdemo/documents_demo/users/2/person9.jpeg
index 7aff8dccefe..704d18fbbf3 100644
Binary files a/dev/initdemo/documents_demo/users/2/person9.jpeg and b/dev/initdemo/documents_demo/users/2/person9.jpeg differ
diff --git a/dev/initdemo/documents_demo/users/4/person8.jpeg b/dev/initdemo/documents_demo/users/4/person8.jpeg
index 33227fc3616..3379605c0c9 100644
Binary files a/dev/initdemo/documents_demo/users/4/person8.jpeg and b/dev/initdemo/documents_demo/users/4/person8.jpeg differ
diff --git a/dev/initdemo/savedemo.sh b/dev/initdemo/savedemo.sh
index cfcdcea6f70..424fed6c468 100755
--- a/dev/initdemo/savedemo.sh
+++ b/dev/initdemo/savedemo.sh
@@ -245,18 +245,6 @@ export list="
--ignore-table=$base.llx_c_ticketsup_category
--ignore-table=$base.llx_c_ticketsup_severity
--ignore-table=$base.llx_c_ticketsup_type
- --ignore-table=$base.llx_cabinetmed_c_banques
- --ignore-table=$base.llx_cabinetmed_c_ccam
- --ignore-table=$base.llx_cabinetmed_c_examconclusion
- --ignore-table=$base.llx_cabinetmed_cons
- --ignore-table=$base.llx_cabinetmed_cons_extrafields
- --ignore-table=$base.llx_cabinetmed_diaglec
- --ignore-table=$base.llx_cabinetmed_examaut
- --ignore-table=$base.llx_cabinetmed_exambio
- --ignore-table=$base.llx_cabinetmed_examenprescrit
- --ignore-table=$base.llx_cabinetmed_motifcons
- --ignore-table=$base.llx_cabinetmed_patient
- --ignore-table=$base.llx_cabinetmed_societe
--ignore-table=$base.llx_congespayes
--ignore-table=$base.llx_congespayes_config
--ignore-table=$base.llx_congespayes_events
@@ -300,6 +288,7 @@ export list="
--ignore-table=$base.llx_m_extrafields
--ignore-table=$base.llx_monmodule_abcdef
--ignore-table=$base.llx_notes
+ --ignore-table=$base.llx_packages
--ignore-table=$base.llx_pos_cash
--ignore-table=$base.llx_pos_control_cash
--ignore-table=$base.llx_pos_facture
@@ -316,6 +305,7 @@ export list="
--ignore-table=$base.llx_residence_building
--ignore-table=$base.llx_residence_building_links
--ignore-table=$base.llx_societe_rib2
+ --ignore-table=$base.llx_sellyoursaas_cancellation
--ignore-table=$base.llx_ticketsup
--ignore-table=$base.llx_ultimatepdf
--ignore-table=$base.llx_update_modules
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 116b500fb7d..df0a695cd4c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -56,7 +56,7 @@ NoPageYet=No pages yet
YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
SyntaxHelp=Help on specific syntax tips
YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
More examples of HTML or dynamic code available on the wiki documentation
.
ClonePage=Clone page/container
CloneSite=Clone site
SiteAdded=Website added
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 670ed740b5f..5c29e8212a4 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -74,8 +74,8 @@ $pagenext = $page + 1;
$object = new Ticket($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->ticket->dir_output.'/temp/massgeneration/'.$user->id;
-if ($socid > 0) $hookmanager->initHooks(array('thirdpartyticket'));
-elseif ($project > 0) $hookmanager->initHooks(array('projectticket'));
+if ($socid > 0) $hookmanager->initHooks(array('thirdpartyticket'));
+elseif ($projectid > 0) $hookmanager->initHooks(array('projectticket'));
else $hookmanager->initHooks(array('ticketlist'));
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -149,6 +149,8 @@ if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
$parameters = array();
+if ($socid > 0) $parameters['socid'] = $socid;
+if ($projectid > 0) $parameters['projectid'] = $projectid;
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 16db733b457..f2f6bc00d1f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1034,6 +1034,8 @@ class User extends CommonObject
*/
public function setCategories($categories)
{
+ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
$type_categ = Categorie::TYPE_USER;
// Handle single category
@@ -1042,7 +1044,6 @@ class User extends CommonObject
}
// Get current categories
- require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$c = new Categorie($this->db);
$existing = $c->containing($this->id, $type_categ, 'id');
@@ -1106,9 +1107,9 @@ class User extends CommonObject
}
// If contact, remove link
- if ($this->contact_id)
+ if ($this->contactid > 0 || $this->contact_id > 0)
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".(($this->contactid > 0) ? $this->contactid : $this->contact_id);
if (!$error && !$this->db->query($sql))
{
$error++;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ef05483d705..1d94eadf626 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2452,7 +2452,9 @@ if (!GETPOST('hide_websitemenu'))
print '';
if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
{
- $htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource").'
';
+ $url = 'https://wiki.dolibarr.org/index.php/Module_Website';
+
+ $htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url).'
';
if ($conf->browser->layout == 'phone')
{
print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');