diff --git a/htdocs/product/canvas/default/tpl/edit.tpl.php b/htdocs/product/canvas/default/tpl/edit.tpl.php
index 1634a5fadb8..69dc46d6234 100644
--- a/htdocs/product/canvas/default/tpl/edit.tpl.php
+++ b/htdocs/product/canvas/default/tpl/edit.tpl.php
@@ -21,7 +21,7 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php echo $product->tpl['title']; ?>
+<?php echo $this->object->tpl['title']; ?>
 
 <?php if ($mesg) { ?>
 <br><div class="error"><?php echo $mesg; ?></div><br>
@@ -30,75 +30,75 @@
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="update">
-<input type="hidden" name="id" value="<?php echo $product->tpl['id']; ?>">
-<input type="hidden" name="canvas" value="<?php echo $product->tpl['canvas']; ?>">
+<input type="hidden" name="id" value="<?php echo $this->object->tpl['id']; ?>">
+<input type="hidden" name="canvas" value="<?php echo $this->object->tpl['canvas']; ?>">
 
 
 <table class="border" width="100%">
 
 <tr>
 <td class="fieldrequired" width="20%"><?php echo $langs->trans("Ref"); ?></td>
-<td><input name="ref" size="40" maxlength="32" value="<?php echo $product->tpl['ref']; ?>">
+<td><input name="ref" size="40" maxlength="32" value="<?php echo $this->object->tpl['ref']; ?>">
 </td></tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
-<td><input name="libelle" size="40" value="<?php echo $product->tpl['label']; ?>"></td>
+<td><input name="libelle" size="40" value="<?php echo $this->object->tpl['label']; ?>"></td>
 </tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Status"); ?></td>
-<td><?php echo $product->tpl['status']; ?></td>
+<td><?php echo $this->object->tpl['status']; ?></td>
 </tr>
 
 <?php if ($conf->stock->enabled) { ?>
 <tr><td><?php echo $langs->trans("StockLimit"); ?></td><td>
-<input name="seuil_stock_alerte" size="4" value="<?php echo $product->tpl['seuil_stock_alerte']; ?>">
+<input name="seuil_stock_alerte" size="4" value="<?php echo $this->object->tpl['seuil_stock_alerte']; ?>">
 </td></tr>
 <?php } else { ?>
 <input name="seuil_stock_alerte" type="hidden" value="0">
 <?php } ?>
 
 <tr><td valign="top"><?php echo $langs->trans("Description"); ?></td><td>
-<?php if (! $product->tpl['textarea_description']) { 
-$product->tpl['doleditor_description']->Create();
+<?php if (! $this->object->tpl['textarea_description']) { 
+$this->object->tpl['doleditor_description']->Create();
 }else{
-echo $product->tpl['textarea_description'];
+echo $this->object->tpl['textarea_description'];
 }?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Nature"); ?></td><td>
-<?php echo $product->tpl['finished']; ?>
+<?php echo $this->object->tpl['finished']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Weight"); ?></td><td>
-<input name="weight" size="4" value="<?php echo $product->tpl['weight']; ?>">
-<?php echo $product->tpl['weight_units']; ?>
+<input name="weight" size="4" value="<?php echo $this->object->tpl['weight']; ?>">
+<?php echo $this->object->tpl['weight_units']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Length"); ?></td><td>
-<input name="size" size="4" value="<?php echo $product->tpl['length']; ?>">
-<?php echo $product->tpl['length_units']; ?>
+<input name="size" size="4" value="<?php echo $this->object->tpl['length']; ?>">
+<?php echo $this->object->tpl['length_units']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Surface"); ?></td><td>
-<input name="surface" size="4" value="<?php echo $product->tpl['surface']; ?>">
-<?php echo $product->tpl['surface_units']; ?>
+<input name="surface" size="4" value="<?php echo $this->object->tpl['surface']; ?>">
+<?php echo $this->object->tpl['surface_units']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Volume"); ?></td><td>
-<input name="volume" size="4" value="<?php echo $product->tpl['volume']; ?>">
-<?php echo $product->tpl['volume_units']; ?>
+<input name="volume" size="4" value="<?php echo $this->object->tpl['volume']; ?>">
+<?php echo $this->object->tpl['volume_units']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Hidden"); ?></td>
-<td><?php echo $product->tpl['hidden']; ?></td></tr>
+<td><?php echo $this->object->tpl['hidden']; ?></td></tr>
 
 <tr><td valign="top"><?php echo $langs->trans("NoteNotVisibleOnBill"); ?></td><td>
-<?php if (! $product->tpl['textarea_note']) { 
-$product->tpl['doleditor_note']->Create();
+<?php if (! $this->object->tpl['textarea_note']) { 
+$this->object->tpl['doleditor_note']->Create();
 }else{
-echo $product->tpl['textarea_note'];
+echo $this->object->tpl['textarea_note'];
 }?>
 </td></tr>
 </table>
diff --git a/htdocs/product/canvas/default/tpl/view.tpl.php b/htdocs/product/canvas/default/tpl/view.tpl.php
index ffb70e312b5..b237380fd80 100644
--- a/htdocs/product/canvas/default/tpl/view.tpl.php
+++ b/htdocs/product/canvas/default/tpl/view.tpl.php
@@ -25,74 +25,74 @@
 
 <tr>
 <td width="15%"><?php echo $langs->trans("Ref"); ?></td>
-<td colspan="2"><?php echo $product->tpl['ref']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['ref']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Label") ?></td>
-<td><?php echo $product->tpl['label']; ?></td>
+<td><?php echo $this->object->tpl['label']; ?></td>
 
-<?php if ($product->tpl['photos']) { ?>
-<td valign="middle" align="center" width="30%" rowspan="<?php echo $product->tpl['nblignes']; ?>">
-<?php echo $product->tpl['photos']; ?>
+<?php if ($this->object->tpl['photos']) { ?>
+<td valign="middle" align="center" width="30%" rowspan="<?php echo $this->object->tpl['nblignes']; ?>">
+<?php echo $this->object->tpl['photos']; ?>
 </td>
 <?php } ?>
 
 </tr>
 
 <tr>
-<td><?php echo $product->tpl['accountancyBuyCodeKey']; ?></td>
-<td><?php echo $product->tpl['accountancyBuyCodeVal']; ?></td>
+<td><?php echo $this->object->tpl['accountancyBuyCodeKey']; ?></td>
+<td><?php echo $this->object->tpl['accountancyBuyCodeVal']; ?></td>
 </tr>
 
 <tr>
-<td><?php echo $product->tpl['accountancySellCodeKey']; ?></td>
-<td><?php echo $product->tpl['accountancySellCodeVal']; ?></td>
+<td><?php echo $this->object->tpl['accountancySellCodeKey']; ?></td>
+<td><?php echo $this->object->tpl['accountancySellCodeVal']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Status"); ?></td>
-<td><?php echo $product->tpl['status']; ?></td>
+<td><?php echo $this->object->tpl['status']; ?></td>
 </tr>
 
 <tr>
 <td valign="top"><?php echo $langs->trans("Description"); ?></td>
-<td colspan="2"><?php echo $product->tpl['description']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['description']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Nature"); ?></td>
-<td colspan="2"><?php echo $product->tpl['finished']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['finished']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Weight"); ?></td>
-<td colspan="2"><?php echo $product->tpl['weight']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['weight']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Length"); ?></td>
-<td colspan="2"><?php echo $product->tpl['length']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['length']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Surface"); ?></td>
-<td colspan="2"><?php echo $product->tpl['surface']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['surface']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Volume"); ?></td>
-<td colspan="2"><?php echo $product->tpl['volume']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['volume']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Hidden"); ?></td>
-<td colspan="2"><?php echo $product->tpl['hidden']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['hidden']; ?></td>
 </tr>
 
 <tr>
 <td valign="top"><?php echo $langs->trans("Note"); ?></td>
-<td colspan="2"><?php echo $product->tpl['note']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['note']; ?></td>
 </tr>
 
 </table>
diff --git a/htdocs/product/canvas/service/tpl/create.tpl.php b/htdocs/product/canvas/service/tpl/create.tpl.php
index 03cea5fbfc7..4f7e08f3d0b 100644
--- a/htdocs/product/canvas/service/tpl/create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/create.tpl.php
@@ -21,7 +21,7 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php echo $product->tpl['title']; ?>
+<?php echo $this->object->tpl['title']; ?>
 
 <?php if ($mesg) { ?>
 <br><div class="error"><?php echo $mesg; ?></div><br>
@@ -37,41 +37,41 @@
 
 <tr>
 <td class="fieldrequired" width="20%"><?php echo $langs->trans("Ref"); ?></td>
-<td><input name="ref" size="40" maxlength="32" value="<?php echo $product->tpl['ref']; ?>">
+<td><input name="ref" size="40" maxlength="32" value="<?php echo $this->object->tpl['ref']; ?>">
 <?php if ($_error == 1) echo $langs->trans("RefAlreadyExists"); ?>
 </td></tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
-<td><input name="libelle" size="40" value="<?php echo $product->tpl['label']; ?>"></td>
+<td><input name="libelle" size="40" value="<?php echo $this->object->tpl['label']; ?>"></td>
 </tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Status"); ?></td>
-<td><?php echo $product->tpl['status']; ?></td>
+<td><?php echo $this->object->tpl['status']; ?></td>
 </tr>
 
 <tr><td valign="top"><?php echo $langs->trans("Description"); ?></td><td>
-<?php if (! $product->tpl['textarea_description']) { 
-$product->tpl['doleditor_description']->Create();
+<?php if (! $this->object->tpl['textarea_description']) { 
+$this->object->tpl['doleditor_description']->Create();
 }else{
-echo $product->tpl['textarea_description'];
+echo $this->object->tpl['textarea_description'];
 }?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Duration"); ?></td>
-<td><input name="duration_value" size="6" maxlength="5" value="<?php echo $product->tpl['duration_value']; ?>"> &nbsp;
-<?php echo $product->tpl['duration_unit']; ?>
+<td><input name="duration_value" size="6" maxlength="5" value="<?php echo $this->object->tpl['duration_value']; ?>"> &nbsp;
+<?php echo $this->object->tpl['duration_unit']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Hidden"); ?></td>
-<td><?php echo $product->tpl['hidden']; ?></td></tr>
+<td><?php echo $this->object->tpl['hidden']; ?></td></tr>
 
 <tr><td valign="top"><?php echo $langs->trans("NoteNotVisibleOnBill"); ?></td><td>
-<?php if (! $product->tpl['textarea_note']) { 
-$product->tpl['doleditor_note']->Create();
+<?php if (! $this->object->tpl['textarea_note']) { 
+$this->object->tpl['doleditor_note']->Create();
 }else{
-echo $product->tpl['textarea_note'];
+echo $this->object->tpl['textarea_note'];
 }?>
 </td></tr>
 </table>
@@ -83,16 +83,16 @@ echo $product->tpl['textarea_note'];
 <table class="border" width="100%">
 
 <tr><td><?php echo $langs->trans("SellingPrice"); ?></td>
-<td><input name="price" size="10" value="<?php echo $product->tpl['price']; ?>">
-<?php echo $product->tpl['price_base_type']; ?>
+<td><input name="price" size="10" value="<?php echo $this->object->tpl['price']; ?>">
+<?php echo $this->object->tpl['price_base_type']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("MinPrice"); ?></td>
-<td><input name="price_min" size="10" value="<?php echo $product->tpl['price_min']; ?>">
+<td><input name="price_min" size="10" value="<?php echo $this->object->tpl['price_min']; ?>">
 </td></tr>
 
 <tr><td width="20%"><?php echo $langs->trans("VATRate"); ?></td><td>
-<?php echo $product->tpl['tva_tx']; ?>
+<?php echo $this->object->tpl['tva_tx']; ?>
 </td></tr>
 
 </table>
diff --git a/htdocs/product/canvas/service/tpl/edit.tpl.php b/htdocs/product/canvas/service/tpl/edit.tpl.php
index f1aa027e172..83544edec5b 100644
--- a/htdocs/product/canvas/service/tpl/edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/edit.tpl.php
@@ -21,7 +21,7 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php echo $product->tpl['title']; ?>
+<?php echo $this->object->tpl['title']; ?>
 
 <?php if ($mesg) { ?>
 <br><div class="error"><?php echo $mesg; ?></div><br>
@@ -30,48 +30,48 @@
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="update">
-<input type="hidden" name="id" value="<?php echo $product->tpl['id']; ?>">
-<input type="hidden" name="canvas" value="<?php echo $product->tpl['canvas']; ?>">
+<input type="hidden" name="id" value="<?php echo $this->object->tpl['id']; ?>">
+<input type="hidden" name="canvas" value="<?php echo $this->object->tpl['canvas']; ?>">
 
 
 <table class="border" width="100%">
 
 <tr>
 <td class="fieldrequired" width="20%"><?php echo $langs->trans("Ref"); ?></td>
-<td><input name="ref" size="40" maxlength="32" value="<?php echo $product->tpl['ref']; ?>">
+<td><input name="ref" size="40" maxlength="32" value="<?php echo $this->object->tpl['ref']; ?>">
 </td></tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
-<td><input name="libelle" size="40" value="<?php echo $product->tpl['label']; ?>"></td>
+<td><input name="libelle" size="40" value="<?php echo $this->object->tpl['label']; ?>"></td>
 </tr>
 
 <tr>
 <td class="fieldrequired"><?php echo $langs->trans("Status"); ?></td>
-<td><?php echo $product->tpl['status']; ?></td>
+<td><?php echo $this->object->tpl['status']; ?></td>
 </tr>
 
 <tr><td valign="top"><?php echo $langs->trans("Description"); ?></td><td>
-<?php if (! $product->tpl['textarea_description']) { 
-$product->tpl['doleditor_description']->Create();
+<?php if (! $this->object->tpl['textarea_description']) { 
+$this->object->tpl['doleditor_description']->Create();
 }else{
-echo $product->tpl['textarea_description'];
+echo $this->object->tpl['textarea_description'];
 }?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Duration"); ?></td>
-<td><input name="duration_value" size="6" maxlength="5" value="<?php echo $product->tpl['duration_value']; ?>"> &nbsp;
-<?php echo $product->tpl['duration_unit']; ?>
+<td><input name="duration_value" size="6" maxlength="5" value="<?php echo $this->object->tpl['duration_value']; ?>"> &nbsp;
+<?php echo $this->object->tpl['duration_unit']; ?>
 </td></tr>
 
 <tr><td><?php echo $langs->trans("Hidden"); ?></td>
-<td><?php echo $product->tpl['hidden']; ?></td></tr>
+<td><?php echo $this->object->tpl['hidden']; ?></td></tr>
 
 <tr><td valign="top"><?php echo $langs->trans("NoteNotVisibleOnBill"); ?></td><td>
-<?php if (! $product->tpl['textarea_note']) { 
-$product->tpl['doleditor_note']->Create();
+<?php if (! $this->object->tpl['textarea_note']) { 
+$this->object->tpl['doleditor_note']->Create();
 }else{
-echo $product->tpl['textarea_note'];
+echo $this->object->tpl['textarea_note'];
 }?>
 </td></tr>
 </table>
diff --git a/htdocs/product/canvas/service/tpl/view.tpl.php b/htdocs/product/canvas/service/tpl/view.tpl.php
index c42550507d6..77dba2592fa 100644
--- a/htdocs/product/canvas/service/tpl/view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/view.tpl.php
@@ -25,54 +25,54 @@
 
 <tr>
 <td width="15%"><?php echo $langs->trans("Ref"); ?></td>
-<td colspan="2"><?php echo $product->tpl['ref']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['ref']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Label") ?></td>
-<td><?php echo $product->tpl['label']; ?></td>
+<td><?php echo $this->object->tpl['label']; ?></td>
 
-<?php if ($product->tpl['photos']) { ?>
-<td valign="middle" align="center" width="30%" rowspan="<?php echo $product->tpl['nblignes']; ?>">
-<?php echo $product->tpl['photos']; ?>
+<?php if ($this->object->tpl['photos']) { ?>
+<td valign="middle" align="center" width="30%" rowspan="<?php echo $this->object->tpl['nblignes']; ?>">
+<?php echo $this->object->tpl['photos']; ?>
 </td>
 <?php } ?>
 
 </tr>
 
 <tr>
-<td><?php echo $product->tpl['accountancyBuyCodeKey']; ?></td>
-<td><?php echo $product->tpl['accountancyBuyCodeVal']; ?></td>
+<td><?php echo $this->object->tpl['accountancyBuyCodeKey']; ?></td>
+<td><?php echo $this->object->tpl['accountancyBuyCodeVal']; ?></td>
 </tr>
 
 <tr>
-<td><?php echo $product->tpl['accountancySellCodeKey']; ?></td>
-<td><?php echo $product->tpl['accountancySellCodeVal']; ?></td>
+<td><?php echo $this->object->tpl['accountancySellCodeKey']; ?></td>
+<td><?php echo $this->object->tpl['accountancySellCodeVal']; ?></td>
 </tr>
 
 <tr>
 <td><?php echo $langs->trans("Status"); ?></td>
-<td><?php echo $product->tpl['status']; ?></td>
+<td><?php echo $this->object->tpl['status']; ?></td>
 </tr>
 
 <tr>
 <td valign="top"><?php echo $langs->trans("Description"); ?></td>
-<td colspan="2"><?php echo $product->tpl['description']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['description']; ?></td>
 </tr>
 
 <tr><td><?php echo $langs->trans("Duration"); ?></td>
-<td><?php echo $product->tpl['duration_value']; ?>&nbsp;
-<?php echo $product->tpl['duration_unit']; ?>&nbsp;
+<td><?php echo $this->object->tpl['duration_value']; ?>&nbsp;
+<?php echo $this->object->tpl['duration_unit']; ?>&nbsp;
 </td></tr>
 
 <tr>
 <td><?php echo $langs->trans("Hidden"); ?></td>
-<td colspan="2"><?php echo $product->tpl['hidden']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['hidden']; ?></td>
 </tr>
 
 <tr>
 <td valign="top"><?php echo $langs->trans("Note"); ?></td>
-<td colspan="2"><?php echo $product->tpl['note']; ?></td>
+<td colspan="2"><?php echo $this->object->tpl['note']; ?></td>
 </tr>
 
 </table>