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

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

+{

@@ -34 +35 @@
-	<?php echo $this->control->tpl['ajax_selecttype']; ?>

+    <?php echo $this->control->tpl['ajax_selecttype']; ?>

@@ -36 +37 @@
-	<?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;

+    <?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;

@@ -38 +39 @@
-	<?php echo $langs->trans("CompanyFoundation"); ?> &nbsp; &nbsp;

+    <?php echo $langs->trans("CompanyFoundation"); ?> &nbsp; &nbsp;

@@ -42 +43 @@
-	<?php echo $this->control->tpl['ajax_selectcountry']; ?>

+    <?php echo $this->control->tpl['ajax_selectcountry']; ?>

@@ -60 +61 @@
-	<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>

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

@@ -82,2 +83,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%">

@@ -86 +87 @@
-				<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>

@@ -97,8 +98,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 +109 @@
-	<?php if (count($this->control->tpl['suppliercategory']) > 0) { ?>

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

@@ -113 +114 @@
-	<?php }

+    <?php }

@@ -116 +117 @@
-if (isModEnabled('barcode')) { ?>

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

@@ -159 +160 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

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

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

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

-} ?>

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

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

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

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

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

+{

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

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

@@ -75 +76 @@
-				<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">

@@ -96 +97 @@
-				<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">

@@ -116 +117 @@
-	}

+    }

@@ -120 +121 @@
-<?php if (isModEnabled('barcode')) { ?>

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

@@ -163 +164 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

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

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

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

-} ?>

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

@@ -183 +182 @@
-<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"); ?>">

@@ -185 +184 @@
-<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/individual/tpl/github_19.0.3_card_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/societe/canvas/individual/tpl/client_card_view.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

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

+{

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

-

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

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

-}

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

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

-} ?>

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

+

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

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

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

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

@@ -59,2 +56,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>

@@ -70,2 +67,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>

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

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

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

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

-} ?>

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

@@ -134 +129 @@
-<?php if (getDolGlobalInt('MAIN_MULTILANGS')) { ?>

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

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

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

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

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

@@ -177 +172 @@
-<?php if (isModEnabled('adherent')) { ?>

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

@@ -186 +181 @@
-<?php print dol_get_fiche_end(); ?>

+<?php dol_fiche_end(); ?>

@@ -189,5 +184,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) { ?>

@@ -197 +192 @@
-		<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>

@@ -208 +203 @@
- * Generated documents

+ * Documents generes

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

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

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

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