--- /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/github_19.0.3_card_create.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/client_card_create.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -34 +35 @@
-print dol_get_fiche_head('');

+dol_fiche_head('');

@@ -42 +43 @@
-<input type="hidden" name="token" value="<?php echo newToken(); ?>">

+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">

@@ -52,3 +53 @@
-<?php if ($refalreadyexists == 1) {

-	echo $langs->trans("RefAlreadyExists");

-} ?>

+<?php if ($refalreadyexists == 1) echo $langs->trans("RefAlreadyExists"); ?>

--- /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/github_19.0.3_card_edit.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/client_card_edit.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -35 +36 @@
-print dol_get_fiche_head($head, 'card', $titre, 0, 'service');

+dol_fiche_head($head, 'card', $titre, 0, 'service');

@@ -41 +42 @@
-<input type="hidden" name="token" value="<?php echo newToken(); ?>">

+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">

@@ -81,2 +82,2 @@
-<div align="center"><input type="submit" class="button button-save" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;

-<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>

+<div align="center"><input type="submit" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp; &nbsp;

+<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>

--- /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/github_19.0.3_card_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/product/canvas/service/tpl/client_card_view.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -33 +34 @@
-print dol_get_fiche_head($head, 'card', $titre, -1, 'service');

+dol_fiche_head($head, 'card', $titre, -1, 'service');

@@ -36 +37 @@
-$object->next_prev_filter = " fk_product_type = ".((int) $object->type);

+$object->next_prev_filter = " fk_product_type = ".$object->type;

@@ -39,3 +40 @@
-if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {

-	$shownav = 0;

-}

+if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;

@@ -79 +78 @@
-<td colspan="2" class="valeur sensiblehtmlcontent"><?php echo dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note)); ?></td>

+<td colspan="2"><?php echo $object->note; ?></td>