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

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

+{

@@ -45,3 +46 @@
-<?php if ($this->control->tpl['js_checkVatPopup']) {

-	echo $this->control->tpl['js_checkVatPopup'];

-} ?>

+<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>

@@ -64,4 +63,4 @@
-	<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>

-	<td><?php echo $langs->trans('Prefix'); ?></td>

-	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>

-	<?php } ?>

+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>

+    <td><?php echo $langs->trans('Prefix'); ?></td>

+    <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>

+    <?php } ?>

@@ -74,2 +73,2 @@
-	<td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>

-	<td width="25%">

+    <td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>

+    <td width="25%">

@@ -78 +77 @@
-				<td><input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="24"></td>

+				<td><input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15"></td>

@@ -89,8 +88,8 @@
-	<td><?php echo $langs->trans('SupplierCode'); ?></td>

-	<td>

-		<table class="nobordernopadding">

-			<tr>

-				<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="24"></td>

-				<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>

-			</tr>

-		</table>

+    <td><?php echo $langs->trans('SupplierCode'); ?></td>

+    <td>

+    	<table class="nobordernopadding">

+    		<tr>

+    			<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15"></td>

+    			<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>

+    		</tr>

+    	</table>

@@ -108 +107 @@
-if (isModEnabled('barcode')) { ?>

+if (!empty($conf->barcode->enabled)) { ?>

@@ -159,3 +158 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -164,3 +161 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -168,3 +163 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -173,3 +166 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -192 +183 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>

@@ -206,5 +197,3 @@
-<?php if (!empty($this->control->tpl['localtax'])) {

-	echo $this->control->tpl['localtax'];

-} ?>

-

-<?php if ($user->hasRight('societe', 'client', 'voir')) { ?>

+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>

+

+<?php if ($user->rights->societe->client->voir) { ?>

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

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

+{

@@ -36,3 +37 @@
-<?php if ($this->control->tpl['js_checkVatPopup']) {

-	echo $this->control->tpl['js_checkVatPopup'];

-} ?>

+<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>

@@ -56 +55 @@
-<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>

+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>

@@ -79 +78 @@
-				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="24">

+				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">

@@ -100 +99 @@
-				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="24">

+				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">

@@ -120 +119 @@
-	}

+    }

@@ -123 +122 @@
-if (isModEnabled('barcode')) { ?>

+if (!empty($conf->barcode->enabled)) { ?>

@@ -169,3 +168 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -174,3 +171 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -178,3 +173 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -183,3 +176 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -214 +205 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>

@@ -221,3 +212 @@
-if (!empty($this->control->tpl['localtax'])) {

-	echo $this->control->tpl['localtax'];

-} ?>

+if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>

@@ -229 +218 @@
-<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">

+<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">

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

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

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

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

+{

@@ -32,13 +33,7 @@
-print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');

-

-?>

-

-<?php if ($this->control->tpl['error']) {

-	echo $this->control->tpl['error'];

-} ?>

-<?php if ($this->control->tpl['action_delete']) {

-	echo $this->control->tpl['action_delete'];

-} ?>

-<?php if ($this->control->tpl['js_checkVatPopup']) {

-	echo $this->control->tpl['js_checkVatPopup'];

-} ?>

+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');

+

+?>

+

+<?php if ($this->control->tpl['error']) echo $this->control->tpl['error']; ?>

+<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>

+<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>

@@ -53 +48 @@
-<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>

+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>

@@ -64,2 +59,2 @@
-	<?php if ($this->control->tpl['checkcustomercode'] != 0) { ?>

-	<span class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</span>

+	<?php if ($this->control->tpl['checkcustomercode'] <> 0) { ?>

+	<font class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</font>

@@ -75,2 +70,2 @@
-	<?php if ($this->control->tpl['checksuppliercode'] != 0) { ?>

-	<span class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</span>

+	<?php if ($this->control->tpl['checksuppliercode'] <> 0) { ?>

+	<font class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</font>

@@ -82 +77 @@
-<?php if (isModEnabled('barcode')) { ?>

+<?php if (!empty($conf->barcode->enabled)) { ?>

@@ -128,3 +123 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -134,5 +127,2 @@
-			if ($this->control->tpl['checkprofid'.$i] > 0) {

-				echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];

-			} else {

-				echo ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>';

-			}

+			if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];

+			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';

@@ -141,3 +131 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -145,3 +133 @@
-		if ($i == 1 || $i == 3) {

-			echo '<tr>';

-		}

+		if ($i == 1 || $i == 3) echo '<tr>';

@@ -150,3 +136 @@
-		if ($i == 2 || $i == 4) {

-			echo '</tr>';

-		}

+		if ($i == 2 || $i == 4) echo '</tr>';

@@ -164,3 +148 @@
-<?php if (!empty($this->control->tpl['localtax'])) {

-	echo $this->control->tpl['localtax'];

-} ?>

+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>

@@ -172,5 +154,2 @@
-	if ($this->control->tpl['capital']) {

-		echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);

-	} else {

-		echo '&nbsp;';

-	}

+	if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);

+	else echo '&nbsp;';

@@ -193 +172 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>

@@ -206 +185 @@
-			<?php if ($user->hasRight('societe', 'creer')) { ?>

+			<?php if ($user->rights->societe->creer) { ?>

@@ -238 +217 @@
-			<?php if ($user->hasRight('societe', 'creer')) { ?>

+			<?php if ($user->rights->societe->creer) { ?>

@@ -250 +229 @@
-<?php if (isModEnabled('adherent')) { ?>

+<?php if (!empty($conf->adherent->enabled)) { ?>

@@ -259 +238 @@
-<?php print dol_get_fiche_end(); ?>

+<?php dol_fiche_end(); ?>

@@ -262,5 +241,5 @@
-<?php if ($user->hasRight('societe', 'creer')) { ?>

-<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans("Modify"); ?></a>

-<?php } ?>

-

-<?php if ($user->hasRight('societe', 'supprimer')) { ?>

+<?php if ($user->rights->societe->creer) { ?>

+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("Modify"); ?></a>

+<?php } ?>

+

+<?php if ($user->rights->societe->supprimer) { ?>

@@ -270 +249 @@
-		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans('Delete'); ?></a>

+		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>

@@ -282 +261 @@
- * Generated documents

+ * Documents generes

@@ -286,2 +265,2 @@
-$genallowed = $user->hasRight('societe', 'lire');

-$delallowed = $user->hasRight('societe', 'creer');

+$genallowed = $user->rights->societe->lire;

+$delallowed = $user->rights->societe->creer;